diff --git a/.gitignore b/.gitignore
index f78dcd70e1..7725bf202e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,7 @@ jmeter/src/main/resources/*-Basic*.csv
 jmeter/src/main/resources/*-JMeter*.csv
 jmeter/src/main/resources/*ReportsDashboard*.csv
 jmeter/src/main/resources/dashboard/*ReportsDashboard*.csv
+jmeter/src/main/resources/*FileExtractionExample.csv
 
 ninja/devDb.mv.db
 
@@ -88,6 +89,7 @@ spring-soap/src/main/java/com/baeldung/springsoap/gen/
 /report-*.json
 transaction.log
 *-shell.log
+customers.xml
 
 apache-cxf/cxf-aegis/baeldung.xml
 testing-modules/report-*.json
@@ -102,6 +104,7 @@ spring-boot-modules/spring-boot-react/frontend/build
 spring-boot-modules/spring-boot-react/frontend/node
 spring-boot-modules/spring-boot-react/frontend/yarn.lock
 spring-boot-modules/spring-boot-properties-3/*.log
+spring-boot-modules/spring-boot-properties-3/*.gz
 
 # SDKMan
 .sdkmanrc
@@ -109,5 +112,12 @@ spring-boot-modules/spring-boot-properties-3/*.log
 # Localstack
 **/.localstack
 
+#libraries-2
+libraries-2/employee*
+libraries-2/src/test/resources/crawler4j/**
+
 #web-modules/ninja
-devDb*.db
\ No newline at end of file
+devDb*.db
+
+#jaxb
+*.xjb
\ No newline at end of file
diff --git a/README.md b/README.md
index 7ed1e6990a..b354a8f819 100644
--- a/README.md
+++ b/README.md
@@ -74,6 +74,10 @@ Building a single module
 ====================
 To build a specific module, run the command: `mvn clean install` in the module directory.
 
+It can happen that your module is part of a parent module e.g. `parent-boot-1`,`parent-spring-5` etc, then you will need to build the parent module first so that you can build your module.
+We have created a `parents` profile that you can use to build just the parent modules, just run the profile as:
+`mvn clean install -Pparents`
+
 
 Building modules from the root of the repository
 ====================
diff --git a/akka-modules/akka-http/pom.xml b/akka-modules/akka-http/pom.xml
index 3af7c492ca..9372107fc9 100644
--- a/akka-modules/akka-http/pom.xml
+++ b/akka-modules/akka-http/pom.xml
@@ -36,7 +36,6 @@
         </dependency>
     </dependencies>
 
-
     <properties>
         <akka.http.version>10.0.11</akka.http.version>
         <akka.stream.version>2.5.11</akka.stream.version>
diff --git a/akka-modules/spring-akka/pom.xml b/akka-modules/spring-akka/pom.xml
index 7451a40b86..2201181435 100644
--- a/akka-modules/spring-akka/pom.xml
+++ b/akka-modules/spring-akka/pom.xml
@@ -43,7 +43,7 @@
     </dependencyManagement>
 
     <properties>
-        <spring.version>4.3.4.RELEASE</spring.version>
+        <spring.version>5.3.25</spring.version>
         <akka.version>2.4.14</akka.version>
     </properties>
 
diff --git a/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checktargetsum/CheckTargetSum.java b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checktargetsum/CheckTargetSum.java
new file mode 100644
index 0000000000..fdbde62301
--- /dev/null
+++ b/algorithms-modules/algorithms-miscellaneous-3/src/main/java/com/baeldung/algorithms/checktargetsum/CheckTargetSum.java
@@ -0,0 +1,58 @@
+package com.baeldung.algorithms.checktargetsum;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+public class CheckTargetSum {
+    public boolean isTargetSumExistNaive(int[] nums, int target) {
+        for (int i = 0; i < nums.length; i++) {
+            for (int j = i + 1; j < nums.length; j++) {
+                if (nums[i] + nums[j] == target) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public boolean isTargetSumExistSorted(int[] nums, int target) {
+        Arrays.sort(nums);
+
+        int start = 0;
+        int end = nums.length - 1;
+
+        while (start < end) {
+            int sum = nums[start] + nums[end];
+
+            if (sum == target) {
+                return true;
+            }
+
+            if (sum < target) {
+                start++;
+            } else {
+                end--;
+            }
+        }
+
+        return false;
+    }
+
+    public boolean isTargetSumExistHashSet(int[] nums, int target) {
+        Set<Integer> hashSet = new HashSet<>();
+
+        for (int num : nums) {
+            int diff = target - num;
+
+            if (hashSet.contains(diff)) {
+                return true;
+            }
+
+            hashSet.add(num);
+        }
+
+        return false;
+    }
+}
diff --git a/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checktargetsum/CheckTargetSumUnitTest.java b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checktargetsum/CheckTargetSumUnitTest.java
new file mode 100644
index 0000000000..ff20ce112e
--- /dev/null
+++ b/algorithms-modules/algorithms-miscellaneous-3/src/test/java/com/baeldung/algorithms/checktargetsum/CheckTargetSumUnitTest.java
@@ -0,0 +1,46 @@
+package com.baeldung.algorithms.checktargetsum;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class CheckTargetSumUnitTest {
+    private CheckTargetSum checkTargetSum = new CheckTargetSum();
+
+    private int[] nums = new int[] { 10, 5, 15, 7, 14, 1, 9 };
+
+    private int existingTarget = 6;
+
+    private int nonExistingTarget = 27;
+
+    @Test
+    public void givenArrayOfIntegers_whenTargetSumNaive_thenPairExists() {
+        assertTrue(checkTargetSum.isTargetSumExistNaive(nums, existingTarget));
+    }
+
+    @Test
+    public void givenArrayOfIntegers_whenTargetSumNaive_thenPairDoesNotExists() {
+        assertFalse(checkTargetSum.isTargetSumExistNaive(nums, nonExistingTarget));
+    }
+
+    @Test
+    public void givenArrayOfIntegers_whenTargetSumSorted_thenPairExists() {
+        assertTrue(checkTargetSum.isTargetSumExistNaive(nums, existingTarget));
+    }
+
+    @Test
+    public void givenArrayOfIntegers_whenTargetSumSorted_thenPairDoesNotExists() {
+        assertFalse(checkTargetSum.isTargetSumExistNaive(nums, nonExistingTarget));
+    }
+
+    @Test
+    public void givenArrayOfIntegers_whenTargetSumHashSet_thenPairExists() {
+        assertTrue(checkTargetSum.isTargetSumExistNaive(nums, existingTarget));
+    }
+
+    @Test
+    public void givenArrayOfIntegers_whenTargetSumHashSet_thenPairDoesNotExists() {
+        assertFalse(checkTargetSum.isTargetSumExistNaive(nums, nonExistingTarget));
+    }
+}
diff --git a/algorithms-modules/algorithms-miscellaneous-7/README.md b/algorithms-modules/algorithms-miscellaneous-7/README.md
index 918fcd21dd..ab07d655f9 100644
--- a/algorithms-modules/algorithms-miscellaneous-7/README.md
+++ b/algorithms-modules/algorithms-miscellaneous-7/README.md
@@ -1,4 +1,6 @@
 ### Relevant Articles:
 
 - [Algorithm to Identify and Validate a Credit Card Number](https://www.baeldung.com/java-validate-cc-number)
+- [Find the N Most Frequent Elements in a Java Array](https://www.baeldung.com/java-n-most-frequent-elements-array)
+- [Getting Pixel Array From Image in Java](https://www.baeldung.com/java-getting-pixel-array-from-image)
 - More articles: [[<-- prev]](/algorithms-miscellaneous-6)
diff --git a/algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/frequentelements/MostFrequentElementsFinder.java b/algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/frequentelements/MostFrequentElementsFinder.java
new file mode 100644
index 0000000000..0d78691bcc
--- /dev/null
+++ b/algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/frequentelements/MostFrequentElementsFinder.java
@@ -0,0 +1,93 @@
+package com.baeldung.algorithms.frequentelements;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class MostFrequentElementsFinder {
+
+    public static List<Integer> findByHashMapAndPriorityQueue(Integer[] array, int n) {
+        Map<Integer, Integer> countMap = new HashMap<>();
+
+        // For each element i in the array, add it to the countMap and increment its count.
+        for (Integer i : array) {
+            countMap.put(i, countMap.getOrDefault(i, 0) + 1);
+        }
+
+        // Create a max heap (priority queue) that will prioritize elements with higher counts.
+        PriorityQueue<Integer> heap = new PriorityQueue<>(
+                (a, b) -> countMap.get(b) - countMap.get(a));
+
+        // Add all the unique elements in the array to the heap.
+        heap.addAll(countMap.keySet());
+
+        List<Integer> result = new ArrayList<>();
+        for (int i = 0; i < n && !heap.isEmpty(); i++) {
+            // Poll the highest-count element from the heap and add it to the result list.
+            result.add(heap.poll());
+        }
+
+        return result;
+    }
+
+    public static List<Integer> findByStream(Integer[] arr, int n) {
+        return Arrays.stream(arr).collect(Collectors.groupingBy(i -> i, Collectors.counting()))
+                .entrySet().stream()
+                .sorted(Collections.reverseOrder(Map.Entry.comparingByValue()))
+                .map(Map.Entry::getKey)
+                .limit(n)
+                .collect(Collectors.toList());
+    }
+
+    public static List<Integer> findByTreeMap(Integer[] arr, int n) {
+        // Create a TreeMap and use a reverse order comparator to sort the entries by frequency in descending order
+        Map<Integer, Integer> countMap = new TreeMap<>(Collections.reverseOrder());
+
+        for (int i : arr) {
+            countMap.put(i, countMap.getOrDefault(i, 0) + 1);
+        }
+
+        // Create a list of the map entries and sort them by value (i.e. by frequency) in descending order
+        List<Map.Entry<Integer, Integer>> sortedEntries = new ArrayList<>(countMap.entrySet());
+        sortedEntries.sort((e1, e2) -> e2.getValue().compareTo(e1.getValue()));
+
+        // Extract the n most frequent elements from the sorted list of entries
+        List<Integer> result = new ArrayList<>();
+        for (int i = 0; i < n && i < sortedEntries.size(); i++) {
+            result.add(sortedEntries.get(i).getKey());
+        }
+
+        return result;
+    }
+
+    public static List<Integer> findByBucketSort(Integer[] arr, int n) {
+        List<Integer> result = new ArrayList<>();
+        Map<Integer, Integer> freqMap = new HashMap<>();
+        List<Integer>[] bucket = new List[arr.length + 1];
+
+        // Loop through the input array and update the frequency count of each element in the HashMap
+        for (int num : arr) {
+            freqMap.put(num, freqMap.getOrDefault(num, 0) + 1);
+        }
+
+        // Loop through the HashMap and add each element to its corresponding bucket based on its frequency count
+        for (int num : freqMap.keySet()) {
+            int freq = freqMap.get(num);
+            if (bucket[freq] == null) {
+                bucket[freq] = new ArrayList<>();
+            }
+            bucket[freq].add(num);
+        }
+
+        // Loop through the bucket array in reverse order and add the elements to the result list
+        // until we have found the n most frequent elements
+        for (int i = bucket.length - 1; i >= 0 && result.size() < n; i--) {
+            if (bucket[i] != null) {
+                result.addAll(bucket[i]);
+            }
+        }
+
+        // Return a sublist of the result list containing only the first n elements
+        return result.subList(0, n);
+    }
+
+}
diff --git a/algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/pixelarray/GetPixelArray.java b/algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/pixelarray/GetPixelArray.java
new file mode 100644
index 0000000000..ba7fe44808
--- /dev/null
+++ b/algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/pixelarray/GetPixelArray.java
@@ -0,0 +1,65 @@
+package com.baeldung.algorithms.pixelarray;
+
+import java.awt.image.BufferedImage;
+import java.awt.image.DataBufferByte;
+public class GetPixelArray {
+
+    public static int[][] get2DPixelArraySlow(BufferedImage sampleImage) {
+        int width = sampleImage.getWidth();
+        int height = sampleImage.getHeight();
+        int[][] result = new int[height][width];
+
+        for (int row = 0; row < height; row++) {
+            for (int col = 0; col < width; col++) {
+                result[row][col] = sampleImage.getRGB(col, row);
+            }
+        }
+
+        return result;
+    }
+
+    public static int[][] get2DPixelArrayFast(BufferedImage image) {
+        final byte[] pixelData = ((DataBufferByte) image.getRaster().getDataBuffer()).getData();
+        final int width = image.getWidth();
+        final int height = image.getHeight();
+        final boolean hasAlphaChannel = image.getAlphaRaster() != null;
+
+        int[][] result = new int[height][width];
+        if (hasAlphaChannel) {
+            final int numberOfValues = 4;
+            for (int valueIndex = 0, row = 0, col = 0; valueIndex + numberOfValues - 1 < pixelData.length; valueIndex += numberOfValues) {
+                // Getting the values for each pixel from the pixelData array.
+                int argb = 0;
+                argb += (((int) pixelData[valueIndex] & 0xff) << 24); // alpha value
+                argb += ((int) pixelData[valueIndex + 1] & 0xff); // blue value
+                argb += (((int) pixelData[valueIndex + 2] & 0xff) << 8); // green value
+                argb += (((int) pixelData[valueIndex + 3] & 0xff) << 16); // red value
+                result[row][col] = argb;
+
+                col++;
+                if (col == width) {
+                    col = 0;
+                    row++;
+                }
+            }
+        } else {
+            final int numberOfValues = 3;
+            for (int valueIndex = 0, row = 0, col = 0; valueIndex + numberOfValues - 1 < pixelData.length; valueIndex += numberOfValues) {
+                int argb = 0;
+                argb += -16777216; // 255 alpha value (fully opaque)
+                argb += ((int) pixelData[valueIndex] & 0xff); // blue value
+                argb += (((int) pixelData[valueIndex + 1] & 0xff) << 8); // green value
+                argb += (((int) pixelData[valueIndex + 2] & 0xff) << 16); // red value
+                result[row][col] = argb;
+
+                col++;
+                if (col == width) {
+                    col = 0;
+                    row++;
+                }
+            }
+        }
+
+        return result;
+    }
+}
\ No newline at end of file
diff --git a/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/frequentelements/MostFrequentElementsUnitTest.java b/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/frequentelements/MostFrequentElementsUnitTest.java
new file mode 100644
index 0000000000..9fa4862163
--- /dev/null
+++ b/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/frequentelements/MostFrequentElementsUnitTest.java
@@ -0,0 +1,33 @@
+package com.baeldung.algorithms.frequentelements;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+public class MostFrequentElementsUnitTest {
+
+    private final Integer[] inputArray = {1, 2, 3, 4, 5, 5, 5, 6, 6, 7, 7, 7, 7, 8, 9, 9, 9, 9, 9};
+    private final int n = 3;
+    private final Integer[] outputArray = {9, 7, 5};
+
+    @Test
+    void givenIntegersArray_UseFindByHashMapAndPriorityQueueMethod_thenReturnMostFrequentElements() {
+        assertThat(MostFrequentElementsFinder.findByHashMapAndPriorityQueue(inputArray, n)).containsExactly(outputArray);
+    }
+
+    @Test
+    void givenIntegersArray_UseFindByBucketSortMethod_thenReturnMostFrequentElements() {
+        assertThat(MostFrequentElementsFinder.findByBucketSort(inputArray, n)).containsExactly(outputArray);
+    }
+
+    @Test
+    void givenIntegersArray_UseFindByStreamMethod_thenReturnMostFrequentElements() {
+        assertThat(MostFrequentElementsFinder.findByStream(inputArray, n)).containsExactly(outputArray);
+    }
+
+    @Test
+    void givenIntegersArray_UseFindByTreeMapMethod_thenReturnMostFrequentElements() {
+        assertThat(MostFrequentElementsFinder.findByTreeMap(inputArray, n)).containsExactly(outputArray);
+    }
+
+}
diff --git a/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/pixelarray/GetPixelArrayUnitTest.java b/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/pixelarray/GetPixelArrayUnitTest.java
new file mode 100644
index 0000000000..b7bbb462dd
--- /dev/null
+++ b/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/pixelarray/GetPixelArrayUnitTest.java
@@ -0,0 +1,30 @@
+package com.baeldung.algorithms.pixelarray;
+
+import static com.baeldung.algorithms.pixelarray.GetPixelArray.get2DPixelArrayFast;
+import static com.baeldung.algorithms.pixelarray.GetPixelArray.get2DPixelArraySlow;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+
+public class GetPixelArrayUnitTest {
+    @Test
+    public void givenImage_whenGetPixelArray_thenBothMethodsReturnEqualValues() {
+        BufferedImage sampleImage = null;
+        try {
+            sampleImage = ImageIO.read(new File("src/main/resources/images/sampleImage.jpg"));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        int[][] firstResult = get2DPixelArraySlow(sampleImage);
+        int[][] secondResult = get2DPixelArrayFast(sampleImage);
+
+        assertTrue(Arrays.deepEquals(firstResult, secondResult));
+    }
+}
diff --git a/annotations/annotation-processing/pom.xml b/annotations/annotation-processing/pom.xml
index 2a17242ee5..14bbc409e5 100644
--- a/annotations/annotation-processing/pom.xml
+++ b/annotations/annotation-processing/pom.xml
@@ -21,7 +21,6 @@
         </dependency>
     </dependencies>
 
-
     <properties>
         <auto-service.version>1.0-rc2</auto-service.version>
     </properties>
diff --git a/apache-cxf-modules/cxf-aegis/pom.xml b/apache-cxf-modules/cxf-aegis/pom.xml
index d013aabc65..6b9e026cdd 100644
--- a/apache-cxf-modules/cxf-aegis/pom.xml
+++ b/apache-cxf-modules/cxf-aegis/pom.xml
@@ -20,4 +20,8 @@
         </dependency>
     </dependencies>
 
+    <properties>
+        <cxf.version>4.0.0</cxf.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/apache-cxf-modules/cxf-introduction/pom.xml b/apache-cxf-modules/cxf-introduction/pom.xml
index fe7b917c6f..fdcd100cc5 100644
--- a/apache-cxf-modules/cxf-introduction/pom.xml
+++ b/apache-cxf-modules/cxf-introduction/pom.xml
@@ -23,6 +23,16 @@
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>${cxf.version}</version>
         </dependency>
+        <dependency>
+            <groupId>jakarta.xml.ws</groupId>
+            <artifactId>jakarta.xml.ws-api</artifactId>
+            <version>${jakarta-xml.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.jws</groupId>
+            <artifactId>jakarta.jws-api</artifactId>
+            <version>${jakarta.jws.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -37,4 +47,10 @@
         </plugins>
     </build>
 
+    <properties>
+        <cxf.version>4.0.0</cxf.version>
+        <jakarta-xml.version>4.0.0</jakarta-xml.version>
+        <jakarta.jws.version>3.0.0</jakarta.jws.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Baeldung.java b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Baeldung.java
index 472d38b8e1..cd482af0db 100644
--- a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Baeldung.java
+++ b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Baeldung.java
@@ -2,8 +2,8 @@ package com.baeldung.cxf.introduction;
 
 import java.util.Map;
 
-import javax.jws.WebService;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.jws.WebService;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @WebService
 public interface Baeldung {
diff --git a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/BaeldungImpl.java b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/BaeldungImpl.java
index 240f6bb1da..04a6243cc2 100644
--- a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/BaeldungImpl.java
+++ b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/BaeldungImpl.java
@@ -3,7 +3,7 @@ package com.baeldung.cxf.introduction;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javax.jws.WebService;
+import jakarta.jws.WebService;
 
 @WebService(endpointInterface = "com.baeldung.cxf.introduction.Baeldung")
 public class BaeldungImpl implements Baeldung {
diff --git a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Server.java b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Server.java
index 2ac649f4c5..f00a64a055 100644
--- a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Server.java
+++ b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Server.java
@@ -1,6 +1,6 @@
 package com.baeldung.cxf.introduction;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 public class Server {
     public static void main(String args[]) throws InterruptedException {
diff --git a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Student.java b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Student.java
index cad8f94d97..0605956bbc 100644
--- a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Student.java
+++ b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/Student.java
@@ -1,6 +1,6 @@
 package com.baeldung.cxf.introduction;
 
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlJavaTypeAdapter(StudentAdapter.class)
 public interface Student {
diff --git a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentAdapter.java b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentAdapter.java
index 29b829d808..7885c953a5 100644
--- a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentAdapter.java
+++ b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentAdapter.java
@@ -1,6 +1,6 @@
 package com.baeldung.cxf.introduction;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 public class StudentAdapter extends XmlAdapter<StudentImpl, Student> {
     public StudentImpl marshal(Student student) throws Exception {
diff --git a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentImpl.java b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentImpl.java
index bc9dd27afe..041418befb 100644
--- a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentImpl.java
+++ b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentImpl.java
@@ -1,6 +1,6 @@
 package com.baeldung.cxf.introduction;
 
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlType(name = "Student")
 public class StudentImpl implements Student {
diff --git a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentMap.java b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentMap.java
index 4c40886c42..aa17b0cf4f 100644
--- a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentMap.java
+++ b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentMap.java
@@ -3,8 +3,8 @@ package com.baeldung.cxf.introduction;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlType(name = "StudentMap")
 public class StudentMap {
diff --git a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentMapAdapter.java b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentMapAdapter.java
index f156676a5f..3bf1bfd2ff 100644
--- a/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentMapAdapter.java
+++ b/apache-cxf-modules/cxf-introduction/src/main/java/com/baeldung/cxf/introduction/StudentMapAdapter.java
@@ -3,7 +3,7 @@ package com.baeldung.cxf.introduction;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 public class StudentMapAdapter extends XmlAdapter<StudentMap, Map<Integer, Student>> {
     public StudentMap marshal(Map<Integer, Student> boundMap) throws Exception {
diff --git a/apache-cxf-modules/cxf-introduction/src/test/java/com/baeldung/cxf/introduction/StudentLiveTest.java b/apache-cxf-modules/cxf-introduction/src/test/java/com/baeldung/cxf/introduction/StudentLiveTest.java
index 60fc0a10e7..89b127a742 100644
--- a/apache-cxf-modules/cxf-introduction/src/test/java/com/baeldung/cxf/introduction/StudentLiveTest.java
+++ b/apache-cxf-modules/cxf-introduction/src/test/java/com/baeldung/cxf/introduction/StudentLiveTest.java
@@ -5,8 +5,8 @@ import static org.junit.Assert.assertEquals;
 import java.util.Map;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.soap.SOAPBinding;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.soap.SOAPBinding;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/apache-cxf-modules/cxf-jaxrs-implementation/pom.xml b/apache-cxf-modules/cxf-jaxrs-implementation/pom.xml
index cc5eba4025..8418853b1e 100644
--- a/apache-cxf-modules/cxf-jaxrs-implementation/pom.xml
+++ b/apache-cxf-modules/cxf-jaxrs-implementation/pom.xml
@@ -16,12 +16,28 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>${cxf.version}</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>${cxf.version}</version>
+            <version>4.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.xml.ws</groupId>
+            <artifactId>jakarta.xml.ws-api</artifactId>
+            <version>${jakarta-xml.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.jws</groupId>
+            <artifactId>jakarta.jws-api</artifactId>
+            <version>${jakarta-jws.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-web-api</artifactId>
+            <version>${jakarta-platform.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -50,6 +66,9 @@
 
     <properties>
         <httpclient.version>4.5.2</httpclient.version>
+        <jakarta-xml.version>4.0.0</jakarta-xml.version>
+        <jakarta-jws.version>3.0.0</jakarta-jws.version>
+        <jakarta-platform.version>9.0.0</jakarta-platform.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/Course.java b/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/Course.java
index dba9b9c661..9f2ba2e837 100644
--- a/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/Course.java
+++ b/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/Course.java
@@ -1,8 +1,8 @@
 package com.baeldung.cxf.jaxrs.implementation;
 
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/CourseRepository.java b/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/CourseRepository.java
index a2fd6be435..e527180440 100644
--- a/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/CourseRepository.java
+++ b/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/CourseRepository.java
@@ -1,7 +1,7 @@
 package com.baeldung.cxf.jaxrs.implementation;
 
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/Student.java b/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/Student.java
index bd3dad0f5e..f6c4e32cdd 100644
--- a/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/Student.java
+++ b/apache-cxf-modules/cxf-jaxrs-implementation/src/main/java/com/baeldung/cxf/jaxrs/implementation/Student.java
@@ -1,6 +1,6 @@
 package com.baeldung.cxf.jaxrs.implementation;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "Student")
 public class Student {
diff --git a/apache-cxf-modules/cxf-jaxrs-implementation/src/test/java/com/baeldung/cxf/jaxrs/implementation/ServiceLiveTest.java b/apache-cxf-modules/cxf-jaxrs-implementation/src/test/java/com/baeldung/cxf/jaxrs/implementation/ServiceLiveTest.java
index 29c34ae16b..a9f71930f2 100644
--- a/apache-cxf-modules/cxf-jaxrs-implementation/src/test/java/com/baeldung/cxf/jaxrs/implementation/ServiceLiveTest.java
+++ b/apache-cxf-modules/cxf-jaxrs-implementation/src/test/java/com/baeldung/cxf/jaxrs/implementation/ServiceLiveTest.java
@@ -7,7 +7,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
 
-import javax.xml.bind.JAXB;
+import jakarta.xml.bind.JAXB;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpDelete;
diff --git a/apache-cxf-modules/cxf-spring/pom.xml b/apache-cxf-modules/cxf-spring/pom.xml
index ebbebd7f3b..1c87ae4bfb 100644
--- a/apache-cxf-modules/cxf-spring/pom.xml
+++ b/apache-cxf-modules/cxf-spring/pom.xml
@@ -40,10 +40,22 @@
             <artifactId>spring-webmvc</artifactId>
             <version>${spring.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-ri</artifactId>
+            <version>2.3.3</version>
+            <type>pom</type>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet-api.version}</version>
+            <version>4.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
         </dependency>
     </dependencies>
 
@@ -103,8 +115,9 @@
     </profiles>
 
     <properties>
-        <spring.version>4.3.4.RELEASE</spring.version>
+        <spring.version>5.3.25</spring.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/pom.xml b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/pom.xml
index 26c8a87c2b..ce2b0059c3 100644
--- a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/pom.xml
+++ b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/pom.xml
@@ -23,6 +23,11 @@
             <artifactId>cxf-rt-rs-sse</artifactId>
             <version>${cxf-version}</version>
         </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>${jakarta-ws.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -55,7 +60,8 @@
     </build>
 
     <properties>
-        <cxf-version>3.2.0</cxf-version>
+        <cxf-version>4.0.0</cxf-version>
+        <jakarta-ws.version>3.1.0</jakarta-ws.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientApp.java b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientApp.java
index 5d42b3a243..af9a9c7691 100644
--- a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientApp.java
+++ b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientApp.java
@@ -1,10 +1,10 @@
 package com.baeldung.sse.jaxrs.client;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.sse.InboundSseEvent;
-import javax.ws.rs.sse.SseEventSource;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.sse.InboundSseEvent;
+import jakarta.ws.rs.sse.SseEventSource;
 import java.util.function.Consumer;
 
 public class SseClientApp {
diff --git a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientBroadcastApp.java b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientBroadcastApp.java
index 9afc187a6d..4e3c236437 100644
--- a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientBroadcastApp.java
+++ b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-client/src/main/java/com/baeldung/sse/jaxrs/client/SseClientBroadcastApp.java
@@ -1,10 +1,10 @@
 package com.baeldung.sse.jaxrs.client;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.sse.InboundSseEvent;
-import javax.ws.rs.sse.SseEventSource;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.sse.InboundSseEvent;
+import jakarta.ws.rs.sse.SseEventSource;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
diff --git a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/pom.xml b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/pom.xml
index 0467fd9e5d..3bd3e5cb27 100644
--- a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/pom.xml
+++ b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/pom.xml
@@ -15,16 +15,14 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
-            <version>${rs-api.version}</version>
-            <scope>provided</scope>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>${jakarta-ws.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <version>${cdi-api.version}</version>
-            <scope>provided</scope>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <version>${jakarta-cdi-api}</version>
         </dependency>
         <dependency>
             <groupId>javax.json.bind</groupId>
@@ -37,6 +35,11 @@
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${maven-war-plugin.version}</version>
+            </plugin>
             <plugin>
                 <groupId>net.wasdev.wlp.maven.plugins</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
@@ -78,9 +81,10 @@
         <liberty-maven-plugin.version>2.4.2</liberty-maven-plugin.version>
         <failOnMissingWebXml>false</failOnMissingWebXml>
         <openliberty-version>18.0.0.2</openliberty-version>
-        <rs-api.version>2.1</rs-api.version>
-        <cdi-api.version>2.0</cdi-api.version>
+        <jakarta-ws.version>3.1.0</jakarta-ws.version>
+        <jakarta-cdi-api>4.0.1</jakarta-cdi-api>
         <bind-api.version>1.0</bind-api.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/AppConfig.java b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/AppConfig.java
index 058d19f045..fdd1af632c 100644
--- a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/AppConfig.java
+++ b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/AppConfig.java
@@ -1,7 +1,7 @@
 package com.baeldung.sse.jaxrs;
 
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.core.Application;
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.core.Application;
 
 @ApplicationPath("sse")
 public class AppConfig extends Application {
diff --git a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/SseResource.java b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/SseResource.java
index 1f60168a1b..3e211f109b 100644
--- a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/SseResource.java
+++ b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/SseResource.java
@@ -1,15 +1,15 @@
 package com.baeldung.sse.jaxrs;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.sse.OutboundSseEvent;
-import javax.ws.rs.sse.Sse;
-import javax.ws.rs.sse.SseBroadcaster;
-import javax.ws.rs.sse.SseEventSink;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.sse.OutboundSseEvent;
+import jakarta.ws.rs.sse.Sse;
+import jakarta.ws.rs.sse.SseBroadcaster;
+import jakarta.ws.rs.sse.SseEventSink;
 
 @ApplicationScoped
 @Path("stock")
diff --git a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/StockService.java b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/StockService.java
index 15818ead5d..721ef35678 100644
--- a/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/StockService.java
+++ b/apache-cxf-modules/sse-jaxrs/sse-jaxrs-server/src/main/java/com/baeldung/sse/jaxrs/StockService.java
@@ -1,11 +1,11 @@
 package com.baeldung.sse.jaxrs;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Initialized;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDateTime;
diff --git a/apache-httpclient-2/README.md b/apache-httpclient-2/README.md
index 45f1e41637..a19112476b 100644
--- a/apache-httpclient-2/README.md
+++ b/apache-httpclient-2/README.md
@@ -12,6 +12,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Reading an HTTP Response Body as a String in Java](https://www.baeldung.com/java-http-response-body-as-string)
 - [How To Get Cookies From the Apache HttpClient Response](https://www.baeldung.com/java-apache-httpclient-cookies)
 - [Enabling Logging for Apache HttpClient](https://www.baeldung.com/apache-httpclient-enable-logging)
-- [Expand Shortened URLs with Apache HttpClient](https://www.baeldung.com/apache-httpclient-expand-url)
 - [Apache HttpClient vs. CloseableHttpClient](https://www.baeldung.com/apache-httpclient-vs-closeablehttpclient)
+- [Expand Shortened URLs with Apache HttpClient](https://www.baeldung.com/apache-httpclient-expand-url)
 - More articles: [[<-- prev]](../apache-httpclient)
diff --git a/apache-httpclient-2/pom.xml b/apache-httpclient-2/pom.xml
index 91c4c718c0..8b7217dbe1 100644
--- a/apache-httpclient-2/pom.xml
+++ b/apache-httpclient-2/pom.xml
@@ -21,17 +21,6 @@
             <version>${commons-lang3.version}</version>
         </dependency>
         <!-- http client -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>${httpclient.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
@@ -97,8 +86,7 @@
     <properties>
         <assertj.version>3.22.0</assertj.version>
         <mockserver.version>5.11.2</mockserver.version>
-        <httpclient.version>4.5.8</httpclient.version>
-        <httpclient5.version>5.2</httpclient5.version>
+        <httpclient5.version>5.2.1</httpclient5.version>
         <maven.compiler.source.version>11</maven.compiler.source.version>
         <maven.compiler.target.version>11</maven.compiler.target.version>
         <spring-boot.version>2.1.7.RELEASE</spring-boot.version>
diff --git a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/cookies/HttpClientGettingCookieValueUnitTest.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/cookies/HttpClientGettingCookieValueUnitTest.java
index 265fa39816..ef57406705 100644
--- a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/cookies/HttpClientGettingCookieValueUnitTest.java
+++ b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/cookies/HttpClientGettingCookieValueUnitTest.java
@@ -23,7 +23,7 @@ import java.io.IOException;
 class HttpClientGettingCookieValueUnitTest {
     private static Logger log = LoggerFactory.getLogger(HttpClientGettingCookieValueUnitTest.class);
 
-    private static final String SAMPLE_URL = "http://www.baeldung.com/";
+    private static final String SAMPLE_URL = "http://www.github.com/";
 
     @Test
     void whenSettingCustomCookieOnTheRequest_thenGettingTheSameCookieFromTheResponse() throws IOException {
diff --git a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/expandUrl/HttpClientExpandUrlLiveTest.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/expandUrl/HttpClientExpandUrlLiveTest.java
new file mode 100644
index 0000000000..c1bb5bdddb
--- /dev/null
+++ b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/expandUrl/HttpClientExpandUrlLiveTest.java
@@ -0,0 +1,126 @@
+package com.baeldung.httpclient.expandUrl;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.io.IOException;
+import java.util.List;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+
+import org.apache.hc.client5.http.classic.methods.HttpHead;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpHeaders;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+class HttpClientExpandUrlLiveTest {
+
+    private static CloseableHttpClient httpClient;
+
+    @BeforeAll
+    static void setup() {
+        httpClient = HttpClientBuilder.create()
+            .disableRedirectHandling()
+            .build();
+    }
+
+    @AfterAll
+    static void tearDown() throws IOException {
+        if (httpClient != null) {
+            httpClient.close();
+        }
+    }
+
+    @Test
+    void givenShortenedOnce_whenUrlIsExpanded_thenCorrectResult() throws IOException {
+        final String expectedResult = "https://www.baeldung.com/rest-versioning";
+        final String actualResult = expandSingleLevel("http://bit.ly/3LScTri");
+        assertThat(actualResult, equalTo(expectedResult));
+    }
+
+    @Test
+    void givenShortenedMultiple_whenUrlIsExpanded_thenCorrectResult() throws IOException {
+        final String expectedResult = "https://www.baeldung.com/rest-versioning";
+        final String actualResult = expand("http://t.co/e4rDDbnzmk");
+        assertThat(actualResult, equalTo(expectedResult));
+    }
+
+    private String expand(final String urlArg) throws IOException {
+        String originalUrl = urlArg;
+        String newUrl = expandSingleLevel(originalUrl);
+        while (!originalUrl.equals(newUrl)) {
+            originalUrl = newUrl;
+            newUrl = expandSingleLevel(originalUrl);
+        }
+
+        return newUrl;
+    }
+
+    final String expandSafe(final String urlArg) throws IOException {
+        String originalUrl = urlArg;
+        String newUrl = expandSingleLevelSafe(originalUrl).getRight();
+        final List<String> alreadyVisited = Lists.newArrayList(originalUrl, newUrl);
+        while (!originalUrl.equals(newUrl)) {
+            originalUrl = newUrl;
+            final Pair<Integer, String> statusAndUrl = expandSingleLevelSafe(originalUrl);
+            newUrl = statusAndUrl.getRight();
+            final boolean isRedirect = statusAndUrl.getLeft() == 301 || statusAndUrl.getLeft() == 302;
+            if (isRedirect && alreadyVisited.contains(newUrl)) {
+                throw new IllegalStateException("Likely a redirect loop");
+            }
+            alreadyVisited.add(newUrl);
+        }
+
+        return newUrl;
+    }
+
+    private Pair<Integer, String> expandSingleLevelSafe(final String url) throws IOException {
+        try {
+            HttpHead request = new HttpHead(url);
+            Pair<Integer, String> resp = httpClient.execute(request, response -> {
+                final int statusCode = response.getCode();
+                if (statusCode != 301 && statusCode != 302) {
+                    return new ImmutablePair<>(statusCode, url);
+                }
+                final Header[] headers = response.getHeaders(HttpHeaders.LOCATION);
+                Preconditions.checkState(headers.length == 1);
+                final String newUrl = headers[0].getValue();
+
+                return new ImmutablePair<>(statusCode, newUrl);
+            });
+            return resp;
+        } catch (final IllegalArgumentException uriEx) {
+            return new ImmutablePair<>(500, url);
+        }
+    }
+
+    private String expandSingleLevel(final String url) throws IOException {
+        try {
+            HttpHead request = new HttpHead(url);
+            String expandedUrl = httpClient.execute(request, response -> {
+                final int statusCode = response.getCode();
+                if (statusCode != 301 && statusCode != 302) {
+                    return url;
+                }
+                final Header[] headers = response.getHeaders(HttpHeaders.LOCATION);
+                Preconditions.checkState(headers.length == 1);
+
+                return headers[0].getValue();
+            });
+            return expandedUrl;
+        } catch (final IllegalArgumentException uriEx) {
+            return url;
+        }
+    }
+
+}
diff --git a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java
index 0d45eedc12..adf9a1a1a6 100644
--- a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java
+++ b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java
@@ -1,37 +1,39 @@
 package com.baeldung.httpclient.httpclient;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
 import org.apache.hc.core5.http.HttpEntity;
-import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
 class ApacheHttpClientUnitTest extends GetRequestMockServer {
 
     @Test
     void givenDeveloperUsedHttpClient_whenExecutingGetRequest_thenStatusIsOkButSonarReportsAnIssue() throws IOException {
         HttpClient httpClient = HttpClients.createDefault();
         HttpGet httpGet = new HttpGet(serviceOneUrl);
-        HttpResponse response = httpClient.execute(httpGet);
-        assertThat(response.getCode()).isEqualTo(HttpStatus.SC_OK);
+        httpClient.execute(httpGet, response -> {
+                assertThat(response.getCode()).isEqualTo(HttpStatus.SC_OK);
+                return response;
+        });
     }
 
     @Test
     void givenDeveloperUsedCloseableHttpClient_whenExecutingGetRequest_thenStatusIsOk() throws IOException {
         try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
             HttpGet httpGet = new HttpGet(serviceOneUrl);
-            HttpResponse response = httpClient.execute(httpGet);
-            assertThat(response.getCode()).isEqualTo(HttpStatus.SC_OK);
+            httpClient.execute(httpGet, response -> {
+                assertThat(response.getCode()).isEqualTo(HttpStatus.SC_OK);
+                return response;
+            });
         }
     }
 
@@ -39,20 +41,10 @@ class ApacheHttpClientUnitTest extends GetRequestMockServer {
     void givenDeveloperUsedHttpClientBuilder_whenExecutingGetRequest_thenStatusIsOk() throws IOException {
         try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
             HttpGet httpGet = new HttpGet(serviceOneUrl);
-            HttpResponse response = httpClient.execute(httpGet);
-            assertThat(response.getCode()).isEqualTo(HttpStatus.SC_OK);
-        }
-    }
-
-    @Test
-    void givenDeveloperUsedCloseableHttpResponse_whenExecutingGetRequest_thenStatusIsOk() throws IOException {
-        try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
-            HttpGet httpGet = new HttpGet(serviceOneUrl);
-            try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
-                HttpEntity entity = response.getEntity();
-                EntityUtils.consume(entity);
+            httpClient.execute(httpGet, response -> {
                 assertThat(response.getCode()).isEqualTo(HttpStatus.SC_OK);
-            }
+                return response;
+            });
         }
     }
 
@@ -60,18 +52,20 @@ class ApacheHttpClientUnitTest extends GetRequestMockServer {
     void givenDeveloperUsedSingleClient_whenExecutingTwoGetRequest_thenStatusIsOk() throws IOException {
         try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
             HttpGet httpGetOne = new HttpGet(serviceOneUrl);
-            try (CloseableHttpResponse responseOne = httpClient.execute(httpGetOne)) {
+            httpClient.execute(httpGetOne, responseOne -> {
                 HttpEntity entityOne = responseOne.getEntity();
                 EntityUtils.consume(entityOne);
                 assertThat(responseOne.getCode()).isEqualTo(HttpStatus.SC_OK);
-            }
+                return responseOne;
+            });
 
             HttpGet httpGetTwo = new HttpGet(serviceTwoUrl);
-            try (CloseableHttpResponse responseTwo = httpClient.execute(httpGetTwo)) {
-                HttpEntity entityTwo = responseTwo.getEntity();
+            httpClient.execute(httpGetTwo, responseTwo -> {
+                HttpEntity entityTwo = httpGetTwo.getEntity();
                 EntityUtils.consume(entityTwo);
                 assertThat(responseTwo.getCode()).isEqualTo(HttpStatus.SC_OK);
-            }
+                return responseTwo;
+            });
         }
     }
 
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestLiveTest.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestLiveTest.java
new file mode 100644
index 0000000000..d19e0e1d86
--- /dev/null
+++ b/apache-httpclient/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestLiveTest.java
@@ -0,0 +1,40 @@
+package com.baeldung.httpclient;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpStatus;
+import org.junit.jupiter.api.Test;
+
+class HttpClientCancelRequestLiveTest {
+
+    private static final String SAMPLE_URL = "http://www.github.com";
+
+    @Test
+    void whenRequestIsCanceled_thenCorrect() throws IOException {
+        HttpGet request = new HttpGet(SAMPLE_URL);
+        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+                httpClient.execute(request, response -> {
+                HttpEntity entity = response.getEntity();
+
+                System.out.println("----------------------------------------");
+                System.out.println(response.getCode());
+                if (entity != null) {
+                    System.out.println("Response content length: " + entity.getContentLength());
+                }
+                System.out.println("----------------------------------------");
+                // Do not feel like reading the response body
+                // Call abort on the request object
+                request.abort();
+
+                assertThat(response.getCode()).isEqualTo(HttpStatus.SC_OK);
+                return response;
+            });
+        }
+    }
+}
diff --git a/apache-httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientLiveTest.java b/apache-httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientLiveTest.java
index ef12c37412..4173909f7d 100644
--- a/apache-httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientLiveTest.java
+++ b/apache-httpclient/src/test/java/com/baeldung/httpclient/base/HttpClientLiveTest.java
@@ -1,8 +1,8 @@
 package com.baeldung.httpclient.base;
 
 import com.baeldung.httpclient.ResponseUtil;
+
 import org.apache.http.Header;
-import org.apache.http.HttpEntity;
 import org.apache.http.HttpHeaders;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -10,7 +10,6 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
 import org.junit.After;
 import org.junit.Before;
@@ -73,30 +72,4 @@ public class HttpClientLiveTest {
         assertThat(headers, not(emptyArray()));
     }
 
-    // tests - cancel request
-
-    @Test
-    public final void whenRequestIsCanceled_thenCorrect() throws IOException {
-        instance = HttpClients.custom().build();
-        final HttpGet request = new HttpGet(SAMPLE_URL);
-        response = instance.execute(request);
-
-        try {
-            final HttpEntity entity = response.getEntity();
-
-            System.out.println("----------------------------------------");
-            System.out.println(response.getStatusLine());
-            if (entity != null) {
-                System.out.println("Response content length: " + entity.getContentLength());
-            }
-            System.out.println("----------------------------------------");
-
-            // Do not feel like reading the response body
-            // Call abort on the request object
-            request.abort();
-        } finally {
-            response.close();
-        }
-    }
-
 }
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/.gitignore b/apache-httpclient4/.gitignore
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/.gitignore
rename to apache-httpclient4/.gitignore
diff --git a/httpclient4/README.md b/apache-httpclient4/README.md
similarity index 55%
rename from httpclient4/README.md
rename to apache-httpclient4/README.md
index 445db1108b..22b0391e6b 100644
--- a/httpclient4/README.md
+++ b/apache-httpclient4/README.md
@@ -1,12 +1,16 @@
-## Apache HttpClient
+## Apache HttpClient 4
 
 This module contains articles about Apache HttpClient 4.5
 
 ### Relevant Articles
 
+- [Apache HttpClient – Cancel Request](https://www.baeldung.com/httpclient-cancel-request)
 - [Apache HttpClient with SSL](https://www.baeldung.com/httpclient-ssl)
 - [Apache HttpClient Timeout](https://www.baeldung.com/httpclient-timeout)
 - [Custom HTTP Header with the Apache HttpClient](https://www.baeldung.com/httpclient-custom-http-header)
+- [Apache HttpClient vs. CloseableHttpClient](https://www.baeldung.com/apache-httpclient-vs-closeablehttpclient)
+- [Expand Shortened URLs with Apache HttpClient](https://www.baeldung.com/apache-httpclient-expand-url)
+- [Retrying Requests using Apache HttpClient](https://www.baeldung.com/java-retrying-requests-using-apache-httpclient)
 
 ### Running the Tests
 To run the live tests, use the command: mvn clean install -Plive
diff --git a/httpclient4/pom.xml b/apache-httpclient4/pom.xml
similarity index 95%
rename from httpclient4/pom.xml
rename to apache-httpclient4/pom.xml
index 8f896283b3..e0bf9dd5f6 100644
--- a/httpclient4/pom.xml
+++ b/apache-httpclient4/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         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">
+    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>httpclient4</artifactId>
+    <artifactId>apache-httpclient4</artifactId>
     <version>0.1-SNAPSHOT</version>
-    <name>httpclient4</name>
+    <name>apache-httpclient4</name>
     <packaging>war</packaging>
 
     <parent>
@@ -152,6 +152,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.mock-server</groupId>
+            <artifactId>mockserver-netty</artifactId>
+            <version>${mockserver.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock</artifactId>
@@ -284,8 +289,10 @@
         <wiremock.version>2.5.1</wiremock.version>
         <httpcore.version>4.4.16</httpcore.version>
         <httpclient.version>4.5.14</httpclient.version>
+        <mockserver.version>5.11.2</mockserver.version>
         <!-- maven plugins -->
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/httpclient4/src/main/java/com/baeldung/basic/MyBasicAuthenticationEntryPoint.java b/apache-httpclient4/src/main/java/com/baeldung/basic/MyBasicAuthenticationEntryPoint.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/basic/MyBasicAuthenticationEntryPoint.java
rename to apache-httpclient4/src/main/java/com/baeldung/basic/MyBasicAuthenticationEntryPoint.java
diff --git a/httpclient4/src/main/java/com/baeldung/client/HttpComponentsClientHttpRequestFactoryBasicAuth.java b/apache-httpclient4/src/main/java/com/baeldung/client/HttpComponentsClientHttpRequestFactoryBasicAuth.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/client/HttpComponentsClientHttpRequestFactoryBasicAuth.java
rename to apache-httpclient4/src/main/java/com/baeldung/client/HttpComponentsClientHttpRequestFactoryBasicAuth.java
diff --git a/httpclient4/src/main/java/com/baeldung/client/RestTemplateFactory.java b/apache-httpclient4/src/main/java/com/baeldung/client/RestTemplateFactory.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/client/RestTemplateFactory.java
rename to apache-httpclient4/src/main/java/com/baeldung/client/RestTemplateFactory.java
diff --git a/httpclient4/src/main/java/com/baeldung/client/spring/ClientConfig.java b/apache-httpclient4/src/main/java/com/baeldung/client/spring/ClientConfig.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/client/spring/ClientConfig.java
rename to apache-httpclient4/src/main/java/com/baeldung/client/spring/ClientConfig.java
diff --git a/httpclient4/src/main/java/com/baeldung/filter/CustomFilter.java b/apache-httpclient4/src/main/java/com/baeldung/filter/CustomFilter.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/filter/CustomFilter.java
rename to apache-httpclient4/src/main/java/com/baeldung/filter/CustomFilter.java
diff --git a/httpclient4/src/main/java/com/baeldung/filter/CustomWebSecurityConfigurerAdapter.java b/apache-httpclient4/src/main/java/com/baeldung/filter/CustomWebSecurityConfigurerAdapter.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/filter/CustomWebSecurityConfigurerAdapter.java
rename to apache-httpclient4/src/main/java/com/baeldung/filter/CustomWebSecurityConfigurerAdapter.java
diff --git a/httpclient4/src/main/java/com/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java b/apache-httpclient4/src/main/java/com/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java
rename to apache-httpclient4/src/main/java/com/baeldung/security/MySavedRequestAwareAuthenticationSuccessHandler.java
diff --git a/httpclient4/src/main/java/com/baeldung/security/RestAuthenticationEntryPoint.java b/apache-httpclient4/src/main/java/com/baeldung/security/RestAuthenticationEntryPoint.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/security/RestAuthenticationEntryPoint.java
rename to apache-httpclient4/src/main/java/com/baeldung/security/RestAuthenticationEntryPoint.java
diff --git a/httpclient4/src/main/java/com/baeldung/spring/SecSecurityConfig.java b/apache-httpclient4/src/main/java/com/baeldung/spring/SecSecurityConfig.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/spring/SecSecurityConfig.java
rename to apache-httpclient4/src/main/java/com/baeldung/spring/SecSecurityConfig.java
diff --git a/httpclient4/src/main/java/com/baeldung/spring/WebConfig.java b/apache-httpclient4/src/main/java/com/baeldung/spring/WebConfig.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/spring/WebConfig.java
rename to apache-httpclient4/src/main/java/com/baeldung/spring/WebConfig.java
diff --git a/httpclient4/src/main/java/com/baeldung/web/controller/BarController.java b/apache-httpclient4/src/main/java/com/baeldung/web/controller/BarController.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/web/controller/BarController.java
rename to apache-httpclient4/src/main/java/com/baeldung/web/controller/BarController.java
diff --git a/httpclient4/src/main/java/com/baeldung/web/controller/FooController.java b/apache-httpclient4/src/main/java/com/baeldung/web/controller/FooController.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/web/controller/FooController.java
rename to apache-httpclient4/src/main/java/com/baeldung/web/controller/FooController.java
diff --git a/httpclient4/src/main/java/com/baeldung/web/dto/Bar.java b/apache-httpclient4/src/main/java/com/baeldung/web/dto/Bar.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/web/dto/Bar.java
rename to apache-httpclient4/src/main/java/com/baeldung/web/dto/Bar.java
diff --git a/httpclient4/src/main/java/com/baeldung/web/dto/Foo.java b/apache-httpclient4/src/main/java/com/baeldung/web/dto/Foo.java
similarity index 100%
rename from httpclient4/src/main/java/com/baeldung/web/dto/Foo.java
rename to apache-httpclient4/src/main/java/com/baeldung/web/dto/Foo.java
diff --git a/core-java-modules/core-java/src/main/resources/logback.xml b/apache-httpclient4/src/main/resources/logback.xml
similarity index 100%
rename from core-java-modules/core-java/src/main/resources/logback.xml
rename to apache-httpclient4/src/main/resources/logback.xml
diff --git a/httpclient4/src/main/resources/webSecurityConfig.xml b/apache-httpclient4/src/main/resources/webSecurityConfig.xml
similarity index 100%
rename from httpclient4/src/main/resources/webSecurityConfig.xml
rename to apache-httpclient4/src/main/resources/webSecurityConfig.xml
diff --git a/httpclient4/src/main/webapp/WEB-INF/api-servlet.xml b/apache-httpclient4/src/main/webapp/WEB-INF/api-servlet.xml
similarity index 100%
rename from httpclient4/src/main/webapp/WEB-INF/api-servlet.xml
rename to apache-httpclient4/src/main/webapp/WEB-INF/api-servlet.xml
diff --git a/httpclient4/src/main/webapp/WEB-INF/web.xml b/apache-httpclient4/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from httpclient4/src/main/webapp/WEB-INF/web.xml
rename to apache-httpclient4/src/main/webapp/WEB-INF/web.xml
diff --git a/httpclient4/src/test/java/com/baeldung/client/ClientLiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/client/ClientLiveTest.java
similarity index 100%
rename from httpclient4/src/test/java/com/baeldung/client/ClientLiveTest.java
rename to apache-httpclient4/src/test/java/com/baeldung/client/ClientLiveTest.java
diff --git a/httpclient4/src/test/java/com/baeldung/client/RestClientV4LiveManualTest.java b/apache-httpclient4/src/test/java/com/baeldung/client/RestClientV4LiveManualTest.java
similarity index 100%
rename from httpclient4/src/test/java/com/baeldung/client/RestClientV4LiveManualTest.java
rename to apache-httpclient4/src/test/java/com/baeldung/client/RestClientV4LiveManualTest.java
diff --git a/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestV4LiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestV4LiveTest.java
new file mode 100644
index 0000000000..226a7b8cf7
--- /dev/null
+++ b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientCancelRequestV4LiveTest.java
@@ -0,0 +1,57 @@
+package com.baeldung.httpclient;
+
+import java.io.IOException;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class HttpClientCancelRequestV4LiveTest {
+
+    private static final String SAMPLE_URL = "http://www.github.com";
+
+    private CloseableHttpClient instance;
+
+    private CloseableHttpResponse response;
+
+    @Before
+    public final void before() {
+        instance = HttpClientBuilder.create().build();
+    }
+
+    @After
+    public final void after() throws IllegalStateException, IOException {
+        ResponseUtil.closeResponse(response);
+    }
+
+    @Test
+    public final void whenRequestIsCanceled_thenCorrect() throws IOException {
+        instance = HttpClients.custom().build();
+        final HttpGet request = new HttpGet(SAMPLE_URL);
+        response = instance.execute(request);
+
+        try {
+            final HttpEntity entity = response.getEntity();
+
+            System.out.println("----------------------------------------");
+            System.out.println(response.getStatusLine());
+            if (entity != null) {
+                System.out.println("Response content length: " + entity.getContentLength());
+            }
+            System.out.println("----------------------------------------");
+
+            // Do not feel like reading the response body
+            // Call abort on the request object
+            request.abort();
+        } finally {
+            response.close();
+        }
+    }
+}
diff --git a/httpclient4/src/test/java/com/baeldung/httpclient/HttpClientHeaderV4LiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientHeaderV4LiveTest.java
similarity index 100%
rename from httpclient4/src/test/java/com/baeldung/httpclient/HttpClientHeaderV4LiveTest.java
rename to apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientHeaderV4LiveTest.java
diff --git a/httpclient4/src/test/java/com/baeldung/httpclient/HttpClientTimeoutV4LiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientTimeoutV4LiveTest.java
similarity index 100%
rename from httpclient4/src/test/java/com/baeldung/httpclient/HttpClientTimeoutV4LiveTest.java
rename to apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpClientTimeoutV4LiveTest.java
diff --git a/httpclient4/src/test/java/com/baeldung/httpclient/HttpsClientV4SslLiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpsClientV4SslLiveTest.java
similarity index 100%
rename from httpclient4/src/test/java/com/baeldung/httpclient/HttpsClientV4SslLiveTest.java
rename to apache-httpclient4/src/test/java/com/baeldung/httpclient/HttpsClientV4SslLiveTest.java
diff --git a/httpclient4/src/test/java/com/baeldung/httpclient/ResponseUtil.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/ResponseUtil.java
similarity index 100%
rename from httpclient4/src/test/java/com/baeldung/httpclient/ResponseUtil.java
rename to apache-httpclient4/src/test/java/com/baeldung/httpclient/ResponseUtil.java
diff --git a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/expandurl/HttpClientExpandUrlLiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/expandurl/HttpClientExpandUrlLiveTest.java
similarity index 100%
rename from apache-httpclient-2/src/test/java/com/baeldung/httpclient/expandurl/HttpClientExpandUrlLiveTest.java
rename to apache-httpclient4/src/test/java/com/baeldung/httpclient/expandurl/HttpClientExpandUrlLiveTest.java
diff --git a/apache-httpclient4/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java
new file mode 100644
index 0000000000..0d394b4ce7
--- /dev/null
+++ b/apache-httpclient4/src/test/java/com/baeldung/httpclient/httpclient/ApacheHttpClientUnitTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.httpclient.httpclient;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
+import org.junit.jupiter.api.Test;
+
+class ApacheHttpClientUnitTest extends GetRequestMockServer {
+
+
+    @Test
+    void givenDeveloperUsedCloseableHttpResponse_whenExecutingGetRequest_thenStatusIsOk() throws IOException {
+        try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
+            HttpGet httpGet = new HttpGet(serviceOneUrl);
+            try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
+                HttpEntity entity = response.getEntity();
+                EntityUtils.consume(entity);
+                assertThat(response.getStatusLine().getStatusCode()).isEqualTo(HttpStatus.SC_OK);
+            }
+        }
+    }
+
+}
diff --git a/apache-httpclient4/src/test/java/com/baeldung/httpclient/httpclient/GetRequestMockServer.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/httpclient/GetRequestMockServer.java
new file mode 100644
index 0000000000..3473117cef
--- /dev/null
+++ b/apache-httpclient4/src/test/java/com/baeldung/httpclient/httpclient/GetRequestMockServer.java
@@ -0,0 +1,78 @@
+package com.baeldung.httpclient.httpclient;
+
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.mockserver.client.MockServerClient;
+import org.mockserver.integration.ClientAndServer;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.URISyntaxException;
+
+import static org.mockserver.integration.ClientAndServer.startClientAndServer;
+import static org.mockserver.matchers.Times.exactly;
+import static org.mockserver.model.HttpRequest.request;
+import static org.mockserver.model.HttpResponse.response;
+
+public class GetRequestMockServer {
+
+    public static ClientAndServer mockServer;
+    public static String serviceOneUrl;
+    public static String serviceTwoUrl;
+
+    private static int serverPort;
+
+    public static final String SERVER_ADDRESS = "127.0.0.1";
+    public static final String PATH_ONE = "/test1";
+    public static final String PATH_TWO = "/test2";
+    public static final String METHOD = "GET";
+
+    @BeforeAll
+    static void startServer() throws IOException, URISyntaxException {
+        serverPort = getFreePort();
+        serviceOneUrl = "http://" + SERVER_ADDRESS + ":" + serverPort + PATH_ONE;
+        serviceTwoUrl = "http://" + SERVER_ADDRESS + ":" + serverPort + PATH_TWO;
+        mockServer = startClientAndServer(serverPort);
+        mockGetRequest();
+    }
+
+    @AfterAll
+    static void stopServer() {
+        mockServer.stop();
+    }
+
+    private static void mockGetRequest() {
+        new MockServerClient(SERVER_ADDRESS, serverPort)
+          .when(
+            request()
+              .withPath(PATH_ONE)
+              .withMethod(METHOD),
+            exactly(5)
+          )
+          .respond(
+            response()
+              .withStatusCode(HttpStatus.SC_OK)
+              .withBody("{\"status\":\"ok\"}")
+          );
+        new MockServerClient(SERVER_ADDRESS, serverPort)
+          .when(
+            request()
+              .withPath(PATH_TWO)
+              .withMethod(METHOD),
+            exactly(1)
+          )
+          .respond(
+            response()
+              .withStatusCode(HttpStatus.SC_OK)
+              .withBody("{\"status\":\"ok\"}")
+          );
+    }
+
+    private static int getFreePort () throws IOException {
+        try (ServerSocket serverSocket = new ServerSocket(0)) {
+            return serverSocket.getLocalPort();
+        }
+    }
+
+}
diff --git a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClientUnitTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClientUnitTest.java
similarity index 99%
rename from apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClientUnitTest.java
rename to apache-httpclient4/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClientUnitTest.java
index 7625b415f2..4d88211d0d 100644
--- a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClientUnitTest.java
+++ b/apache-httpclient4/src/test/java/com/baeldung/httpclient/readresponsebodystring/ApacheHttpClientUnitTest.java
@@ -25,4 +25,4 @@ public class ApacheHttpClientUnitTest {
             logger.debug("Response -> {}",  EntityUtils.toString(entity));
         }
     }
-}
+}
\ No newline at end of file
diff --git a/apache-httpclient4/src/test/java/com/baeldung/httpclient/retry/ApacheHttpClientRetryLiveTest.java b/apache-httpclient4/src/test/java/com/baeldung/httpclient/retry/ApacheHttpClientRetryLiveTest.java
new file mode 100644
index 0000000000..3a8ff252c2
--- /dev/null
+++ b/apache-httpclient4/src/test/java/com/baeldung/httpclient/retry/ApacheHttpClientRetryLiveTest.java
@@ -0,0 +1,168 @@
+package com.baeldung.httpclient.retry;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.UnknownHostException;
+import java.util.Objects;
+
+import org.apache.http.HttpRequestInterceptor;
+import org.apache.http.HttpResponseInterceptor;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPatch;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class ApacheHttpClientRetryLiveTest {
+
+    private Integer requestCounter;
+    private CloseableHttpClient httpClient;
+
+    @BeforeEach
+    void setUp() {
+        requestCounter = 0;
+    }
+
+    @AfterEach
+    void tearDown() throws IOException {
+        if (httpClient != null) {
+            httpClient.close();
+        }
+    }
+
+    private void createDefaultApacheHttpClient() {
+        this.httpClient = HttpClientBuilder
+          .create()
+          .addInterceptorFirst((HttpRequestInterceptor) (httpRequest, httpContext) -> {
+              requestCounter++;
+          }).build();
+    }
+
+    private void createFailingHttpClient() {
+        this.httpClient = HttpClientBuilder
+          .create()
+          .addInterceptorFirst((HttpRequestInterceptor) (httpRequest, httpContext) -> requestCounter++)
+          .addInterceptorLast((HttpResponseInterceptor) (httpResponse, httpContext) -> {
+              throw new IOException();
+          })
+          .build();
+    }
+
+    private void createHttpClientWithRetryHandler() {
+        this.httpClient = HttpClientBuilder
+          .create()
+          .addInterceptorFirst((HttpRequestInterceptor) (httpRequest, httpContext) -> requestCounter++)
+          .addInterceptorLast((HttpResponseInterceptor) (httpRequest, httpContext) -> { throw new IOException(); })
+          .setRetryHandler(new DefaultHttpRequestRetryHandler(6, true))
+          .build();
+    }
+
+    private void createHttpClientWithCustomRetryHandler() {
+        this.httpClient = HttpClientBuilder
+          .create()
+          .addInterceptorFirst((HttpRequestInterceptor) (httpRequest, httpContext) -> requestCounter++)
+          .addInterceptorLast((HttpResponseInterceptor) (httpRequest, httpContext) -> { throw new IOException(); })
+          .setRetryHandler((exception, executionCount, context) -> {
+              if (executionCount < 5 && Objects.equals("GET", ((HttpClientContext) context).getRequest().getRequestLine().getMethod())) {
+                  return true;
+              } else {
+                  return false;
+              }
+          })
+          .build();
+    }
+
+    private void createHttpClientWithRetriesDisabled() {
+        this.httpClient = HttpClientBuilder
+          .create()
+          .addInterceptorFirst((HttpRequestInterceptor) (httpRequest, httpContext) -> requestCounter++)
+          .addInterceptorLast((HttpResponseInterceptor) (httpRequest, httpContext) -> { throw new IOException(); })
+          .disableAutomaticRetries()
+          .build();
+    }
+
+    @Test
+    public void givenDefaultConfiguration_whenReceivedIOException_thenRetriesPerformed() {
+        createFailingHttpClient();
+        assertThrows(IOException.class, () -> httpClient.execute(new HttpGet("https://httpstat.us/200")));
+        assertThat(requestCounter).isEqualTo(4);
+    }
+
+    @Test
+    public void givenDefaultConfiguration_whenDomainNameNotResolved_thenNoRetryApplied() {
+        createDefaultApacheHttpClient();
+        HttpGet request = new HttpGet(URI.create("http://domain.that.does.not.exist:80/api/v1"));
+
+        assertThrows(UnknownHostException.class, () -> httpClient.execute(request));
+        assertThat(requestCounter).isEqualTo(1);
+    }
+
+    @Test
+    public void givenDefaultConfiguration_whenGotInternalServerError_thenNoRetryLogicApplied() throws IOException {
+        createDefaultApacheHttpClient();
+        HttpGet request = new HttpGet(URI.create("https://httpstat.us/500"));
+
+        CloseableHttpResponse response = assertDoesNotThrow(() -> httpClient.execute(request));
+        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(500);
+        assertThat(requestCounter).isEqualTo(1);
+        response.close();
+    }
+
+    @Test
+    public void givenDefaultConfiguration_whenHttpPatchRequest_thenRetryIsNotApplied() {
+        createFailingHttpClient();
+        HttpPatch request = new HttpPatch(URI.create("https://httpstat.us/500"));
+
+        assertThrows(IOException.class, () -> httpClient.execute(request));
+        assertThat(requestCounter).isEqualTo(1);
+    }
+
+    @Test
+    public void givenDefaultConfiguration_whenHttpPutRequest_thenRetryIsNotApplied() {
+        createFailingHttpClient();
+        HttpPut request = new HttpPut(URI.create("https://httpstat.us/500"));
+
+        assertThrows(IOException.class, () -> httpClient.execute(request));
+        assertThat(requestCounter).isEqualTo(1);
+    }
+
+    @Test
+    public void givenConfiguredRetryHandler_whenHttpPostRequest_thenRetriesPerformed() {
+        createHttpClientWithRetryHandler();
+
+        HttpPost request = new HttpPost(URI.create("https://httpstat.us/200"));
+
+        assertThrows(IOException.class, () -> httpClient.execute(request));
+        assertThat(requestCounter).isEqualTo(7);
+    }
+
+    @Test
+    public void givenCustomRetryHandler_whenUnknownHostException_thenRetryAnyway() {
+        createHttpClientWithCustomRetryHandler();
+
+        HttpGet request = new HttpGet(URI.create("https://domain.that.does.not.exist/200"));
+
+        assertThrows(IOException.class, () -> httpClient.execute(request));
+        assertThat(requestCounter).isEqualTo(5);
+    }
+
+    @Test
+    public void givenDisabledRetries_whenExecutedHttpRequestEndUpWithIOException_thenRetryIsNotApplied() {
+        createHttpClientWithRetriesDisabled();
+        HttpGet request = new HttpGet(URI.create("https://httpstat.us/200"));
+
+        assertThrows(IOException.class, () -> httpClient.execute(request));
+        assertThat(requestCounter).isEqualTo(1);
+    }
+}
diff --git a/core-java-modules/core-java/src/test/resources/.gitignore b/apache-httpclient4/src/test/resources/.gitignore
similarity index 100%
rename from core-java-modules/core-java/src/test/resources/.gitignore
rename to apache-httpclient4/src/test/resources/.gitignore
diff --git a/httpclient4/src/test/resources/test.in b/apache-httpclient4/src/test/resources/test.in
similarity index 100%
rename from httpclient4/src/test/resources/test.in
rename to apache-httpclient4/src/test/resources/test.in
diff --git a/apache-kafka-2/README.md b/apache-kafka-2/README.md
index ec9e8e2adc..157078f023 100644
--- a/apache-kafka-2/README.md
+++ b/apache-kafka-2/README.md
@@ -7,3 +7,4 @@ You can build the project from the command line using: *mvn clean install*, or i
 
 ### Relevant Articles:
 - [Guide to Check if Apache Kafka Server Is Running](https://www.baeldung.com/apache-kafka-check-server-is-running)
+- [Add Custom Headers to a Kafka Message](https://www.baeldung.com/java-kafka-custom-headers)
diff --git a/apache-kafka-2/src/main/java/com/baeldung/kafka/headers/KafkaMessageHeaders.java b/apache-kafka-2/src/main/java/com/baeldung/kafka/headers/KafkaMessageHeaders.java
new file mode 100644
index 0000000000..2c8c14bfc5
--- /dev/null
+++ b/apache-kafka-2/src/main/java/com/baeldung/kafka/headers/KafkaMessageHeaders.java
@@ -0,0 +1,88 @@
+package com.baeldung.kafka.headers;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.header.Header;
+import org.apache.kafka.common.header.Headers;
+import org.apache.kafka.common.header.internals.RecordHeader;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class KafkaMessageHeaders {
+
+    private static Logger logger = LoggerFactory.getLogger(KafkaMessageHeaders.class);
+
+    private static String TOPIC = "baeldung";
+    private static String MESSAGE_KEY = "message";
+    private static String MESSAGE_VALUE = "Hello World";
+    private static String HEADER_KEY = "website";
+    private static String HEADER_VALUE = "baeldung.com";
+
+    private static KafkaProducer<String, String> producer;
+    private static KafkaConsumer<String, String> consumer;
+
+    public static void main(String[] args) {
+        setup();
+
+        publishMessageWithCustomHeaders();
+
+        consumeMessageWithCustomHeaders();
+    }
+
+    private static void consumeMessageWithCustomHeaders() {
+        consumer.subscribe(Arrays.asList(TOPIC));
+
+        ConsumerRecords<String, String> records = consumer.poll(Duration.ofMinutes(1));
+        for (ConsumerRecord<String, String> record : records) {
+            logger.info(record.key());
+            logger.info(record.value());
+
+            Headers headers = record.headers();
+            for (Header header : headers) {
+                logger.info(header.key());
+                logger.info(new String(header.value()));
+            }
+        }
+    }
+
+    private static void publishMessageWithCustomHeaders() {
+        List<Header> headers = new ArrayList<>();
+        headers.add(new RecordHeader(HEADER_KEY, HEADER_VALUE.getBytes()));
+
+        ProducerRecord<String, String> record1 = new ProducerRecord<>(TOPIC, null, MESSAGE_KEY, MESSAGE_VALUE, headers);
+        producer.send(record1);
+
+        ProducerRecord<String, String> record2 = new ProducerRecord<>(TOPIC, null, System.currentTimeMillis(), MESSAGE_KEY, MESSAGE_VALUE, headers);
+        producer.send(record2);
+    }
+
+    private static void setup() {
+        Properties producerProperties = new Properties();
+        producerProperties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
+        producerProperties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+        producerProperties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+
+        Properties consumerProperties = new Properties();
+        consumerProperties.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092");
+        consumerProperties.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+        consumerProperties.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+        consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, "ConsumerGroup1");
+
+        producer = new KafkaProducer<>(producerProperties);
+        consumer = new KafkaConsumer<>(consumerProperties);
+    }
+
+}
diff --git a/apache-kafka-2/src/test/java/com/baeldung/kafka/headers/KafkaMessageHeadersLiveTest.java b/apache-kafka-2/src/test/java/com/baeldung/kafka/headers/KafkaMessageHeadersLiveTest.java
new file mode 100644
index 0000000000..42cc572e07
--- /dev/null
+++ b/apache-kafka-2/src/test/java/com/baeldung/kafka/headers/KafkaMessageHeadersLiveTest.java
@@ -0,0 +1,104 @@
+package com.baeldung.kafka.headers;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.clients.producer.RecordMetadata;
+import org.apache.kafka.common.header.Header;
+import org.apache.kafka.common.header.Headers;
+import org.apache.kafka.common.header.internals.RecordHeader;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.KafkaContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+
+// This live test needs a Docker Daemon running so that a kafka container can be created
+
+@Testcontainers
+public class KafkaMessageHeadersLiveTest {
+
+    private static String TOPIC = "baeldung";
+    private static String MESSAGE_KEY = "message";
+    private static String MESSAGE_VALUE = "Hello World";
+    private static String HEADER_KEY = "website";
+    private static String HEADER_VALUE = "baeldung.com";
+
+    private static KafkaProducer<String, String> producer;
+    private static KafkaConsumer<String, String> consumer;
+
+    @Container
+    private static final KafkaContainer KAFKA_CONTAINER = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:latest"));
+
+    @BeforeAll
+    static void setup() {
+        KAFKA_CONTAINER.addExposedPort(9092);
+
+        Properties producerProperties = new Properties();
+        producerProperties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, KAFKA_CONTAINER.getBootstrapServers());
+        producerProperties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+        producerProperties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+
+        Properties consumerProperties = new Properties();
+        consumerProperties.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, KAFKA_CONTAINER.getBootstrapServers());
+        consumerProperties.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+        consumerProperties.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+        consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, "ConsumerGroup1");
+
+        producer = new KafkaProducer<>(producerProperties);
+        consumer = new KafkaConsumer<>(consumerProperties);
+    }
+
+    @AfterAll
+    static void destroy() {
+        KAFKA_CONTAINER.stop();
+    }
+
+    @Test
+    void givenAMessageWithCustomHeaders_whenPublishedToKafkaAndConsumed_thenCheckForCustomHeaders() throws ExecutionException, InterruptedException {
+        List<Header> headers = new ArrayList<>();
+        headers.add(new RecordHeader(HEADER_KEY, HEADER_VALUE.getBytes()));
+
+        ProducerRecord<String, String> record1 = new ProducerRecord<>(TOPIC, null, MESSAGE_KEY, MESSAGE_VALUE, headers);
+        Future<RecordMetadata> future = producer.send(record1);
+
+        RecordMetadata metadata = future.get();
+
+        assertNotNull(metadata);
+
+        consumer.subscribe(Arrays.asList(TOPIC));
+
+        ConsumerRecords<String, String> records = consumer.poll(Duration.ofMinutes(1));
+        for (ConsumerRecord<String, String> record : records) {
+            assertEquals(MESSAGE_KEY, record.key());
+            assertEquals(MESSAGE_VALUE, record.value());
+
+            Headers consumedHeaders = record.headers();
+            assertNotNull(consumedHeaders);
+
+            for (Header header : consumedHeaders) {
+                assertEquals(HEADER_KEY, header.key());
+                assertEquals(HEADER_VALUE, new String(header.value()));
+            }
+        }
+    }
+}
diff --git a/apache-kafka/pom.xml b/apache-kafka/pom.xml
index 7bde041f32..494bc94961 100644
--- a/apache-kafka/pom.xml
+++ b/apache-kafka/pom.xml
@@ -35,12 +35,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-kafka-0.11_2.11</artifactId>
+            <artifactId>flink-connector-kafka</artifactId>
             <version>${flink.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-streaming-java_2.11</artifactId>
+            <artifactId>flink-streaming-java</artifactId>
             <version>${flink.version}</version>
         </dependency>
         <dependency>
@@ -67,7 +67,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-test-utils_2.11</artifactId>
+            <artifactId>flink-test-utils</artifactId>
             <version>${flink.version}</version>
             <scope>test</scope>
         </dependency>
@@ -163,11 +163,28 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.time=ALL-UNNAMED
+                        --add-opens
+                        java.base/java.nio=ALL-UNNAMED
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
-        <kafka.version>2.8.0</kafka.version>
+        <kafka.version>3.4.0</kafka.version>
         <testcontainers-kafka.version>1.15.3</testcontainers-kafka.version>
         <testcontainers-jupiter.version>1.15.3</testcontainers-jupiter.version>
-        <flink.version>1.5.0</flink.version>
+        <flink.version>1.16.1</flink.version>
         <awaitility.version>3.0.0</awaitility.version>
         <org.apache.spark.spark-core.version>2.4.8</org.apache.spark.spark-core.version>
         <graphframes.version>0.8.1-spark3.0-s_2.12</graphframes.version>
diff --git a/apache-kafka/src/main/java/com/baeldung/flink/FlinkDataPipeline.java b/apache-kafka/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
index 4502b628b2..8d15b79a63 100644
--- a/apache-kafka/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
+++ b/apache-kafka/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
@@ -9,8 +9,8 @@ import org.apache.flink.streaming.api.TimeCharacteristic;
 import org.apache.flink.streaming.api.datastream.DataStream;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 import org.apache.flink.streaming.api.windowing.time.Time;
-import org.apache.flink.streaming.connectors.kafka.FlinkKafkaConsumer011;
-import org.apache.flink.streaming.connectors.kafka.FlinkKafkaProducer011;
+import org.apache.flink.streaming.connectors.kafka.FlinkKafkaConsumer;
+import org.apache.flink.streaming.connectors.kafka.FlinkKafkaProducer;
 
 import static com.baeldung.flink.connector.Consumers.*;
 import static com.baeldung.flink.connector.Producers.*;
@@ -25,12 +25,12 @@ public class FlinkDataPipeline {
 
         StreamExecutionEnvironment environment = StreamExecutionEnvironment.getExecutionEnvironment();
 
-        FlinkKafkaConsumer011<String> flinkKafkaConsumer = createStringConsumerForTopic(inputTopic, address, consumerGroup);
+        FlinkKafkaConsumer<String> flinkKafkaConsumer = createStringConsumerForTopic(inputTopic, address, consumerGroup);
         flinkKafkaConsumer.setStartFromEarliest();
 
         DataStream<String> stringInputStream = environment.addSource(flinkKafkaConsumer);
 
-        FlinkKafkaProducer011<String> flinkKafkaProducer = createStringProducer(outputTopic, address);
+        FlinkKafkaProducer<String> flinkKafkaProducer = createStringProducer(outputTopic, address);
 
         stringInputStream.map(new WordsCapitalizer())
             .addSink(flinkKafkaProducer);
@@ -48,11 +48,11 @@ public class FlinkDataPipeline {
 
         environment.setStreamTimeCharacteristic(TimeCharacteristic.EventTime);
 
-        FlinkKafkaConsumer011<InputMessage> flinkKafkaConsumer = createInputMessageConsumer(inputTopic, kafkaAddress, consumerGroup);
+        FlinkKafkaConsumer<InputMessage> flinkKafkaConsumer = createInputMessageConsumer(inputTopic, kafkaAddress, consumerGroup);
         flinkKafkaConsumer.setStartFromEarliest();
 
         flinkKafkaConsumer.assignTimestampsAndWatermarks(new InputMessageTimestampAssigner());
-        FlinkKafkaProducer011<Backup> flinkKafkaProducer = createBackupProducer(outputTopic, kafkaAddress);
+        FlinkKafkaProducer<Backup> flinkKafkaProducer = createBackupProducer(outputTopic, kafkaAddress);
 
         DataStream<InputMessage> inputMessagesStream = environment.addSource(flinkKafkaConsumer);
 
diff --git a/apache-kafka/src/main/java/com/baeldung/flink/connector/Consumers.java b/apache-kafka/src/main/java/com/baeldung/flink/connector/Consumers.java
index c72cb8a2d6..358c9627f7 100644
--- a/apache-kafka/src/main/java/com/baeldung/flink/connector/Consumers.java
+++ b/apache-kafka/src/main/java/com/baeldung/flink/connector/Consumers.java
@@ -3,26 +3,26 @@ package com.baeldung.flink.connector;
 import com.baeldung.flink.model.InputMessage;
 import com.baeldung.flink.schema.InputMessageDeserializationSchema;
 import org.apache.flink.api.common.serialization.SimpleStringSchema;
-import org.apache.flink.streaming.connectors.kafka.FlinkKafkaConsumer011;
+import org.apache.flink.streaming.connectors.kafka.FlinkKafkaConsumer;
 
 import java.util.Properties;
 
 public class Consumers {
 
-    public static FlinkKafkaConsumer011<String> createStringConsumerForTopic(String topic, String kafkaAddress, String kafkaGroup) {
+    public static FlinkKafkaConsumer<String> createStringConsumerForTopic(String topic, String kafkaAddress, String kafkaGroup) {
         Properties props = new Properties();
         props.setProperty("bootstrap.servers", kafkaAddress);
         props.setProperty("group.id", kafkaGroup);
-        FlinkKafkaConsumer011<String> consumer = new FlinkKafkaConsumer011<>(topic, new SimpleStringSchema(), props);
+        FlinkKafkaConsumer<String> consumer = new FlinkKafkaConsumer<>(topic, new SimpleStringSchema(), props);
 
         return consumer;
     }
 
-    public static FlinkKafkaConsumer011<InputMessage> createInputMessageConsumer(String topic, String kafkaAddress, String kafkaGroup) {
+    public static FlinkKafkaConsumer<InputMessage> createInputMessageConsumer(String topic, String kafkaAddress, String kafkaGroup) {
         Properties properties = new Properties();
         properties.setProperty("bootstrap.servers", kafkaAddress);
         properties.setProperty("group.id", kafkaGroup);
-        FlinkKafkaConsumer011<InputMessage> consumer = new FlinkKafkaConsumer011<InputMessage>(topic, new InputMessageDeserializationSchema(), properties);
+        FlinkKafkaConsumer<InputMessage> consumer = new FlinkKafkaConsumer<InputMessage>(topic, new InputMessageDeserializationSchema(), properties);
 
         return consumer;
     }
diff --git a/apache-kafka/src/main/java/com/baeldung/flink/connector/Producers.java b/apache-kafka/src/main/java/com/baeldung/flink/connector/Producers.java
index 8e6f3f8f37..a4cb2d70c2 100644
--- a/apache-kafka/src/main/java/com/baeldung/flink/connector/Producers.java
+++ b/apache-kafka/src/main/java/com/baeldung/flink/connector/Producers.java
@@ -3,15 +3,15 @@ package com.baeldung.flink.connector;
 import com.baeldung.flink.model.Backup;
 import com.baeldung.flink.schema.BackupSerializationSchema;
 import org.apache.flink.api.common.serialization.SimpleStringSchema;
-import org.apache.flink.streaming.connectors.kafka.FlinkKafkaProducer011;
+import org.apache.flink.streaming.connectors.kafka.FlinkKafkaProducer;
 
 public class Producers {
 
-    public static FlinkKafkaProducer011<String> createStringProducer(String topic, String kafkaAddress) {
-        return new FlinkKafkaProducer011<>(kafkaAddress, topic, new SimpleStringSchema());
+    public static FlinkKafkaProducer<String> createStringProducer(String topic, String kafkaAddress) {
+        return new FlinkKafkaProducer<>(kafkaAddress, topic, new SimpleStringSchema());
     }
 
-    public static FlinkKafkaProducer011<Backup> createBackupProducer(String topic, String kafkaAddress) {
-        return new FlinkKafkaProducer011<Backup>(kafkaAddress, topic, new BackupSerializationSchema());
+    public static FlinkKafkaProducer<Backup> createBackupProducer(String topic, String kafkaAddress) {
+        return new FlinkKafkaProducer<Backup>(kafkaAddress, topic, new BackupSerializationSchema());
     }
 }
diff --git a/apache-libraries/pom.xml b/apache-libraries/pom.xml
index b6418e6a04..c1def03bee 100644
--- a/apache-libraries/pom.xml
+++ b/apache-libraries/pom.xml
@@ -188,13 +188,13 @@
     <properties>
         <avro.version>1.8.2</avro.version>
         <beam.version>2.45.0</beam.version>
-        <bval.version>1.1.2</bval.version>
-        <javax.validation.validation-api.version>1.1.0.Final</javax.validation.validation-api.version>
-        <meecrowave-junit.version>1.2.0</meecrowave-junit.version>
+        <bval.version>2.0.6</bval.version>
+        <javax.validation.validation-api.version>2.0.1.Final</javax.validation.validation-api.version>
+        <meecrowave-junit.version>1.2.15</meecrowave-junit.version>
         <okhttp.version>3.10.0</okhttp.version>
-        <meecrowave-jpa.version>1.2.1</meecrowave-jpa.version>
-        <meecrowave-core.version>1.2.1</meecrowave-core.version>
-        <meecrowave-maven-plugin.version>1.2.1</meecrowave-maven-plugin.version>
+        <meecrowave-jpa.version>1.2.15</meecrowave-jpa.version>
+        <meecrowave-core.version>1.2.15</meecrowave-core.version>
+        <meecrowave-maven-plugin.version>1.2.15</meecrowave-maven-plugin.version>
         <opennlp.opennlp-tools.version>1.8.4</opennlp.opennlp-tools.version>
         <pulsar-client.version>2.1.1-incubating</pulsar-client.version>
         <zookeeper.version>3.4.11</zookeeper.version>
diff --git a/apache-libraries/src/test/java/com/baeldung/apache/beam/intro/WordCountUnitTest.java b/apache-libraries/src/test/java/com/baeldung/apache/beam/intro/WordCountIntegrationTest.java
similarity index 91%
rename from apache-libraries/src/test/java/com/baeldung/apache/beam/intro/WordCountUnitTest.java
rename to apache-libraries/src/test/java/com/baeldung/apache/beam/intro/WordCountIntegrationTest.java
index 77287066ac..5d51d8e5fa 100644
--- a/apache-libraries/src/test/java/com/baeldung/apache/beam/intro/WordCountUnitTest.java
+++ b/apache-libraries/src/test/java/com/baeldung/apache/beam/intro/WordCountIntegrationTest.java
@@ -7,7 +7,7 @@ import org.junit.Test;
 
 import com.baeldung.apache.beam.intro.WordCount;
 
-public class WordCountUnitTest {
+public class WordCountIntegrationTest {
     
     @Test
     public void givenInputFile_whenWordCountRuns_thenJobFinishWithoutError() {
diff --git a/apache-poi/pom.xml b/apache-poi/pom.xml
index 546eedec5b..78781cf215 100644
--- a/apache-poi/pom.xml
+++ b/apache-poi/pom.xml
@@ -30,6 +30,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.dhatim</groupId>
+            <artifactId>fastexcel</artifactId>
+            <version>${fastexcel.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.dhatim</groupId>
+            <artifactId>fastexcel-reader</artifactId>
+            <version>${fastexcel.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -52,6 +62,7 @@
     <properties>
         <poi.version>5.2.0</poi.version>
         <jexcel.version>1.0.6</jexcel.version>
+        <fastexcel.version>0.15.3</fastexcel.version>
         <maven.resources.plugin.version>3.2.0</maven.resources.plugin.version>
     </properties>
 
diff --git a/apache-poi/src/main/java/com/baeldung/fastexcel/FastexcelHelper.java b/apache-poi/src/main/java/com/baeldung/fastexcel/FastexcelHelper.java
new file mode 100644
index 0000000000..9d6041b66e
--- /dev/null
+++ b/apache-poi/src/main/java/com/baeldung/fastexcel/FastexcelHelper.java
@@ -0,0 +1,63 @@
+package com.baeldung.fastexcel;
+
+import org.dhatim.fastexcel.Workbook;
+import org.dhatim.fastexcel.Worksheet;
+import org.dhatim.fastexcel.reader.Cell;
+import org.dhatim.fastexcel.reader.ReadableWorkbook;
+import org.dhatim.fastexcel.reader.Row;
+import org.dhatim.fastexcel.reader.Sheet;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+public class FastexcelHelper {
+
+    public Map<Integer, List<String>> readExcel(String fileLocation) throws IOException {
+        Map<Integer, List<String>> data = new HashMap<>();
+
+        try (FileInputStream file = new FileInputStream(fileLocation); ReadableWorkbook wb = new ReadableWorkbook(file)) {
+            Sheet sheet = wb.getFirstSheet();
+            try (Stream<Row> rows = sheet.openStream()) {
+                rows.forEach(r -> {
+                    data.put(r.getRowNum(), new ArrayList<>());
+
+                    for (Cell cell : r) {
+                        data.get(r.getRowNum()).add(cell.getRawValue());
+                    }
+                });
+            }
+        }
+
+        return data;
+    }
+
+    public void writeExcel() throws IOException {
+        File currDir = new File(".");
+        String path = currDir.getAbsolutePath();
+        String fileLocation = path.substring(0, path.length() - 1) + "fastexcel.xlsx";
+
+        try (OutputStream os = Files.newOutputStream(Paths.get(fileLocation)); Workbook wb = new Workbook(os, "MyApplication", "1.0")) {
+            Worksheet ws = wb.newWorksheet("Sheet 1");
+
+            ws.width(0, 25);
+            ws.width(1, 15);
+
+            ws.range(0, 0, 0, 1).style().fontName("Arial").fontSize(16).bold().fillColor("3366FF").set();
+            ws.value(0, 0, "Name");
+            ws.value(0, 1, "Age");
+
+            ws.range(2, 0, 2, 1).style().wrapText(true).set();
+            ws.value(2, 0, "John Smith");
+            ws.value(2, 1, 20L);
+        }
+    }
+}
diff --git a/apache-poi/src/test/java/com/baeldung/fastexcel/FastexcelIntegrationTest.java b/apache-poi/src/test/java/com/baeldung/fastexcel/FastexcelIntegrationTest.java
new file mode 100644
index 0000000000..a36c06e41f
--- /dev/null
+++ b/apache-poi/src/test/java/com/baeldung/fastexcel/FastexcelIntegrationTest.java
@@ -0,0 +1,49 @@
+package com.baeldung.fastexcel;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+public class FastexcelIntegrationTest {
+
+    private FastexcelHelper fastexcelHelper;
+    private static String FILE_NAME = "fastexcel.xlsx";
+    private String fileLocation;
+
+    @Before
+    public void generateExcelFile() throws IOException {
+
+        File currDir = new File(".");
+        String path = currDir.getAbsolutePath();
+        fileLocation = path.substring(0, path.length() - 1) + FILE_NAME;
+
+        fastexcelHelper = new FastexcelHelper();
+        fastexcelHelper.writeExcel();
+    }
+
+    @Test
+    public void whenParsingExcelFile_thenCorrect() throws IOException {
+        Map<Integer, List<String>> data = fastexcelHelper.readExcel(fileLocation);
+
+        assertEquals("Name", data.get(1).get(0));
+        assertEquals("Age", data.get(1).get(1));
+
+        assertEquals("John Smith", data.get(3).get(0));
+        assertEquals("20", data.get(3).get(1));
+    }
+
+    @After
+    public void cleanup() {
+        File testFile = new File(fileLocation);
+        if (testFile.exists()) {
+            testFile.delete();
+        }
+    }
+}
diff --git a/apache-spark/pom.xml b/apache-spark/pom.xml
index 9e61e1340d..b5e97ee03d 100644
--- a/apache-spark/pom.xml
+++ b/apache-spark/pom.xml
@@ -7,7 +7,6 @@
     <version>1.0-SNAPSHOT</version>
     <name>apache-spark</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>
diff --git a/aws-modules/aws-lambda/.gitignore b/aws-modules/aws-lambda-modules/.gitignore
similarity index 100%
rename from aws-modules/aws-lambda/.gitignore
rename to aws-modules/aws-lambda-modules/.gitignore
diff --git a/aws-modules/aws-lambda/README.md b/aws-modules/aws-lambda-modules/README.md
similarity index 100%
rename from aws-modules/aws-lambda/README.md
rename to aws-modules/aws-lambda-modules/README.md
diff --git a/aws-modules/aws-lambda/lambda/pom.xml b/aws-modules/aws-lambda-modules/lambda-function/pom.xml
similarity index 96%
rename from aws-modules/aws-lambda/lambda/pom.xml
rename to aws-modules/aws-lambda-modules/lambda-function/pom.xml
index 8e47bab4be..9fff7d1d9a 100644
--- a/aws-modules/aws-lambda/lambda/pom.xml
+++ b/aws-modules/aws-lambda-modules/lambda-function/pom.xml
@@ -3,14 +3,14 @@
     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>lambda</artifactId>
+    <artifactId>lambda-function</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <name>lambda</name>
+    <name>lambda-function</name>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>aws-lambda</artifactId>
+        <artifactId>aws-lambda-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/aws-modules/aws-lambda/lambda/sam-templates/template-implicit.yaml b/aws-modules/aws-lambda-modules/lambda-function/sam-templates/template-implicit.yaml
similarity index 100%
rename from aws-modules/aws-lambda/lambda/sam-templates/template-implicit.yaml
rename to aws-modules/aws-lambda-modules/lambda-function/sam-templates/template-implicit.yaml
diff --git a/aws-modules/aws-lambda/lambda/sam-templates/template-inline-swagger.yaml b/aws-modules/aws-lambda-modules/lambda-function/sam-templates/template-inline-swagger.yaml
similarity index 100%
rename from aws-modules/aws-lambda/lambda/sam-templates/template-inline-swagger.yaml
rename to aws-modules/aws-lambda-modules/lambda-function/sam-templates/template-inline-swagger.yaml
diff --git a/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaMethodHandler.java b/aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/LambdaMethodHandler.java
similarity index 100%
rename from aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaMethodHandler.java
rename to aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/LambdaMethodHandler.java
diff --git a/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaRequestHandler.java b/aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/LambdaRequestHandler.java
similarity index 100%
rename from aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaRequestHandler.java
rename to aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/LambdaRequestHandler.java
diff --git a/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaRequestStreamHandler.java b/aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/LambdaRequestStreamHandler.java
similarity index 100%
rename from aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaRequestStreamHandler.java
rename to aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/LambdaRequestStreamHandler.java
diff --git a/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/apigateway/APIDemoHandler.java b/aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/apigateway/APIDemoHandler.java
similarity index 100%
rename from aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/apigateway/APIDemoHandler.java
rename to aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/apigateway/APIDemoHandler.java
diff --git a/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/apigateway/model/Person.java b/aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/apigateway/model/Person.java
similarity index 100%
rename from aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/apigateway/model/Person.java
rename to aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/apigateway/model/Person.java
diff --git a/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/SavePersonHandler.java b/aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/dynamodb/SavePersonHandler.java
similarity index 100%
rename from aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/SavePersonHandler.java
rename to aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/dynamodb/SavePersonHandler.java
diff --git a/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonRequest.java b/aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonRequest.java
similarity index 100%
rename from aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonRequest.java
rename to aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonRequest.java
diff --git a/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonResponse.java b/aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonResponse.java
similarity index 100%
rename from aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonResponse.java
rename to aws-modules/aws-lambda-modules/lambda-function/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonResponse.java
diff --git a/aws-modules/aws-lambda/lambda/src/main/resources/logback.xml b/aws-modules/aws-lambda-modules/lambda-function/src/main/resources/logback.xml
similarity index 100%
rename from aws-modules/aws-lambda/lambda/src/main/resources/logback.xml
rename to aws-modules/aws-lambda-modules/lambda-function/src/main/resources/logback.xml
diff --git a/aws-modules/aws-lambda/pom.xml b/aws-modules/aws-lambda-modules/pom.xml
similarity index 67%
rename from aws-modules/aws-lambda/pom.xml
rename to aws-modules/aws-lambda-modules/pom.xml
index bdd295c007..9886ff58d2 100644
--- a/aws-modules/aws-lambda/pom.xml
+++ b/aws-modules/aws-lambda-modules/pom.xml
@@ -3,8 +3,8 @@
     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>aws-lambda</artifactId>
-    <name>aws-lambda</name>
+    <artifactId>aws-lambda-modules</artifactId>
+    <name>aws-lambda-modules</name>
     <packaging>pom</packaging>
 
     <parent>
@@ -14,9 +14,9 @@
     </parent>
 
     <modules>
-        <module>lambda</module>
-        <module>shipping-tracker/ShippingFunction</module>
-        <module>todo-reminder/ToDoFunction</module>
+        <module>lambda-function</module>
+        <module>shipping-tracker-lambda/ShippingFunction</module>
+        <module>todo-reminder-lambda/ToDoFunction</module>
     </modules>
 
 </project>
\ No newline at end of file
diff --git a/aws-modules/aws-lambda/shipping-tracker/.gitignore b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/.gitignore
similarity index 100%
rename from aws-modules/aws-lambda/shipping-tracker/.gitignore
rename to aws-modules/aws-lambda-modules/shipping-tracker-lambda/.gitignore
diff --git a/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/pom.xml b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/pom.xml
similarity index 93%
rename from aws-modules/aws-lambda/shipping-tracker/ShippingFunction/pom.xml
rename to aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/pom.xml
index c36c81375d..abd22ea50c 100644
--- a/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/pom.xml
+++ b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/pom.xml
@@ -2,7 +2,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
     <artifactId>ShippingFunction</artifactId>
     <version>1.0</version>
     <name>ShippingFunction</name>
@@ -10,7 +9,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>aws-lambda</artifactId>
+        <artifactId>aws-lambda-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
@@ -69,8 +68,8 @@
     </build>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <hibernate.version>5.4.21.Final</hibernate.version>
         <aws-lambda-java-core.version>1.2.0</aws-lambda-java-core.version>
         <aws-lambda-java-events.version>3.1.0</aws-lambda-java-events.version>
diff --git a/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/App.java b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/App.java
similarity index 100%
rename from aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/App.java
rename to aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/App.java
diff --git a/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Checkin.java b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Checkin.java
similarity index 100%
rename from aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Checkin.java
rename to aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Checkin.java
diff --git a/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Consignment.java b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Consignment.java
similarity index 100%
rename from aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Consignment.java
rename to aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Consignment.java
diff --git a/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Item.java b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Item.java
similarity index 100%
rename from aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Item.java
rename to aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Item.java
diff --git a/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingDao.java b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingDao.java
similarity index 100%
rename from aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingDao.java
rename to aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingDao.java
diff --git a/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingService.java b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingService.java
similarity index 100%
rename from aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingService.java
rename to aws-modules/aws-lambda-modules/shipping-tracker-lambda/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingService.java
diff --git a/aws-modules/aws-lambda/shipping-tracker/template.yaml b/aws-modules/aws-lambda-modules/shipping-tracker-lambda/template.yaml
similarity index 100%
rename from aws-modules/aws-lambda/shipping-tracker/template.yaml
rename to aws-modules/aws-lambda-modules/shipping-tracker-lambda/template.yaml
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/pom.xml b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/pom.xml
similarity index 89%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/pom.xml
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/pom.xml
index cb6dd08d1e..04295e1ab1 100644
--- a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/pom.xml
+++ b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/pom.xml
@@ -8,6 +8,13 @@
     <name>ToDoFunction</name>
     <packaging>jar</packaging>
 
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>aws-lambda-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
+    </parent>
+
     <dependencies>
         <dependency>
             <groupId>com.amazonaws</groupId>
@@ -101,16 +108,16 @@
     </build>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <aws-lambda-java-core.version>1.2.1</aws-lambda-java-core.version>
         <aws-lambda-java-events.version>3.6.0</aws-lambda-java-events.version>
-        <lightweight-config.version>1.1.0</lightweight-config.version>
+        <lightweight-config.version>1.2.1</lightweight-config.version>
         <aws-lambda-java-log4j2.version>1.2.0</aws-lambda-java-log4j2.version>
         <log4j-slf4j-impl.version>2.13.2</log4j-slf4j-impl.version>
         <feign-core.version>11.2</feign-core.version>
-        <guice.version>5.0.1</guice.version>
-        <system-stubs-junit4.version>1.2.0</system-stubs-junit4.version>
+        <guice.version>5.1.0</guice.version>
+        <system-stubs-junit4.version>2.0.2</system-stubs-junit4.version>
         <mockito-core.version>4.1.0</mockito-core.version>
         <assertj-core.version>3.19.0</assertj-core.version>
         <junit-jupiter.version>5.8.1</junit-jupiter.version>
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/App.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/App.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/App.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/App.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostApi.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostApi.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostApi.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostApi.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostItem.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostItem.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostItem.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostItem.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoApi.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoApi.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoApi.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoApi.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoItem.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoItem.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoItem.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoItem.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Config.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Config.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Config.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Config.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Credentials.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Credentials.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Credentials.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Credentials.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/ExecutionContext.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/ExecutionContext.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/ExecutionContext.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/ExecutionContext.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Services.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Services.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Services.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Services.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/PostService.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/PostService.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/PostService.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/PostService.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/ToDoReaderService.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/ToDoReaderService.java
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/ToDoReaderService.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/ToDoReaderService.java
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/resources/configuration.yml b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/resources/configuration.yml
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/resources/configuration.yml
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/resources/configuration.yml
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/resources/log4j2.xml b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/resources/log4j2.xml
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/resources/log4j2.xml
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/main/resources/log4j2.xml
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/AppTest.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/test/java/com/baeldung/lambda/todo/AppUnitTest.java
similarity index 98%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/AppTest.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/test/java/com/baeldung/lambda/todo/AppUnitTest.java
index cbdc8c22cb..952a773f69 100644
--- a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/AppTest.java
+++ b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/test/java/com/baeldung/lambda/todo/AppUnitTest.java
@@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.verify;
 
 @RunWith(MockitoJUnitRunner.class)
-public class AppTest {
+public class AppUnitTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mockContext;
diff --git a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/service/ToDoReaderServiceTest.java b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/test/java/com/baeldung/lambda/todo/service/ToDoReaderServiceUnitTest.java
similarity index 94%
rename from aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/service/ToDoReaderServiceTest.java
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/test/java/com/baeldung/lambda/todo/service/ToDoReaderServiceUnitTest.java
index 634c5257ff..dd5b52d073 100644
--- a/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/service/ToDoReaderServiceTest.java
+++ b/aws-modules/aws-lambda-modules/todo-reminder-lambda/ToDoFunction/src/test/java/com/baeldung/lambda/todo/service/ToDoReaderServiceUnitTest.java
@@ -7,7 +7,7 @@ import uk.org.webcompere.systemstubs.rules.SystemOutRule;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
-public class ToDoReaderServiceTest {
+public class ToDoReaderServiceUnitTest {
 
     @Rule
     public SystemOutRule systemOutRule = new SystemOutRule();
diff --git a/aws-modules/aws-lambda/todo-reminder/template.yaml b/aws-modules/aws-lambda-modules/todo-reminder-lambda/template.yaml
similarity index 100%
rename from aws-modules/aws-lambda/todo-reminder/template.yaml
rename to aws-modules/aws-lambda-modules/todo-reminder-lambda/template.yaml
diff --git a/aws-modules/aws-s3/README.md b/aws-modules/aws-s3/README.md
index efebf7d933..109a898405 100644
--- a/aws-modules/aws-s3/README.md
+++ b/aws-modules/aws-s3/README.md
@@ -6,4 +6,5 @@ This module contains articles about Simple Storage Service (S3) on AWS
 
 - [AWS S3 with Java](https://www.baeldung.com/aws-s3-java)
 - [Multipart Uploads in Amazon S3 with Java](https://www.baeldung.com/aws-s3-multipart-upload)
-- [Using the JetS3t Java Client With Amazon S3](https://www.baeldung.com/jets3t-amazon-s3)
\ No newline at end of file
+- [Using the JetS3t Java Client With Amazon S3](https://www.baeldung.com/jets3t-amazon-s3)
+- [Check if a Specified Key Exists in a Given S3 Bucket Using Java](https://www.baeldung.com/java-aws-s3-check-specified-key-exists)
diff --git a/aws-modules/pom.xml b/aws-modules/pom.xml
index 72c5017c32..02473815b5 100644
--- a/aws-modules/pom.xml
+++ b/aws-modules/pom.xml
@@ -15,7 +15,7 @@
 
     <modules>
         <module>aws-app-sync</module>
-        <module>aws-lambda</module>
+        <module>aws-lambda-modules</module>
         <module>aws-miscellaneous</module>
         <module>aws-reactive</module>
         <module>aws-s3</module>
diff --git a/axon/pom.xml b/axon/pom.xml
index 42e32758ea..5eed742aab 100644
--- a/axon/pom.xml
+++ b/axon/pom.xml
@@ -95,6 +95,22 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                        --add-opens
+                        java.base/java.util.concurrent=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <axon-bom.version>4.6.3</axon-bom.version>
         <de.flapdoodle.embed.mongo.version>3.4.8</de.flapdoodle.embed.mongo.version>
diff --git a/azure/pom.xml b/azure/pom.xml
index 6a06282a71..aae84db0c6 100644
--- a/azure/pom.xml
+++ b/azure/pom.xml
@@ -122,6 +122,7 @@
         <docker.image.prefix>${azure.containerRegistry}.azurecr.io</docker.image.prefix>
         <docker-maven-plugin.version>1.1.0</docker-maven-plugin.version>
         <azure-webapp-maven-plugin.version>1.1.0</azure-webapp-maven-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/checker-plugin/README.md b/checker-framework/README.md
similarity index 100%
rename from checker-plugin/README.md
rename to checker-framework/README.md
diff --git a/checker-plugin/pom.xml b/checker-framework/pom.xml
similarity index 97%
rename from checker-plugin/pom.xml
rename to checker-framework/pom.xml
index 28958db89d..a348745343 100644
--- a/checker-plugin/pom.xml
+++ b/checker-framework/pom.xml
@@ -3,11 +3,10 @@
     xmlns="http://maven.apache.org/POM/4.0.0"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>checker-plugin</artifactId>
+    <artifactId>checker-framework</artifactId>
     <version>1.0-SNAPSHOT</version>
-    <name>checker-plugin</name>
+    <name>checker-framework</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>
diff --git a/checker-plugin/src/main/java/com/baeldung/typechecker/FakeNumExample.java b/checker-framework/src/main/java/com/baeldung/typechecker/FakeNumExample.java
similarity index 100%
rename from checker-plugin/src/main/java/com/baeldung/typechecker/FakeNumExample.java
rename to checker-framework/src/main/java/com/baeldung/typechecker/FakeNumExample.java
diff --git a/checker-plugin/src/main/java/com/baeldung/typechecker/FormatExample.java b/checker-framework/src/main/java/com/baeldung/typechecker/FormatExample.java
similarity index 100%
rename from checker-plugin/src/main/java/com/baeldung/typechecker/FormatExample.java
rename to checker-framework/src/main/java/com/baeldung/typechecker/FormatExample.java
diff --git a/checker-plugin/src/main/java/com/baeldung/typechecker/KeyForExample.java b/checker-framework/src/main/java/com/baeldung/typechecker/KeyForExample.java
similarity index 100%
rename from checker-plugin/src/main/java/com/baeldung/typechecker/KeyForExample.java
rename to checker-framework/src/main/java/com/baeldung/typechecker/KeyForExample.java
diff --git a/checker-plugin/src/main/java/com/baeldung/typechecker/MonotonicNotNullExample.java b/checker-framework/src/main/java/com/baeldung/typechecker/MonotonicNotNullExample.java
similarity index 100%
rename from checker-plugin/src/main/java/com/baeldung/typechecker/MonotonicNotNullExample.java
rename to checker-framework/src/main/java/com/baeldung/typechecker/MonotonicNotNullExample.java
diff --git a/checker-plugin/src/main/java/com/baeldung/typechecker/NonNullExample.java b/checker-framework/src/main/java/com/baeldung/typechecker/NonNullExample.java
similarity index 100%
rename from checker-plugin/src/main/java/com/baeldung/typechecker/NonNullExample.java
rename to checker-framework/src/main/java/com/baeldung/typechecker/NonNullExample.java
diff --git a/checker-plugin/src/main/java/com/baeldung/typechecker/RegexExample.java b/checker-framework/src/main/java/com/baeldung/typechecker/RegexExample.java
similarity index 100%
rename from checker-plugin/src/main/java/com/baeldung/typechecker/RegexExample.java
rename to checker-framework/src/main/java/com/baeldung/typechecker/RegexExample.java
diff --git a/checker-plugin/src/main/resources/logback.xml b/checker-framework/src/main/resources/logback.xml
similarity index 100%
rename from checker-plugin/src/main/resources/logback.xml
rename to checker-framework/src/main/resources/logback.xml
diff --git a/clojure/ring/.gitignore b/clojure-modules/clojure-ring/.gitignore
similarity index 100%
rename from clojure/ring/.gitignore
rename to clojure-modules/clojure-ring/.gitignore
diff --git a/clojure/ring/README.md b/clojure-modules/clojure-ring/README.md
similarity index 100%
rename from clojure/ring/README.md
rename to clojure-modules/clojure-ring/README.md
diff --git a/clojure/ring/project.clj b/clojure-modules/clojure-ring/project.clj
similarity index 100%
rename from clojure/ring/project.clj
rename to clojure-modules/clojure-ring/project.clj
diff --git a/clojure/ring/src/ring/core.clj b/clojure-modules/clojure-ring/src/ring/core.clj
similarity index 100%
rename from clojure/ring/src/ring/core.clj
rename to clojure-modules/clojure-ring/src/ring/core.clj
diff --git a/core-groovy-modules/core-groovy-2/README.md b/core-groovy-modules/core-groovy-2/README.md
index 9f81ac6c16..f128b43092 100644
--- a/core-groovy-modules/core-groovy-2/README.md
+++ b/core-groovy-modules/core-groovy-2/README.md
@@ -14,4 +14,4 @@ This module contains articles about core Groovy concepts
 - [A Quick Guide to Working with Web Services in Groovy](https://www.baeldung.com/groovy-web-services)
 - [Categories in Groovy](https://www.baeldung.com/groovy-categories)
 - [How to Determine the Data Type in Groovy](https://www.baeldung.com/groovy-determine-data-type)
-- [[<-- Prev]](/core-groovy)
+- [[<-- Prev]](/core-groovy-modules/core-groovy)
diff --git a/core-groovy-modules/core-groovy-2/pom.xml b/core-groovy-modules/core-groovy-2/pom.xml
index 2b864ec7a1..de750daf0f 100644
--- a/core-groovy-modules/core-groovy-2/pom.xml
+++ b/core-groovy-modules/core-groovy-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-groovy-2</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>core-groovy-2</name>
     <packaging>jar</packaging>
 
@@ -83,7 +82,7 @@
                     <dependency>
                         <groupId>org.codehaus.groovy</groupId>
                         <artifactId>groovy-eclipse-batch</artifactId>
-                        <version>${groovy.version}-01</version>
+                        <version>${groovy-eclipse-batch.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -153,19 +152,12 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>maven_central</id>
-            <name>Maven Central</name>
-            <url>https://repo.maven.apache.org/maven2/</url>
-        </repository>
-    </repositories>
-
     <properties>
         <groovy-wslite.version>1.1.3</groovy-wslite.version>
-        <assembly.plugin.version>3.1.0</assembly.plugin.version>
-        <compiler.plugin.version>3.8.0</compiler.plugin.version>
-        <groovy.compiler.version>3.3.0-01</groovy.compiler.version>
+        <assembly.plugin.version>3.4.2</assembly.plugin.version>
+        <compiler.plugin.version>3.8.1</compiler.plugin.version>
+        <groovy.compiler.version>3.7.0</groovy.compiler.version>
+        <groovy-eclipse-batch.version>3.0.8-01</groovy-eclipse-batch.version>
     </properties>
 
 </project>
diff --git a/core-groovy-modules/core-groovy-collections/pom.xml b/core-groovy-modules/core-groovy-collections/pom.xml
index 6d43ce7d18..08589f54e3 100644
--- a/core-groovy-modules/core-groovy-collections/pom.xml
+++ b/core-groovy-modules/core-groovy-collections/pom.xml
@@ -4,7 +4,6 @@
     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>core-groovy-collections</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>core-groovy-collections</name>
     <packaging>jar</packaging>
 
@@ -111,13 +110,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>maven_central</id>
-            <name>Maven Central</name>
-            <url>https://repo.maven.apache.org/maven2/</url>
-        </repository>
-    </repositories>
-
-
 </project>
diff --git a/core-groovy-modules/core-groovy-strings/pom.xml b/core-groovy-modules/core-groovy-strings/pom.xml
index fac0f25219..ac68849431 100644
--- a/core-groovy-modules/core-groovy-strings/pom.xml
+++ b/core-groovy-modules/core-groovy-strings/pom.xml
@@ -4,7 +4,6 @@
     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>core-groovy-strings</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>core-groovy-strings</name>
     <packaging>jar</packaging>
 
@@ -101,12 +100,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>maven_central</id>
-            <name>Maven Central</name>
-            <url>https://repo.maven.apache.org/maven2/</url>
-        </repository>
-    </repositories>
-
 </project>
diff --git a/core-groovy-modules/core-groovy/pom.xml b/core-groovy-modules/core-groovy/pom.xml
index cf6cca9e18..6668f62235 100644
--- a/core-groovy-modules/core-groovy/pom.xml
+++ b/core-groovy-modules/core-groovy/pom.xml
@@ -3,9 +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>core-groovy</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>core-groovy</name>
     <packaging>jar</packaging>
 
@@ -102,12 +100,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>maven_central</id>
-            <name>Maven Central</name>
-            <url>https://repo.maven.apache.org/maven2/</url>
-        </repository>
-    </repositories>
-
 </project>
diff --git a/core-groovy-modules/pom.xml b/core-groovy-modules/pom.xml
index 2d1120e435..6faa7f94c8 100644
--- a/core-groovy-modules/pom.xml
+++ b/core-groovy-modules/pom.xml
@@ -21,12 +21,12 @@
     </modules>
 
     <properties>
-        <groovy.version>3.0.8</groovy.version>
-        <groovy-all.version>3.0.8</groovy-all.version>
-        <groovy-sql.version>3.0.8</groovy-sql.version>
-        <hsqldb.version>2.4.0</hsqldb.version>
+        <groovy.version>3.0.15</groovy.version>
+        <groovy-all.version>3.0.15</groovy-all.version>
+        <groovy-sql.version>3.0.15</groovy-sql.version>
+        <hsqldb.version>2.7.1</hsqldb.version>
         <spock-core.version>2.3-groovy-3.0</spock-core.version>
-        <gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
+        <gmavenplus-plugin.version>2.1.0</gmavenplus-plugin.version>
     </properties>
 
 </project>
diff --git a/core-java-modules/core-java-10/pom.xml b/core-java-modules/core-java-10/pom.xml
index e2ac8db919..7eccb098a0 100644
--- a/core-java-modules/core-java-10/pom.xml
+++ b/core-java-modules/core-java-10/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-10</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-10</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-11-2/pom.xml b/core-java-modules/core-java-11-2/pom.xml
index 64a486b5c4..4647814048 100644
--- a/core-java-modules/core-java-11-2/pom.xml
+++ b/core-java-modules/core-java-11-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-11-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-11-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-11-3/pom.xml b/core-java-modules/core-java-11-3/pom.xml
index ccccae5ba1..22db9e62ab 100644
--- a/core-java-modules/core-java-11-3/pom.xml
+++ b/core-java-modules/core-java-11-3/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-11-3</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-11-3</name>
     <packaging>jar</packaging>
 
@@ -14,7 +13,7 @@
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    
+
     <dependencies>
         <dependency>
             <groupId>com.google.code.gson</groupId>
diff --git a/core-java-modules/core-java-11/pom.xml b/core-java-modules/core-java-11/pom.xml
index 28a218c400..d0c2c0acaa 100644
--- a/core-java-modules/core-java-11/pom.xml
+++ b/core-java-modules/core-java-11/pom.xml
@@ -4,10 +4,8 @@
     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>core-java-11</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-11</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>
diff --git a/core-java-modules/core-java-12/pom.xml b/core-java-modules/core-java-12/pom.xml
index 9f95b1bc3f..ba6dfc62bc 100644
--- a/core-java-modules/core-java-12/pom.xml
+++ b/core-java-modules/core-java-12/pom.xml
@@ -4,10 +4,8 @@
     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>core-java-12</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-12</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>
diff --git a/core-java-modules/core-java-13/pom.xml b/core-java-modules/core-java-13/pom.xml
index 9e42838971..11d6ee7007 100644
--- a/core-java-modules/core-java-13/pom.xml
+++ b/core-java-modules/core-java-13/pom.xml
@@ -3,12 +3,9 @@
     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>
-    <groupId>com.baeldung</groupId>
     <artifactId>core-java-13</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-13</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>
diff --git a/core-java-modules/core-java-14/README.md b/core-java-modules/core-java-14/README.md
index 97be9391fb..7260891f7a 100644
--- a/core-java-modules/core-java-14/README.md
+++ b/core-java-modules/core-java-14/README.md
@@ -13,3 +13,4 @@ This module contains articles about Java 14.
 - [New Features in Java 14](https://www.baeldung.com/java-14-new-features)
 - [Java 14 Record vs. Lombok](https://www.baeldung.com/java-record-vs-lombok)
 - [Record vs. Final Class in Java](https://www.baeldung.com/java-record-vs-final-class)
+- [Custom Constructor in Java Records](https://www.baeldung.com/java-records-custom-constructor)
diff --git a/core-java-modules/core-java-14/pom.xml b/core-java-modules/core-java-14/pom.xml
index f78edd622a..9f48c0b8b2 100644
--- a/core-java-modules/core-java-14/pom.xml
+++ b/core-java-modules/core-java-14/pom.xml
@@ -6,7 +6,6 @@
     <artifactId>core-java-14</artifactId>
     <name>core-java-14</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>
diff --git a/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentClassic.java b/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentClassic.java
new file mode 100644
index 0000000000..cfaa3e1cd4
--- /dev/null
+++ b/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentClassic.java
@@ -0,0 +1,61 @@
+package org.example;
+
+import java.util.Objects;
+
+public class StudentClassic {
+    private String name;
+    private int rollNo;
+    private int marks;
+
+    public StudentClassic(String name, int rollNo, int marks) {
+        this.name = name;
+        this.rollNo = rollNo;
+        this.marks = marks;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getRollNo() {
+        return rollNo;
+    }
+
+    public int getMarks() {
+        return marks;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setRollNo(int rollNo) {
+        this.rollNo = rollNo;
+    }
+
+    public void setMarks(int marks) {
+        this.marks = marks;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        StudentClassic that = (StudentClassic) o;
+        return rollNo == that.rollNo && marks == that.marks && Objects.equals(name, that.name);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, rollNo, marks);
+    }
+
+    @Override
+    public String toString() {
+        return "StudentClassic{" +
+                "name='" + name + '\'' +
+                ", rollNo=" + rollNo +
+                ", marks=" + marks +
+                '}';
+    }
+}
diff --git a/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentRecord.java b/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentRecord.java
new file mode 100644
index 0000000000..84633c5c5e
--- /dev/null
+++ b/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentRecord.java
@@ -0,0 +1,19 @@
+package org.example;
+
+import java.util.Comparator;
+import java.util.List;
+
+public record StudentRecord(String name, int rollNo, int marks) {
+    public StudentRecord(String name){
+        this(name, 0,0);
+    }
+    public StudentRecord {
+        if (marks < 0 || marks > 100) {
+            throw new IllegalArgumentException("Marks should be between 0 and 100.");
+        }
+        if (name == null) {
+            throw new IllegalArgumentException("Name cannot be null");
+        }
+    }
+}
+
diff --git a/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentRecordV2.java b/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentRecordV2.java
new file mode 100644
index 0000000000..07b2193fcc
--- /dev/null
+++ b/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentRecordV2.java
@@ -0,0 +1,22 @@
+package org.example;
+
+record StudentRecordV2(String name, int rollNo, int marks, char grade) {
+    public StudentRecordV2(String name, int rollNo, int marks) {
+        this(name, rollNo, marks, calculateGrade(marks));
+    }
+
+    private static char calculateGrade(int marks) {
+        if (marks >= 90) {
+            return 'A';
+        } else if (marks >= 80) {
+            return 'B';
+        } else if (marks >= 70) {
+            return 'C';
+        } else if (marks >= 60) {
+            return 'D';
+        } else {
+            return 'F';
+        }
+    }
+}
+
diff --git a/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentRecordV3.java b/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentRecordV3.java
new file mode 100644
index 0000000000..b1035d5b10
--- /dev/null
+++ b/core-java-modules/core-java-14/src/main/java/com/baeldung/java14/recordsCustomConstructors/StudentRecordV3.java
@@ -0,0 +1,11 @@
+package org.example;
+
+import java.util.UUID;
+
+record StudentRecordV3(String name, int rollNo, int marks, String id) {
+
+    public StudentRecordV3(String name, int rollNo, int marks) {
+        this(name, rollNo, marks, UUID.randomUUID().toString());
+    }
+}
+
diff --git a/core-java-modules/core-java-14/src/test/java/com/baeldung/java14/recordsCustomConstructors/StudentRecordJUnitTest.java b/core-java-modules/core-java-14/src/test/java/com/baeldung/java14/recordsCustomConstructors/StudentRecordJUnitTest.java
new file mode 100644
index 0000000000..3d932541ba
--- /dev/null
+++ b/core-java-modules/core-java-14/src/test/java/com/baeldung/java14/recordsCustomConstructors/StudentRecordJUnitTest.java
@@ -0,0 +1,37 @@
+import org.example.StudentRecord;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+public class StudentRecordJUnitTest {
+
+    @Test
+    public void givenStudentRecordData_whenCreated_thenStudentPropertiesMatch() {
+        StudentRecord s1 = new StudentRecord("John", 1, 90);
+        StudentRecord s2 = new StudentRecord("Jane", 2, 80);
+        assertEquals("John", s1.name());
+        assertEquals(1, s1.rollNo());
+        assertEquals(90, s1.marks());
+        assertEquals("Jane", s2.name());
+        assertEquals(2, s2.rollNo());
+        assertEquals(80, s2.marks());
+    }
+    @Test
+    public void givenStudentRecordsList_whenSortingDataWithName_thenStudentsSorted(){
+        List<StudentRecord> studentRecords = List.of(
+                new StudentRecord("Dana", 1, 85),
+                new StudentRecord("Jim", 2, 90),
+                new StudentRecord("Jane", 3, 80)
+        );
+
+        List<StudentRecord> mutableStudentRecords = new ArrayList<>(studentRecords);
+        mutableStudentRecords.sort(Comparator.comparing(StudentRecord::name));
+
+        List<StudentRecord> sortedStudentRecords = List.copyOf(mutableStudentRecords);
+        assertEquals("Jane", sortedStudentRecords.get(1).name());
+    }
+}
diff --git a/core-java-modules/core-java-15/pom.xml b/core-java-modules/core-java-15/pom.xml
index a4923054ac..059e2cc8f3 100644
--- a/core-java-modules/core-java-15/pom.xml
+++ b/core-java-modules/core-java-15/pom.xml
@@ -6,7 +6,6 @@
     <artifactId>core-java-15</artifactId>
     <name>core-java-15</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>
diff --git a/core-java-modules/core-java-16/pom.xml b/core-java-modules/core-java-16/pom.xml
index a2c0d4855b..f8d287880a 100644
--- a/core-java-modules/core-java-16/pom.xml
+++ b/core-java-modules/core-java-16/pom.xml
@@ -4,10 +4,8 @@
     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>core-java-16</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-16</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>
diff --git a/core-java-modules/core-java-17/README.md b/core-java-modules/core-java-17/README.md
index 9f39b0289f..1af860b7c4 100644
--- a/core-java-modules/core-java-17/README.md
+++ b/core-java-modules/core-java-17/README.md
@@ -6,3 +6,4 @@
 - [New Features in Java 17](https://www.baeldung.com/java-17-new-features)
 - [Random Number Generators in Java 17](https://www.baeldung.com/java-17-random-number-generators)
 - [Sealed Classes and Interfaces in Java](https://www.baeldung.com/java-sealed-classes-interfaces)
+- [Migrate From Java 8 to Java 17](https://www.baeldung.com/java-migrate-8-to-17)
diff --git a/core-java-modules/core-java-17/pom.xml b/core-java-modules/core-java-17/pom.xml
index bc949d9050..e2d854be44 100644
--- a/core-java-modules/core-java-17/pom.xml
+++ b/core-java-modules/core-java-17/pom.xml
@@ -4,10 +4,8 @@
     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>core-java-17</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-17</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>
diff --git a/core-java-modules/core-java-19/README.md b/core-java-modules/core-java-19/README.md
index 6a9c6c7fdd..68244d9f91 100644
--- a/core-java-modules/core-java-19/README.md
+++ b/core-java-modules/core-java-19/README.md
@@ -1,3 +1,4 @@
 ## Relevant Articles
 - [Record Patterns in Java 19](https://www.baeldung.com/java-19-record-patterns)
 - [Structured Concurrency in Java 19](https://www.baeldung.com/java-structured-concurrency)
+- [Possible Root Causes for High CPU Usage in Java](https://www.baeldung.com/java-high-cpu-usage-causes)
diff --git a/core-java-modules/core-java-19/pom.xml b/core-java-modules/core-java-19/pom.xml
index 096b13e679..930b37391c 100644
--- a/core-java-modules/core-java-19/pom.xml
+++ b/core-java-modules/core-java-19/pom.xml
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         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">
+    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>core-java-19</artifactId>
+    <name>core-java-19</name>
+
     <parent>
         <groupId>com.baeldung.core-java-modules</groupId>
         <artifactId>core-java-modules</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>core-java-19</artifactId>
-
-    <properties>
-        <maven.compiler.source>19</maven.compiler.source>
-        <maven.compiler.target>19</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
     <build>
         <plugins>
             <plugin>
@@ -30,4 +26,10 @@
         </plugins>
     </build>
 
+    <properties>
+        <maven.compiler.source>19</maven.compiler.source>
+        <maven.compiler.target>19</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-19/src/main/java/com/baeldung/highcpu/Application.java b/core-java-modules/core-java-19/src/main/java/com/baeldung/highcpu/Application.java
new file mode 100644
index 0000000000..82162406b3
--- /dev/null
+++ b/core-java-modules/core-java-19/src/main/java/com/baeldung/highcpu/Application.java
@@ -0,0 +1,20 @@
+package com.baeldung.highcpu;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.IntUnaryOperator;
+import java.util.stream.IntStream;
+
+public class Application {
+
+    static List<Integer> generateList() {
+        return IntStream.range(0, 10000000).parallel().map(IntUnaryOperator.identity()).collect(LinkedList::new, List::add, List::addAll);
+    }
+
+    public static void main(String[] args) {
+        List<Integer> list = generateList();
+        long start = System.nanoTime();
+        int value = list.get(9500000);
+        System.out.printf("Found value %d in %d nanos\n", value, (System.nanoTime() - start));
+    }
+}
diff --git a/core-java-modules/core-java-20/README.md b/core-java-modules/core-java-20/README.md
new file mode 100644
index 0000000000..aba4e9e240
--- /dev/null
+++ b/core-java-modules/core-java-20/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Scoped Values in Java 20](https://www.baeldung.com/java-20-scoped-values)
diff --git a/core-java-modules/core-java-20/pom.xml b/core-java-modules/core-java-20/pom.xml
new file mode 100644
index 0000000000..9562a41b1c
--- /dev/null
+++ b/core-java-modules/core-java-20/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>core-java-20</artifactId>
+
+    <properties>
+        <maven.compiler.source>20</maven.compiler.source>
+        <maven.compiler.target>20</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>20</source>
+                    <target>20</target>
+                    <compilerArgs>
+                        <arg>--enable-preview</arg>
+                        <arg>--add-modules=jdk.incubator.concurrent</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>--enable-preview --add-modules=jdk.incubator.concurrent</argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>6.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.24.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>5.2.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Controller.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Controller.java
new file mode 100644
index 0000000000..92edc57e48
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Controller.java
@@ -0,0 +1,33 @@
+package com.baeldung.scopedvalues.classic;
+
+import com.baeldung.scopedvalues.data.Data;
+import com.baeldung.scopedvalues.data.User;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Optional;
+
+public class Controller {
+
+    private final Service service = new Service();
+
+    public void processRequest(HttpServletRequest request, HttpServletResponse response, User loggedInUser) {
+        Optional<Data> data = service.getData(request, loggedInUser);
+        if (data.isPresent()) {
+            try {
+                PrintWriter out = response.getWriter();
+                response.setContentType("application/json");
+                out.print(data.get());
+                out.flush();
+                response.setStatus(200);
+            } catch (IOException e) {
+                response.setStatus(500);
+            }
+        } else {
+            response.setStatus(400);
+        }
+    }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Repository.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Repository.java
new file mode 100644
index 0000000000..3085b3be58
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Repository.java
@@ -0,0 +1,16 @@
+package com.baeldung.scopedvalues.classic;
+
+import com.baeldung.scopedvalues.data.Data;
+import com.baeldung.scopedvalues.data.User;
+
+import java.util.Optional;
+
+public class Repository {
+
+    public Optional<Data> getData(String id, User user) {
+        return user.isAdmin()
+                ? Optional.of(new Data(id, "Title 1", "Description 1"))
+                : Optional.empty();
+    }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Server.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Server.java
new file mode 100644
index 0000000000..71afa9e675
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Server.java
@@ -0,0 +1,42 @@
+package com.baeldung.scopedvalues.classic;
+
+import com.baeldung.scopedvalues.data.User;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.*;
+
+public class Server {
+
+    private static final List<User> AUTHENTICATED_USERS = List.of(
+            new User("1", "admin", "123456", true),
+            new User("2", "user", "123456", false)
+    );
+    private final Controller controller = new Controller();
+    private final ExecutorService executor = Executors.newFixedThreadPool(5);
+
+    public void serve(HttpServletRequest request, HttpServletResponse response) throws InterruptedException, ExecutionException {
+        Optional<User> user = authenticateUser(request);
+        if (user.isPresent()) {
+            Future<?> future = executor.submit(() ->
+                    controller.processRequest(request, response, user.get()));
+            future.get();
+        } else {
+            response.setStatus(401);
+        }
+    }
+
+    private Optional<User> authenticateUser(HttpServletRequest request) {
+        return AUTHENTICATED_USERS.stream()
+                .filter(user -> checkUserPassword(user, request))
+                .findFirst();
+    }
+
+    private boolean checkUserPassword(User user, HttpServletRequest request) {
+        return user.name().equals(request.getParameter("user_name"))
+                && user.password().equals(request.getParameter("user_pw"));
+    }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Service.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Service.java
new file mode 100644
index 0000000000..011f793001
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/classic/Service.java
@@ -0,0 +1,18 @@
+package com.baeldung.scopedvalues.classic;
+
+import com.baeldung.scopedvalues.data.Data;
+import com.baeldung.scopedvalues.data.User;
+import jakarta.servlet.http.HttpServletRequest;
+
+import java.util.Optional;
+
+public class Service {
+
+    private final Repository repository = new Repository();
+
+    public Optional<Data> getData(HttpServletRequest request, User loggedInUser) {
+        String id = request.getParameter("data_id");
+        return repository.getData(id, loggedInUser);
+    }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/data/Data.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/data/Data.java
new file mode 100644
index 0000000000..70be41c1ac
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/data/Data.java
@@ -0,0 +1,3 @@
+package com.baeldung.scopedvalues.data;
+
+public record Data(String id, String title, String description) {}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/data/User.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/data/User.java
new file mode 100644
index 0000000000..22e0a4243f
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/data/User.java
@@ -0,0 +1,3 @@
+package com.baeldung.scopedvalues.data;
+
+public record User(String id, String name, String password, boolean isAdmin) {}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Controller.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Controller.java
new file mode 100644
index 0000000000..239ee88f19
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Controller.java
@@ -0,0 +1,37 @@
+package com.baeldung.scopedvalues.scoped;
+
+import com.baeldung.scopedvalues.data.Data;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jdk.incubator.concurrent.ScopedValue;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Optional;
+
+public class Controller {
+
+    private final Service internalService = new Service();
+
+    public void processRequest(HttpServletRequest request, HttpServletResponse response) {
+        Optional<Data> data = internalService.getData(request);
+
+        ScopedValue.where(Server.LOGGED_IN_USER, null)
+                .run(internalService::extractData);
+
+        if (data.isPresent()) {
+            try {
+                PrintWriter out = response.getWriter();
+                response.setContentType("application/json");
+                out.print(data.get());
+                out.flush();
+                response.setStatus(200);
+            } catch (IOException e) {
+                response.setStatus(500);
+            }
+        } else {
+            response.setStatus(400);
+        }
+    }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Repository.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Repository.java
new file mode 100644
index 0000000000..a40191eb3c
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Repository.java
@@ -0,0 +1,17 @@
+package com.baeldung.scopedvalues.scoped;
+
+import com.baeldung.scopedvalues.data.Data;
+import com.baeldung.scopedvalues.data.User;
+
+import java.util.Optional;
+
+public class Repository {
+
+    public Optional<Data> getData(String id) {
+        User loggedInUser = Server.LOGGED_IN_USER.get();
+        return loggedInUser.isAdmin()
+                ? Optional.of(new Data(id, "Title 1", "Description 1"))
+                : Optional.empty();
+    }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Server.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Server.java
new file mode 100644
index 0000000000..559e4efd56
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Server.java
@@ -0,0 +1,41 @@
+package com.baeldung.scopedvalues.scoped;
+
+import com.baeldung.scopedvalues.data.User;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jdk.incubator.concurrent.ScopedValue;
+
+import java.util.List;
+import java.util.Optional;
+
+public class Server {
+
+    private static final List<User> AUTHENTICATED_USERS = List.of(
+            new User("1", "admin", "123456", true),
+            new User("2", "user", "123456", false)
+    );
+    public final static ScopedValue<User> LOGGED_IN_USER = ScopedValue.newInstance();
+    private final Controller controller = new Controller();
+
+    public void serve(HttpServletRequest request, HttpServletResponse response) {
+        Optional<User> user = authenticateUser(request);
+        if (user.isPresent()) {
+            ScopedValue.where(LOGGED_IN_USER, user.get())
+                    .run(() -> controller.processRequest(request, response));
+        } else {
+            response.setStatus(401);
+        }
+    }
+
+    private Optional<User> authenticateUser(HttpServletRequest request) {
+        return AUTHENTICATED_USERS.stream()
+                .filter(user -> checkUserPassword(user, request))
+                .findFirst();
+    }
+
+    private boolean checkUserPassword(User user, HttpServletRequest request) {
+        return user.name().equals(request.getParameter("user_name"))
+                && user.password().equals(request.getParameter("user_pw"));
+    }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Service.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Service.java
new file mode 100644
index 0000000000..e35d98cae5
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/Service.java
@@ -0,0 +1,23 @@
+package com.baeldung.scopedvalues.scoped;
+
+import com.baeldung.scopedvalues.data.Data;
+import com.baeldung.scopedvalues.data.User;
+import jakarta.servlet.http.HttpServletRequest;
+
+import java.util.Optional;
+
+public class Service {
+
+    private final Repository repository = new Repository();
+
+    public Optional<Data> getData(HttpServletRequest request) {
+        String id = request.getParameter("data_id");
+        return repository.getData(id);
+    }
+
+    public void extractData() {
+        User loggedInUser = Server.LOGGED_IN_USER.get();
+        assert loggedInUser == null;
+    }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/Controller.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/Controller.java
new file mode 100644
index 0000000000..e4742c0998
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/Controller.java
@@ -0,0 +1,44 @@
+package com.baeldung.scopedvalues.scoped.inheriting;
+
+import com.baeldung.scopedvalues.data.Data;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jdk.incubator.concurrent.StructuredTaskScope;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+public class Controller {
+
+    private final InternalService internalService = new InternalService();
+    private final ExternalService externalService = new ExternalService();
+
+    public void processRequest(HttpServletRequest request, HttpServletResponse response) {
+        try (var scope = new StructuredTaskScope.ShutdownOnFailure()) {
+            Future<Optional<Data>> internalData = scope.fork(() -> internalService.getData(request));
+            Future<String> externalData = scope.fork(externalService::getData);
+            try {
+                scope.join();
+                scope.throwIfFailed();
+
+                Optional<Data> data = internalData.resultNow();
+                if (data.isPresent()) {
+                    PrintWriter out = response.getWriter();
+                    response.setContentType("application/json");
+                    out.println(data.get());
+                    out.print(externalData.resultNow());
+                    out.flush();
+                    response.setStatus(200);
+                } else {
+                    response.setStatus(400);
+                }
+            } catch (InterruptedException | ExecutionException | IOException e) {
+                response.setStatus(500);
+            }
+        }
+    }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/ExternalService.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/ExternalService.java
new file mode 100644
index 0000000000..88fa4dfb74
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/ExternalService.java
@@ -0,0 +1,9 @@
+package com.baeldung.scopedvalues.scoped.inheriting;
+
+public class ExternalService {
+
+    public String getData() {
+        return "External data";
+    }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/InternalService.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/InternalService.java
new file mode 100644
index 0000000000..ace46b254c
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/InternalService.java
@@ -0,0 +1,17 @@
+package com.baeldung.scopedvalues.scoped.inheriting;
+
+import com.baeldung.scopedvalues.data.Data;
+import jakarta.servlet.http.HttpServletRequest;
+
+import java.util.Optional;
+
+public class InternalService {
+
+    private final Repository repository = new Repository();
+
+    public Optional<Data> getData(HttpServletRequest request) {
+        String id = request.getParameter("data_id");
+        return repository.getData(id);
+    }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/Repository.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/Repository.java
new file mode 100644
index 0000000000..22d18b2fac
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/Repository.java
@@ -0,0 +1,17 @@
+package com.baeldung.scopedvalues.scoped.inheriting;
+
+import com.baeldung.scopedvalues.data.Data;
+import com.baeldung.scopedvalues.data.User;
+
+import java.util.Optional;
+
+public class Repository {
+
+    public Optional<Data> getData(String id) {
+        User loggedInUser = Server.LOGGED_IN_USER.get();
+        return loggedInUser.isAdmin()
+                ? Optional.of(new Data(id, "Title 1", "Description 1"))
+                : Optional.empty();
+    }
+
+}
diff --git a/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/Server.java b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/Server.java
new file mode 100644
index 0000000000..5f04a1eedd
--- /dev/null
+++ b/core-java-modules/core-java-20/src/main/java/com/baeldung/scopedvalues/scoped/inheriting/Server.java
@@ -0,0 +1,41 @@
+package com.baeldung.scopedvalues.scoped.inheriting;
+
+import com.baeldung.scopedvalues.data.User;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jdk.incubator.concurrent.ScopedValue;
+
+import java.util.List;
+import java.util.Optional;
+
+public class Server {
+
+    private static final List<User> AUTHENTICATED_USERS = List.of(
+            new User("1", "admin", "123456", true),
+            new User("2", "user", "123456", false)
+    );
+    public final static ScopedValue<User> LOGGED_IN_USER = ScopedValue.newInstance();
+    private final Controller controller = new Controller();
+
+    public void serve(HttpServletRequest request, HttpServletResponse response) {
+        Optional<User> user = authenticateUser(request);
+        if (user.isPresent()) {
+            ScopedValue.where(LOGGED_IN_USER, user.get())
+                    .run(() -> controller.processRequest(request, response));
+        } else {
+            response.setStatus(401);
+        }
+    }
+
+    private Optional<User> authenticateUser(HttpServletRequest request) {
+        return AUTHENTICATED_USERS.stream()
+                .filter(user -> checkUserPassword(user, request))
+                .findFirst();
+    }
+
+    private boolean checkUserPassword(User user, HttpServletRequest request) {
+        return user.name().equals(request.getParameter("user_name"))
+                && user.password().equals(request.getParameter("user_pw"));
+    }
+
+}
diff --git a/core-java-modules/core-java-20/src/test/java/com/baeldung/scopedvalues/classic/ServerUnitTest.java b/core-java-modules/core-java-20/src/test/java/com/baeldung/scopedvalues/classic/ServerUnitTest.java
new file mode 100644
index 0000000000..e0b9366c22
--- /dev/null
+++ b/core-java-modules/core-java-20/src/test/java/com/baeldung/scopedvalues/classic/ServerUnitTest.java
@@ -0,0 +1,52 @@
+package com.baeldung.scopedvalues.classic;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.concurrent.ExecutionException;
+
+import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Assertions.*;
+@ExtendWith(MockitoExtension.class)
+public class ServerUnitTest {
+
+    @Mock
+    private HttpServletRequest request;
+
+    @Mock
+    private HttpServletResponse response;
+
+    private final StringWriter writer = new StringWriter();
+
+    private final Server server = new Server();
+
+    @Test
+    void givenMockedRequestWithAdminCredentials_whenServeMethodIsCalled_thenDataIsReturned() throws InterruptedException, IOException, ExecutionException {
+        when(request.getParameter("user_name")).thenReturn("admin");
+        when(request.getParameter("user_pw")).thenReturn("123456");
+        when(request.getParameter("data_id")).thenReturn("1");
+        when(response.getWriter()).thenReturn(new PrintWriter(writer));
+
+        server.serve(request, response);
+
+        assertThat(writer.toString()).isEqualTo("Data[id=1, title=Title 1, description=Description 1]");
+    }
+
+    @Test
+    void givenMockedRequestWithUserCredentials_whenServeMethodIsCalled_thenNoDataIsReturned() throws InterruptedException, ExecutionException {
+        when(request.getParameter("user_name")).thenReturn("user");
+        when(request.getParameter("user_pw")).thenReturn("123456");
+
+        server.serve(request, response);
+
+        assertThat(writer.toString()).isEqualTo("");
+    }
+
+}
diff --git a/core-java-modules/core-java-20/src/test/java/com/baeldung/scopedvalues/scoped/ServerUnitTest.java b/core-java-modules/core-java-20/src/test/java/com/baeldung/scopedvalues/scoped/ServerUnitTest.java
new file mode 100644
index 0000000000..034e6683e3
--- /dev/null
+++ b/core-java-modules/core-java-20/src/test/java/com/baeldung/scopedvalues/scoped/ServerUnitTest.java
@@ -0,0 +1,52 @@
+package com.baeldung.scopedvalues.scoped;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+public class ServerUnitTest {
+
+    @Mock
+    private HttpServletRequest request;
+
+    @Mock
+    private HttpServletResponse response;
+
+    private final StringWriter writer = new StringWriter();
+
+    private final Server server = new Server();
+
+    @Test
+    void givenMockedRequestWithAdminCredentials_whenServeMethodIsCalled_thenDataIsReturned() throws IOException {
+        when(request.getParameter("user_name")).thenReturn("admin");
+        when(request.getParameter("user_pw")).thenReturn("123456");
+        when(request.getParameter("data_id")).thenReturn("1");
+        when(response.getWriter()).thenReturn(new PrintWriter(writer));
+
+        server.serve(request, response);
+
+        assertThat(writer.toString()).isEqualTo("Data[id=1, title=Title 1, description=Description 1]");
+    }
+
+    @Test
+    void givenMockedRequestWithUserCredentials_whenServeMethodIsCalled_thenNoDataIsReturned() throws IOException {
+        when(request.getParameter("user_name")).thenReturn("user");
+        when(request.getParameter("user_pw")).thenReturn("123456");
+
+        server.serve(request, response);
+
+        assertThat(writer.toString()).isEqualTo("");
+    }
+
+}
diff --git a/core-java-modules/core-java-20/src/test/java/com/baeldung/scopedvalues/scoped/inheriting/ServerUnitTest.java b/core-java-modules/core-java-20/src/test/java/com/baeldung/scopedvalues/scoped/inheriting/ServerUnitTest.java
new file mode 100644
index 0000000000..230b017c18
--- /dev/null
+++ b/core-java-modules/core-java-20/src/test/java/com/baeldung/scopedvalues/scoped/inheriting/ServerUnitTest.java
@@ -0,0 +1,52 @@
+package com.baeldung.scopedvalues.scoped.inheriting;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+public class ServerUnitTest {
+
+    @Mock
+    private HttpServletRequest request;
+
+    @Mock
+    private HttpServletResponse response;
+
+    private final StringWriter writer = new StringWriter();
+
+    private final Server server = new Server();
+
+    @Test
+    void givenMockedRequestWithAdminCredentials_whenServeMethodIsCalled_thenDataIsReturned() throws IOException {
+        when(request.getParameter("user_name")).thenReturn("admin");
+        when(request.getParameter("user_pw")).thenReturn("123456");
+        when(request.getParameter("data_id")).thenReturn("1");
+        when(response.getWriter()).thenReturn(new PrintWriter(writer));
+
+        server.serve(request, response);
+
+        assertThat(writer.toString()).isEqualTo("Data[id=1, title=Title 1, description=Description 1]\nExternal data");
+    }
+
+    @Test
+    void givenMockedRequestWithUserCredentials_whenServeMethodIsCalled_thenNoDataIsReturned() throws IOException {
+        when(request.getParameter("user_name")).thenReturn("user");
+        when(request.getParameter("user_pw")).thenReturn("123456");
+
+        server.serve(request, response);
+
+        assertThat(writer.toString()).isEqualTo("");
+    }
+
+}
diff --git a/core-java-modules/core-java-8-2/README.md b/core-java-modules/core-java-8-2/README.md
index c0bc63f21f..c723a827b1 100644
--- a/core-java-modules/core-java-8-2/README.md
+++ b/core-java-modules/core-java-8-2/README.md
@@ -10,4 +10,7 @@ This module contains articles about Java 8 core features
 - [Interface With Default Methods vs Abstract Class](https://www.baeldung.com/java-interface-default-method-vs-abstract-class)
 - [Convert Between Byte Array and UUID in Java](https://www.baeldung.com/java-byte-array-to-uuid)
 - [Create a Simple “Rock-Paper-Scissors” Game in Java](https://www.baeldung.com/java-rock-paper-scissors)
+- [VarArgs vs Array Input Parameters in Java](https://www.baeldung.com/varargs-vs-array)
+- [Lambda Expression vs. Anonymous Inner Class](https://www.baeldung.com/java-lambdas-vs-anonymous-class)
+- [Java Helper vs. Utility Classes](https://www.baeldung.com/java-helper-vs-utility-classes)
 - [[<-- Prev]](/core-java-modules/core-java-8)
diff --git a/core-java-modules/core-java-8-2/pom.xml b/core-java-modules/core-java-8-2/pom.xml
index 7db1e1ed4e..589e384613 100644
--- a/core-java-modules/core-java-8-2/pom.xml
+++ b/core-java-modules/core-java-8-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-8-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-8-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/anonymousclass/AnonymousClassExample.java b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/anonymousclass/AnonymousClassExample.java
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/anonymousclass/AnonymousClassExample.java
rename to core-java-modules/core-java-8-2/src/main/java/com/baeldung/anonymousclass/AnonymousClassExample.java
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/baeldung/helpervsutilityclasses/MyHelperClass.java b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/helpervsutilityclasses/MyHelperClass.java
new file mode 100644
index 0000000000..40b58bf200
--- /dev/null
+++ b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/helpervsutilityclasses/MyHelperClass.java
@@ -0,0 +1,40 @@
+package com.baeldung.helpervsutilityclasses;
+
+class MyHelperClass {
+    public double discount;
+    public MyHelperClass(double discount) {
+        if (discount > 0 && discount < 1) {
+            this.discount = discount;
+        }
+    }
+    public double discountedPrice(double price) {
+        return price - (price * discount);
+    }
+
+    public static int getMaxNumber(int[] numbers) {
+        if (numbers.length == 0) {
+            throw new IllegalArgumentException("Ensure array is not empty");
+        }
+        int max = numbers[0];
+        for (int i = 1; i < numbers.length; i++) {
+            if (numbers[i] > max) {
+                max = numbers[i];
+            }
+        }
+        return max;
+    }
+
+    public static int getMinNumber(int[] numbers) {
+        if (numbers.length == 0) {
+            throw new IllegalArgumentException("Ensure array is not empty");
+        }
+        int min = numbers[0];
+        for (int i = 1; i < numbers.length; i++) {
+            if (numbers[i] < min) {
+                min = numbers[i];
+            }
+        }
+        return min;
+    }
+
+}
diff --git a/core-java-modules/core-java-8-2/src/main/java/com/baeldung/helpervsutilityclasses/MyUtilityClass.java b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/helpervsutilityclasses/MyUtilityClass.java
new file mode 100644
index 0000000000..1f0075995c
--- /dev/null
+++ b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/helpervsutilityclasses/MyUtilityClass.java
@@ -0,0 +1,19 @@
+package com.baeldung.helpervsutilityclasses;
+
+public final class MyUtilityClass {
+
+    private MyUtilityClass(){}
+
+    public static String returnUpperCase(String stringInput) {
+        return stringInput.toUpperCase();
+    }
+
+    public static String returnLowerCase(String stringInput) {
+        return stringInput.toLowerCase();
+    }
+
+    public static String[] splitStringInput(String stringInput, String delimiter) {
+        return stringInput.split(delimiter);
+    }
+
+}
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/lambdaexpression/LambdaExpressionExample.java b/core-java-modules/core-java-8-2/src/main/java/com/baeldung/lambdaexpression/LambdaExpressionExample.java
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/lambdaexpression/LambdaExpressionExample.java
rename to core-java-modules/core-java-8-2/src/main/java/com/baeldung/lambdaexpression/LambdaExpressionExample.java
diff --git a/core-java-modules/core-java-8-2/src/test/java/com/baeldung/helpervsutilityclasses/MyHelperClassUnitTest.java b/core-java-modules/core-java-8-2/src/test/java/com/baeldung/helpervsutilityclasses/MyHelperClassUnitTest.java
new file mode 100644
index 0000000000..a0c1afea52
--- /dev/null
+++ b/core-java-modules/core-java-8-2/src/test/java/com/baeldung/helpervsutilityclasses/MyHelperClassUnitTest.java
@@ -0,0 +1,20 @@
+package com.baeldung.helpervsutilityclasses;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+class MyHelperClassUnitTest {
+
+    @Test
+    void whenCreatingHelperObject_thenHelperObjectShouldBeCreated() {
+        MyHelperClass myHelperClassObject = new MyHelperClass(0.10);
+        int[] numberArray = {15, 23, 66, 3, 51, 79};
+
+        assertNotNull(myHelperClassObject);
+
+        assertEquals(90, myHelperClassObject.discountedPrice(100.00));
+        assertEquals( 79, MyHelperClass.getMaxNumber(numberArray));
+        assertEquals(3, MyHelperClass.getMinNumber(numberArray));
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-8-2/src/test/java/com/baeldung/helpervsutilityclasses/MyUtilityClassUnitTest.java b/core-java-modules/core-java-8-2/src/test/java/com/baeldung/helpervsutilityclasses/MyUtilityClassUnitTest.java
new file mode 100644
index 0000000000..8b29f51959
--- /dev/null
+++ b/core-java-modules/core-java-8-2/src/test/java/com/baeldung/helpervsutilityclasses/MyUtilityClassUnitTest.java
@@ -0,0 +1,15 @@
+package com.baeldung.helpervsutilityclasses;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+class MyUtilityClassUnitTest {
+
+    @Test
+    void whenUsingUtilityMethods_thenAccessMethodsViaClassName(){
+        assertEquals( "INIUBONG", MyUtilityClass.returnUpperCase("iniubong"));
+        assertEquals("accra", MyUtilityClass.returnLowerCase("AcCrA"));
+    }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-8-datetime-2/README.md b/core-java-modules/core-java-8-datetime-2/README.md
index f16563aacc..56f66c10fb 100644
--- a/core-java-modules/core-java-8-datetime-2/README.md
+++ b/core-java-modules/core-java-8-datetime-2/README.md
@@ -2,4 +2,5 @@
 
 - [Generating Random Dates in Java](https://www.baeldung.com/java-random-dates)
 - [Creating a LocalDate with Values in Java](https://www.baeldung.com/java-creating-localdate-with-values)
-- [[<-- Prev]](/core-java-modules/core-java-datetime-java8-1)
\ No newline at end of file
+- [Parsing Date Strings with Varying Formats](https://www.baeldung.com/java-parsing-dates-many-formats)
+- [[<-- Prev]](/core-java-modules/core-java-datetime-java8-1)
diff --git a/core-java-modules/core-java-8-datetime-2/pom.xml b/core-java-modules/core-java-8-datetime-2/pom.xml
index 9e54b0ee12..ce349d9dc3 100644
--- a/core-java-modules/core-java-8-datetime-2/pom.xml
+++ b/core-java-modules/core-java-8-datetime-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-8-datetime-2</artifactId>
-    <version>${project.parent.version}</version>
     <name>core-java-8-datetime-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleDateTimeFormat.java b/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleDateTimeFormat.java
new file mode 100644
index 0000000000..a82f3bce2b
--- /dev/null
+++ b/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleDateTimeFormat.java
@@ -0,0 +1,20 @@
+package com.baeldung.parsingDates;
+
+import java.util.Arrays;
+import java.util.List;
+import org.joda.time.LocalDate;
+import org.joda.time.format.DateTimeFormat;
+
+public class SimpleDateTimeFormat {
+
+    public static LocalDate parseDate(String date) {
+        List<String> patternList = Arrays.asList("MM/dd/yyyy", "dd.MM.yyyy", "yyyy-MM-dd");
+        for (String pattern : patternList) {
+            try {
+                return DateTimeFormat.forPattern(pattern).parseLocalDate(date);
+            } catch (IllegalArgumentException e) {
+            }
+        }
+        return null;
+    }
+}
diff --git a/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleDateTimeFormater.java b/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleDateTimeFormater.java
new file mode 100644
index 0000000000..aa12038032
--- /dev/null
+++ b/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleDateTimeFormater.java
@@ -0,0 +1,17 @@
+package com.baeldung.parsingDates;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+
+public class SimpleDateTimeFormater {
+
+    public static LocalDate parseDate(String date) {
+        DateTimeFormatterBuilder dateTimeFormatterBuilder = new DateTimeFormatterBuilder()
+                .append(DateTimeFormatter.ofPattern("[MM/dd/yyyy]" + "[dd-MM-yyyy]" + "[yyyy-MM-dd]"));
+
+        DateTimeFormatter dateTimeFormatter = dateTimeFormatterBuilder.toFormatter();
+
+        return LocalDate.parse(date, dateTimeFormatter);
+    }
+}
diff --git a/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleDateUtils.java b/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleDateUtils.java
new file mode 100644
index 0000000000..8a154d3cd8
--- /dev/null
+++ b/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleDateUtils.java
@@ -0,0 +1,18 @@
+package com.baeldung.parsingDates;
+
+import java.text.ParseException;
+import java.util.Date;
+import org.apache.commons.lang3.time.DateUtils;
+
+public class SimpleDateUtils {
+
+    public static Date parseDate(String date) {
+        try {
+            return DateUtils.parseDateStrictly(date,
+                    new String[]{"yyyy/MM/dd", "dd/MM/yyyy", "yyyy-MM-dd"});
+        } catch (ParseException ex) {
+            return null;
+        }
+    }
+
+}
diff --git a/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleParseDate.java b/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleParseDate.java
new file mode 100644
index 0000000000..cb024eea53
--- /dev/null
+++ b/core-java-modules/core-java-8-datetime-2/src/main/java/com/baeldung/parsingDates/SimpleParseDate.java
@@ -0,0 +1,19 @@
+package com.baeldung.parsingDates;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+public class SimpleParseDate {
+
+    public Date parseDate(String dateString, List<String> formatStrings) {
+        for (String formatString : formatStrings) {
+            try {
+                return new SimpleDateFormat(formatString).parse(dateString);
+            } catch (ParseException e) {
+            }
+        }
+        return null;
+    }
+}
diff --git a/core-java-modules/core-java-8-datetime-2/src/test/java/com/baeldung/parsingDates/SimpleParseDateUnitTest.java b/core-java-modules/core-java-8-datetime-2/src/test/java/com/baeldung/parsingDates/SimpleParseDateUnitTest.java
new file mode 100644
index 0000000000..d7cbb6a834
--- /dev/null
+++ b/core-java-modules/core-java-8-datetime-2/src/test/java/com/baeldung/parsingDates/SimpleParseDateUnitTest.java
@@ -0,0 +1,43 @@
+package com.baeldung.parsingDates;
+
+import com.baeldung.parsingDates.SimpleDateTimeFormat;
+import com.baeldung.parsingDates.SimpleDateTimeFormater;
+import com.baeldung.parsingDates.SimpleDateUtils;
+import com.baeldung.parsingDates.SimpleParseDate;
+import java.time.format.DateTimeParseException;
+import java.util.Arrays;
+import org.junit.*;
+import static org.junit.Assert.*;
+import org.joda.time.LocalDate;
+
+public class SimpleParseDateUnitTest {
+
+    @Test
+    public void whenInvalidInput_thenGettingUnexpectedResult() {
+        SimpleParseDate simpleParseDate = new SimpleParseDate();
+        String date = "2022-40-40";
+        assertEquals("Sat May 10 00:00:00 UTC 2025", simpleParseDate.parseDate(date, Arrays.asList("MM/dd/yyyy", "dd.MM.yyyy", "yyyy-MM-dd")).toString());
+    }
+
+    @Test
+    public void whenInvalidDate_thenAssertThrows() {
+        SimpleDateTimeFormater simpleDateTimeFormater = new SimpleDateTimeFormater();
+        assertEquals(java.time.LocalDate.parse("2022-12-04"), simpleDateTimeFormater.parseDate("2022-12-04"));
+        assertThrows(DateTimeParseException.class, () -> simpleDateTimeFormater.parseDate("2022-13-04"));
+    }
+
+    @Test
+    public void whenDateIsCorrect_thenParseCorrect() {
+        SimpleDateUtils simpleDateUtils = new SimpleDateUtils();
+        assertNull(simpleDateUtils.parseDate("53/10/2014"));
+        assertEquals("Wed Sep 10 00:00:00 UTC 2014", simpleDateUtils.parseDate("10/09/2014").toString());
+    }
+
+    @Test
+    public void whenDateIsCorrect_thenResultCorrect() {
+        SimpleDateTimeFormat simpleDateTimeFormat = new SimpleDateTimeFormat();
+        assertNull(simpleDateTimeFormat.parseDate("53/10/2014"));
+        assertEquals(LocalDate.parse("2014-10-10"), simpleDateTimeFormat.parseDate("2014-10-10"));
+    }
+
+}
diff --git a/core-java-modules/core-java-8-datetime/pom.xml b/core-java-modules/core-java-8-datetime/pom.xml
index 01ec6c0b76..481b1a6a69 100644
--- a/core-java-modules/core-java-8-datetime/pom.xml
+++ b/core-java-modules/core-java-8-datetime/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-8-datetime</artifactId>
-    <version>${project.parent.version}</version>
     <name>core-java-8-datetime</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-8/pom.xml b/core-java-modules/core-java-8/pom.xml
index 89925bdbbb..fff7b7f2f9 100644
--- a/core-java-modules/core-java-8/pom.xml
+++ b/core-java-modules/core-java-8/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-8</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-8</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-9-improvements/pom.xml b/core-java-modules/core-java-9-improvements/pom.xml
index 56d4ccff9f..f6f13ff409 100644
--- a/core-java-modules/core-java-9-improvements/pom.xml
+++ b/core-java-modules/core-java-9-improvements/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-9-improvements</artifactId>
-    <version>0.2-SNAPSHOT</version>
     <name>core-java-9-improvements</name>
 
     <parent>
diff --git a/core-java-modules/core-java-9-jigsaw/README.md b/core-java-modules/core-java-9-jigsaw/README.md
index cfffb86588..73905e6033 100644
--- a/core-java-modules/core-java-9-jigsaw/README.md
+++ b/core-java-modules/core-java-9-jigsaw/README.md
@@ -8,5 +8,5 @@ This module contains articles about Project Jigsaw and the Java Platform Module
 - [A Guide to Java 9 Modularity](https://www.baeldung.com/java-9-modularity)
 - [Java 9 java.lang.Module API](https://www.baeldung.com/java-9-module-api)
 - [Java 9 Illegal Reflective Access Warning](https://www.baeldung.com/java-illegal-reflective-access)
-
+- [Java Modularity and Unit Testing](https://www.baeldung.com/java-modularity-unit-testing)
 
diff --git a/core-java-modules/core-java-9-jigsaw/compile-library-core-module.sh b/core-java-modules/core-java-9-jigsaw/compile-library-core-module.sh
new file mode 100644
index 0000000000..fa0d4d5f14
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/compile-library-core-module.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+javac -d mods/com.baeldung.library.core $(find library-core/src/main -name "*.java")
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/compile-library-core-tests.sh b/core-java-modules/core-java-9-jigsaw/compile-library-core-tests.sh
new file mode 100644
index 0000000000..751906103b
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/compile-library-core-tests.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+javac --class-path outDir/library-core/:\
+libs/junit-jupiter-engine-5.9.2.jar:\
+libs/junit-platform-engine-1.9.2.jar:\
+libs/apiguardian-api-1.1.2.jar:\
+libs/junit-jupiter-params-5.9.2.jar:\
+libs/junit-jupiter-api-5.9.2.jar:\
+libs/opentest4j-1.2.0.jar:\
+libs/junit-platform-commons-1.9.2.jar \
+-d outDir/library-test library-core/src/test/java/com/baeldung/library/core/LibraryUnitTest.java
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/compile-library-core-with-tests.sh b/core-java-modules/core-java-9-jigsaw/compile-library-core-with-tests.sh
new file mode 100644
index 0000000000..c873a9003c
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/compile-library-core-with-tests.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+javac --class-path libs/junit-jupiter-engine-5.9.2.jar:\
+libs/junit-platform-engine-1.9.2.jar:\
+libs/apiguardian-api-1.1.2.jar:\
+libs/junit-jupiter-params-5.9.2.jar:\
+libs/junit-jupiter-api-5.9.2.jar:\
+libs/opentest4j-1.2.0.jar:\
+libs/junit-platform-commons-1.9.2.jar \
+-d outDir/library-core \
+library-core/src/main/java/com/baeldung/library/core/Book.java \
+library-core/src/main/java/com/baeldung/library/core/Library.java \
+library-core/src/main/java/com/baeldung/library/core/Main.java \
+library-core/src/test/java/com/baeldung/library/core/LibraryUnitTest.java
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/compile-library-core.sh b/core-java-modules/core-java-9-jigsaw/compile-library-core.sh
new file mode 100644
index 0000000000..7531148d0f
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/compile-library-core.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+javac --class-path libs/junit-jupiter-engine-5.9.2.jar:\
+libs/junit-platform-engine-1.9.2.jar:\
+libs/apiguardian-api-1.1.2.jar:\
+libs/junit-jupiter-params-5.9.2.jar:\
+libs/junit-jupiter-api-5.9.2.jar:\
+libs/opentest4j-1.2.0.jar:\
+libs/junit-platform-commons-1.9.2.jar \
+-d outDir/library-core \
+library-core/src/main/java/com/baeldung/library/core/Book.java \
+library-core/src/main/java/com/baeldung/library/core/Library.java \
+library-core/src/main/java/com/baeldung/library/core/Main.java
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/compile-library-test-module.sh b/core-java-modules/core-java-9-jigsaw/compile-library-test-module.sh
new file mode 100644
index 0000000000..c6fd614fd0
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/compile-library-test-module.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+javac --module-path mods:libs -d mods/com.baeldung.library.test $(find library-test/src/test -name "*.java")
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/download-junit-dependencies.sh b/core-java-modules/core-java-9-jigsaw/download-junit-dependencies.sh
new file mode 100644
index 0000000000..64c72a5429
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/download-junit-dependencies.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+wget -P libs/ https://repo1.maven.org/maven2/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar /
+wget -P libs/ https://repo1.maven.org/maven2/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar /
+wget -P libs/ https://repo1.maven.org/maven2/org/junit/platform/junit-platform-commons/1.9.2/junit-platform-commons-1.9.2.jar /
+wget -P libs/ https://repo1.maven.org/maven2/org/junit/platform/junit-platform-engine/1.9.2/junit-platform-engine-1.9.2.jar /
+wget -P libs/ https://repo1.maven.org/maven2/org/junit/platform/junit-platform-reporting/1.9.2/junit-platform-reporting-1.9.2.jar /
+wget -P libs/ https://repo1.maven.org/maven2/org/junit/platform/junit-platform-console/1.9.2/junit-platform-console-1.9.2.jar /
+wget -P libs/ https://repo1.maven.org/maven2/org/junit/platform/junit-platform-launcher/1.9.2/junit-platform-launcher-1.9.2.jar /
+wget -P libs/ https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-engine/5.9.2/junit-jupiter-engine-5.9.2.jar /
+wget -P libs/ https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-params/5.9.2/junit-jupiter-params-5.9.2.jar
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/library-core/pom.xml b/core-java-modules/core-java-9-jigsaw/library-core/pom.xml
new file mode 100644
index 0000000000..b860d89932
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/library-core/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  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>
+  <parent>
+    <groupId>com.baeldung</groupId>
+    <artifactId>core-java-9-jigsaw</artifactId>
+    <version>0.2-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>library-core</artifactId>
+
+  <properties>
+    <maven.compiler.source>19</maven.compiler.source>
+    <maven.compiler.target>19</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.9.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>5.9.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
+        <configuration>
+          <release>9</release>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.0.0-M5</version>
+        <configuration>
+          <useModulePath>false</useModulePath>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/com/baeldung/library/core/Book.java b/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/com/baeldung/library/core/Book.java
new file mode 100644
index 0000000000..782de8fa10
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/com/baeldung/library/core/Book.java
@@ -0,0 +1,52 @@
+package com.baeldung.library.core;
+
+import java.util.Objects;
+
+public class Book {
+
+    private String title;
+    private String author;
+
+    public Book(String title, String author) {
+        this.title = title;
+        this.author = author;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+
+    @Override
+    public String toString() {
+        return "Book [title=" + title + ", author=" + author + "]";
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        final Book book = (Book) o;
+
+        if (!Objects.equals(title, book.title)) {
+            return false;
+        }
+        return Objects.equals(author, book.author);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = title != null ? title.hashCode() : 0;
+        result = 31 * result + (author != null ? author.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/com/baeldung/library/core/Library.java b/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/com/baeldung/library/core/Library.java
new file mode 100644
index 0000000000..ee2225810d
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/com/baeldung/library/core/Library.java
@@ -0,0 +1,25 @@
+package com.baeldung.library.core;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Library {
+
+    private List<Book> books = new ArrayList<>();
+
+    public void addBook(Book book) {
+        books.add(book);
+    }
+
+    public List<Book> getBooks() {
+        return books;
+    }
+
+    void removeBook(Book book) {
+        books.remove(book);
+    }
+
+    protected void removeBookByAuthor(String author) {
+        books.removeIf(book -> book.getAuthor().equals(author));
+    }
+}
diff --git a/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/com/baeldung/library/core/Main.java b/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/com/baeldung/library/core/Main.java
new file mode 100644
index 0000000000..18839602c2
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/com/baeldung/library/core/Main.java
@@ -0,0 +1,16 @@
+package com.baeldung.library.core;
+
+public class Main {
+
+    public static void main(String[] args) {
+        Library library = new Library();
+        library.addBook(new Book("The Lord of the Rings", "J.R.R. Tolkien"));
+        library.addBook(new Book("The Hobbit", "J.R.R. Tolkien"));
+        library.addBook(new Book("The Silmarillion", "J.R.R. Tolkien"));
+        library.addBook(new Book("The Chronicles of Narnia", "C.S. Lewis"));
+        library.addBook(new Book("The Lion, the Witch and the Wardrobe", "C.S. Lewis"));
+        System.out.println("Welcome to our library!");
+        System.out.println("We have the following books:");
+        library.getBooks().forEach(System.out::println);
+    }
+}
diff --git a/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/module-info.java b/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/module-info.java
new file mode 100644
index 0000000000..bdf88d8bc9
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/library-core/src/main/java/module-info.java
@@ -0,0 +1,3 @@
+module com.baeldung.library.core {
+    exports com.baeldung.library.core;
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/library-core/src/test/java/com/baeldung/library/core/LibraryUnitTest.java b/core-java-modules/core-java-9-jigsaw/library-core/src/test/java/com/baeldung/library/core/LibraryUnitTest.java
new file mode 100644
index 0000000000..20a4889e8c
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/library-core/src/test/java/com/baeldung/library/core/LibraryUnitTest.java
@@ -0,0 +1,47 @@
+package com.baeldung.library.core;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+class LibraryUnitTest {
+
+    @Test
+    void givenEmptyLibrary_whenAddABook_thenLibraryHasOneBook() {
+        Library library = new Library();
+        Book theLordOfTheRings = new Book("The Lord of the Rings", "J.R.R. Tolkien");
+        library.addBook(theLordOfTheRings);
+        int expected = 1;
+        int actual = library.getBooks().size();
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void givenTheLibraryWithABook_whenRemoveABook_thenLibraryIsEmpty() {
+        Library library = new Library();
+        Book theLordOfTheRings = new Book("The Lord of the Rings", "J.R.R. Tolkien");
+        library.addBook(theLordOfTheRings);
+        library.removeBook(theLordOfTheRings);
+        int expected = 0;
+        int actual = library.getBooks().size();
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void givenTheLibraryWithSeveralBook_whenRemoveABookByAuthor_thenLibraryHasNoBooksByTheAuthor() {
+        Library library = new Library();
+        Book theLordOfTheRings = new Book("The Lord of the Rings", "J.R.R. Tolkien");
+        Book theHobbit = new Book("The Hobbit", "J.R.R. Tolkien");
+        Book theSilmarillion = new Book("The Silmarillion", "J.R.R. Tolkien");
+        Book theHungerGames = new Book("The Hunger Games", "Suzanne Collins");
+        library.addBook(theLordOfTheRings);
+        library.addBook(theHobbit);
+        library.addBook(theSilmarillion);
+        library.addBook(theHungerGames);
+        library.removeBookByAuthor("J.R.R. Tolkien");
+        int expected = 1;
+        int actual = library.getBooks().size();
+        assertEquals(expected, actual);
+    }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/library-test/src/test/java/com/baeldung/library/test/LibraryUnitTest.java b/core-java-modules/core-java-9-jigsaw/library-test/src/test/java/com/baeldung/library/test/LibraryUnitTest.java
new file mode 100644
index 0000000000..31eae89bba
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/library-test/src/test/java/com/baeldung/library/test/LibraryUnitTest.java
@@ -0,0 +1,53 @@
+package com.baeldung.library.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import com.baeldung.library.core.Book;
+import com.baeldung.library.core.Library;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import org.junit.jupiter.api.Test;
+
+class LibraryUnitTest {
+
+    @Test
+    void givenEmptyLibrary_whenAddABook_thenLibraryHasOneBook() {
+        Library library = new Library();
+        Book theLordOfTheRings = new Book("The Lord of the Rings", "J.R.R. Tolkien");
+        library.addBook(theLordOfTheRings);
+        int expected = 1;
+        int actual = library.getBooks().size();
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void givenTheLibraryWithABook_whenRemoveABook_thenLibraryIsEmpty()
+        throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+        Library library = new Library();
+        Book theLordOfTheRings = new Book("The Lord of the Rings", "J.R.R. Tolkien");
+        library.addBook(theLordOfTheRings);
+        Method removeBook = Library.class.getDeclaredMethod("removeBook", Book.class);
+        removeBook.setAccessible(true);
+        removeBook.invoke(library, theLordOfTheRings);
+        int expected = 0;
+        int actual = library.getBooks().size();
+        assertEquals(expected, actual);
+    }
+@Test
+void givenTheLibraryWithSeveralBook_whenRemoveABookByAuthor_thenLibraryHasNoBooksByTheAuthor() {
+    TestLibrary library = new TestLibrary();
+    Book theLordOfTheRings = new Book("The Lord of the Rings", "J.R.R. Tolkien");
+    Book theHobbit = new Book("The Hobbit", "J.R.R. Tolkien");
+    Book theSilmarillion = new Book("The Silmarillion", "J.R.R. Tolkien");
+    Book theHungerGames = new Book("The Hunger Games", "Suzanne Collins");
+    library.addBook(theLordOfTheRings);
+    library.addBook(theHobbit);
+    library.addBook(theSilmarillion);
+    library.addBook(theHungerGames);
+    library.removeBookByAuthor("J.R.R. Tolkien");
+    int expected = 1;
+    int actual = library.getBooks().size();
+    assertEquals(expected, actual);
+}
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/library-test/src/test/java/com/baeldung/library/test/TestLibrary.java b/core-java-modules/core-java-9-jigsaw/library-test/src/test/java/com/baeldung/library/test/TestLibrary.java
new file mode 100644
index 0000000000..8ee3b0e3fe
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/library-test/src/test/java/com/baeldung/library/test/TestLibrary.java
@@ -0,0 +1,10 @@
+package com.baeldung.library.test;
+
+import com.baeldung.library.core.Library;
+
+public class TestLibrary extends Library {
+    @Override
+    public void removeBookByAuthor(final String author) {
+        super.removeBookByAuthor(author);
+    }
+}
diff --git a/core-java-modules/core-java-9-jigsaw/library-test/src/test/java/module-info.java b/core-java-modules/core-java-9-jigsaw/library-test/src/test/java/module-info.java
new file mode 100644
index 0000000000..8d60b574f2
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/library-test/src/test/java/module-info.java
@@ -0,0 +1,5 @@
+module com.baeldung.library.test {
+    requires com.baeldung.library.core;
+    requires org.junit.jupiter.api;
+    opens com.baeldung.library.test to org.junit.platform.commons;
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/pom.xml b/core-java-modules/core-java-9-jigsaw/pom.xml
index a26a88f4b0..288254b9cf 100644
--- a/core-java-modules/core-java-9-jigsaw/pom.xml
+++ b/core-java-modules/core-java-9-jigsaw/pom.xml
@@ -4,8 +4,11 @@
     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>core-java-9-jigsaw</artifactId>
-    <version>0.2-SNAPSHOT</version>
     <name>core-java-9-jigsaw</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>library-core</module>
+    </modules>
 
     <parent>
         <groupId>com.baeldung</groupId>
diff --git a/core-java-modules/core-java-9-jigsaw/run-library-core-module-with-patch.sh b/core-java-modules/core-java-9-jigsaw/run-library-core-module-with-patch.sh
new file mode 100644
index 0000000000..70772a3589
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/run-library-core-module-with-patch.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+java --module-path mods:libs \
+--add-modules com.baeldung.library.core \
+--add-opens com.baeldung.library.core/com.baeldung.library.core=org.junit.platform.commons \
+--add-reads com.baeldung.library.core=org.junit.jupiter.api \
+--patch-module com.baeldung.library.core=outDir/library-test \
+--module org.junit.platform.console --select-class com.baeldung.library.core.LibraryUnitTest
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/run-library-core-module.sh b/core-java-modules/core-java-9-jigsaw/run-library-core-module.sh
new file mode 100644
index 0000000000..f2bb976512
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/run-library-core-module.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+java --module-path mods --module com.baeldung.library.core/com.baeldung.library.core.Main
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/run-library-test-class-path.sh b/core-java-modules/core-java-9-jigsaw/run-library-test-class-path.sh
new file mode 100644
index 0000000000..73e3d504bf
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/run-library-test-class-path.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+java --module-path libs \
+org.junit.platform.console.ConsoleLauncher \
+--classpath ./outDir/library-core \
+--select-class com.baeldung.library.core.LibraryUnitTest
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-jigsaw/run-library-test-module-path.sh b/core-java-modules/core-java-9-jigsaw/run-library-test-module-path.sh
new file mode 100644
index 0000000000..08d149dbd7
--- /dev/null
+++ b/core-java-modules/core-java-9-jigsaw/run-library-test-module-path.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+java --module-path mods:libs \
+--add-modules com.baeldung.library.test \
+--add-opens com.baeldung.library.core/com.baeldung.library.core=com.baeldung.library.test \
+org.junit.platform.console.ConsoleLauncher --select-class com.baeldung.library.test.LibraryUnitTest
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-new-features/pom.xml b/core-java-modules/core-java-9-new-features/pom.xml
index 78ffaff010..6821c9c340 100644
--- a/core-java-modules/core-java-9-new-features/pom.xml
+++ b/core-java-modules/core-java-9-new-features/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-9-new-features</artifactId>
-    <version>0.2-SNAPSHOT</version>
     <name>core-java-9-new-features</name>
 
     <parent>
diff --git a/core-java-modules/core-java-9-streams/pom.xml b/core-java-modules/core-java-9-streams/pom.xml
index d3f81780d1..903194b3b3 100644
--- a/core-java-modules/core-java-9-streams/pom.xml
+++ b/core-java-modules/core-java-9-streams/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-9-streams</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-9-streams</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-9/README.md b/core-java-modules/core-java-9/README.md
index 38965d88f1..bd7df0c8a6 100644
--- a/core-java-modules/core-java-9/README.md
+++ b/core-java-modules/core-java-9/README.md
@@ -5,7 +5,6 @@ This module contains articles about Java 9 core features
 ### Relevant Articles:
 
 - [Method Handles in Java](https://www.baeldung.com/java-method-handles)
-- [Introduction to Chronicle Queue](https://www.baeldung.com/java-chronicle-queue)
 - [Iterate Through a Range of Dates in Java](https://www.baeldung.com/java-iterate-date-range)
 - [Initialize a HashMap in Java](https://www.baeldung.com/java-initialize-hashmap)
 - [Immutable ArrayList in Java](https://www.baeldung.com/java-immutable-list)
diff --git a/core-java-modules/core-java-9/pom.xml b/core-java-modules/core-java-9/pom.xml
index 272af327cb..bcfdacdf1d 100644
--- a/core-java-modules/core-java-9/pom.xml
+++ b/core-java-modules/core-java-9/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-9</artifactId>
-    <version>0.2-SNAPSHOT</version>
     <name>core-java-9</name>
 
     <parent>
diff --git a/core-java-modules/core-java-annotations/pom.xml b/core-java-modules/core-java-annotations/pom.xml
index a1f84ab563..6b1b9d802f 100644
--- a/core-java-modules/core-java-annotations/pom.xml
+++ b/core-java-modules/core-java-annotations/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-annotations</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-annotations</name>
     <packaging>jar</packaging>
 
@@ -24,4 +23,12 @@
         </resources>
     </build>
 
+    <dependencies>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+    </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSuppressWarningsNames.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSuppressWarningsNames.java
index aad7cf49eb..d0a325a155 100644
--- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSuppressWarningsNames.java
+++ b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSuppressWarningsNames.java
@@ -17,7 +17,7 @@ public class ClassWithSuppressWarningsNames implements Serializable {
         list.add(Integer.valueOf(value));
     }
 
-    @SuppressWarnings("deprecated")
+    @SuppressWarnings("deprecation")
     void suppressDeprecatedWarning() {
         ClassWithSuppressWarningsNames cls = new ClassWithSuppressWarningsNames();
         cls.deprecatedMethod(); // no warning here
diff --git a/core-java-modules/core-java-arrays-operations-basic/README.md b/core-java-modules/core-java-arrays-operations-basic/README.md
index 2e1268e00c..76f4044355 100644
--- a/core-java-modules/core-java-arrays-operations-basic/README.md
+++ b/core-java-modules/core-java-arrays-operations-basic/README.md
@@ -11,3 +11,5 @@ This module contains articles about Java array fundamentals. They assume no prev
 - [Removing the First Element of an Array](https://www.baeldung.com/java-array-remove-first-element)
 - [Extending an Array’s Length](https://www.baeldung.com/java-array-add-element-at-the-end)
 - [Initializing a Boolean Array in Java](https://www.baeldung.com/java-initializing-boolean-array)
+- [Find the Index of an Element in a Java Array](https://www.baeldung.com/java-array-find-index)
+- [Comparing Two Byte Arrays in Java](https://www.baeldung.com/java-comparing-byte-arrays)
diff --git a/core-java-modules/core-java-arrays-operations-basic/src/main/java/com/baeldung/arrayindex/ArrayIndex.java b/core-java-modules/core-java-arrays-operations-basic/src/main/java/com/baeldung/arrayindex/ArrayIndex.java
new file mode 100644
index 0000000000..596e0d424f
--- /dev/null
+++ b/core-java-modules/core-java-arrays-operations-basic/src/main/java/com/baeldung/arrayindex/ArrayIndex.java
@@ -0,0 +1,28 @@
+package com.baeldung.arrayindex;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.IntStream;
+
+class ArrayIndex {
+    static int forLoop(int[] numbers, int target) {
+        for (int index = 0; index < numbers.length; index++) {
+            if (numbers[index] == target) {
+                return index;
+            }
+        }
+        return -1;
+    }
+
+    static int listIndexOf(Integer[] numbers, int target) {
+        List<Integer> list = Arrays.asList(numbers);
+        return list.indexOf(target);
+    }
+
+    static int intStream(int[] numbers, int target) {
+        return IntStream.range(0, numbers.length)
+          .filter(i -> numbers[i] == target)
+          .findFirst()
+          .orElse(-1);
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-arrays-operations-basic/src/test/java/com/baeldung/array/compare/CompareByteArraysUnitTest.java b/core-java-modules/core-java-arrays-operations-basic/src/test/java/com/baeldung/array/compare/CompareByteArraysUnitTest.java
new file mode 100644
index 0000000000..4274acf83d
--- /dev/null
+++ b/core-java-modules/core-java-arrays-operations-basic/src/test/java/com/baeldung/array/compare/CompareByteArraysUnitTest.java
@@ -0,0 +1,39 @@
+package com.baeldung.array.compare;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+public class CompareByteArraysUnitTest {
+    private final static String INPUT = "I am a magic string.";
+    private final static byte[] ARRAY1 = INPUT.getBytes();
+    private final static byte[] ARRAY2 = INPUT.getBytes();
+
+    @Test
+    void whenUsingEqualsSign_thenTwoArraysAreNotEqual() {
+        assertFalse(ARRAY1 == ARRAY2);
+    }
+
+    @Test
+    void whenUsingEquals_thenTwoArraysAreNotEqual() {
+        assertFalse(ARRAY1.equals(ARRAY2));
+    }
+
+    @Test
+    void whenUsingArrayEquals_thenTwoArraysAreEqual() {
+        assertTrue(Arrays.equals(ARRAY1, ARRAY2));
+    }
+
+    @Test
+    void whenComparingStringArrays_thenGetExpectedResult() {
+        String[] strArray1 = new String[] { "Java", "is", "great" };
+        String[] strArray2 = new String[] { "Java", "is", "great" };
+
+        assertFalse(strArray1 == strArray2);
+        assertFalse(strArray1.equals(strArray2));
+        assertTrue(Arrays.equals(strArray1, strArray2));
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-arrays-operations-basic/src/test/java/com/baeldung/arrayindex/ArrayIndexUnitTest.java b/core-java-modules/core-java-arrays-operations-basic/src/test/java/com/baeldung/arrayindex/ArrayIndexUnitTest.java
new file mode 100644
index 0000000000..84c868d5e0
--- /dev/null
+++ b/core-java-modules/core-java-arrays-operations-basic/src/test/java/com/baeldung/arrayindex/ArrayIndexUnitTest.java
@@ -0,0 +1,106 @@
+package com.baeldung.arrayindex;
+
+import static com.baeldung.arrayindex.ArrayIndex.forLoop;
+import static com.baeldung.arrayindex.ArrayIndex.intStream;
+import static com.baeldung.arrayindex.ArrayIndex.listIndexOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Arrays;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.junit.jupiter.api.Test;
+
+import com.google.common.primitives.Ints;
+
+class ArrayIndexUnitTest {
+
+    @Test
+    void givenIntegerArray_whenUseForLoop_thenWillGetElementIndex() {
+        int[] numbers = { 10, 20, 30, 40, 50 };
+        assertEquals(2, forLoop(numbers, 30));
+    }
+
+    @Test
+    void givenIntegerArray_whenUseForLoop_thenWillGetElementMinusOneIndex() {
+        int[] numbers = { 10, 20, 30, 40, 50 };
+        assertEquals(-1, forLoop(numbers, 100));
+    }
+
+    @Test
+    void givenIntegerArray_whenUseIndexOf_thenWillGetElementIndex() {
+        Integer[] numbers = { 10, 20, 30, 40, 50 };
+        assertEquals(2, listIndexOf(numbers, 30));
+    }
+
+    @Test
+    void givenIntegerArray_whenUseIndexOf_thenWillGetElementMinusOneIndex() {
+        Integer[] numbers = { 10, 20, 30, 40, 50 };
+        assertEquals(-1, listIndexOf(numbers, 100));
+    }
+
+    @Test
+    void givenIntegerArray_whenUseIntStream_thenWillGetElementIndex() {
+        int[] numbers = { 10, 20, 30, 40, 50 };
+        assertEquals(2, intStream(numbers, 30));
+    }
+
+    @Test
+    void givenIntegerArray_whenUseIntStream_thenWillGetElementMinusOneIndex() {
+        int[] numbers = { 10, 20, 30, 40, 50 };
+        assertEquals(-1, intStream(numbers, 100));
+    }
+
+    @Test
+    void givenIntegerArray_whenUseBinarySearch_thenWillGetElementIndex() {
+        int[] numbers = { 10, 20, 30, 40, 50 };
+        assertEquals(2, Arrays.binarySearch(numbers, 30));
+    }
+
+    @Test
+    void givenIntegerArray_whenUseBinarySearch_thenWillGetUpperBoundMinusIndex() {
+        int[] numbers = { 10, 20, 30, 40, 50 };
+        assertEquals(-6, Arrays.binarySearch(numbers, 100));
+    }
+
+    @Test
+    void givenIntegerArray_whenUseBinarySearch_thenWillGetInArrayMinusIndex() {
+        int[] numbers = { 10, 20, 30, 40, 50 };
+        assertEquals(-2, Arrays.binarySearch(numbers, 15));
+    }
+
+    @Test
+    void givenIntegerArray_whenUseBinarySearch_thenWillGetLowerBoundMinusIndex() {
+        int[] numbers = { 10, 20, 30, 40, 50 };
+        assertEquals(-1, Arrays.binarySearch(numbers, -15));
+    }
+
+    @Test
+    void givenIntegerArray_whenUseApacheCommons_thenWillGetElementIndex() {
+        int[] numbers = { 10, 20, 30, 40, 50 };
+        assertEquals(2, ArrayUtils.indexOf(numbers, 30));
+    }
+
+    @Test
+    void givenIntegerArray_whenUseApacheCommonsStartingFromIndex_thenWillGetNegativeIndex() {
+        int[] numbers = { 10, 20, 30, 40, 50 };
+        assertEquals(-1, ArrayUtils.indexOf(numbers, 30, 3));
+    }
+
+    @Test
+    void givenIntegerArray_whenUseApacheCommons_thenWillGetElementMinusOneIndex() {
+        int[] numbers = { 10, 20, 30, 40, 50 };
+        assertEquals(-1, ArrayUtils.indexOf(numbers, 100));
+    }
+
+    @Test
+    void givenIntegerArray_whenUseGuavaInts_thenWillGetElementIndex() {
+        int[] numbers = { 10, 20, 30, 40, 50 };
+        assertEquals(2, Ints.indexOf(numbers, 30));
+    }
+
+    @Test
+    void givenIntegerArray_whenUseGuavaInts_thenWillGetElementMinusOneIndex() {
+        int[] numbers = { 10, 20, 30, 40, 50 };
+        assertEquals(-1, Ints.indexOf(numbers, 100));
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-booleans/README.md b/core-java-modules/core-java-booleans/README.md
new file mode 100644
index 0000000000..fe7068c6f4
--- /dev/null
+++ b/core-java-modules/core-java-booleans/README.md
@@ -0,0 +1,6 @@
+## Core Java Booleans
+
+This module contains articles about Java Booleans.
+
+### Relevant Articles: 
+- [Convert Boolean to String in Java](https://www.baeldung.com/java-convert-boolean-to-string)
diff --git a/core-java-modules/core-java-booleans/pom.xml b/core-java-modules/core-java-booleans/pom.xml
new file mode 100644
index 0000000000..3b0c28208f
--- /dev/null
+++ b/core-java-modules/core-java-booleans/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>core-java-booleans</artifactId>
+    <name>core-java-booleans</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-booleans/src/test/java/com/baeldung/booleans/BooleanToStringUnitTest.java b/core-java-modules/core-java-booleans/src/test/java/com/baeldung/booleans/BooleanToStringUnitTest.java
new file mode 100644
index 0000000000..e20cc3508f
--- /dev/null
+++ b/core-java-modules/core-java-booleans/src/test/java/com/baeldung/booleans/BooleanToStringUnitTest.java
@@ -0,0 +1,48 @@
+package com.baeldung.booleans;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class BooleanToStringUnitTest {
+    String optionToString(String optionName, boolean optionValue) {
+        return String.format("The option '%s' is %s.", optionName, optionValue ? "Enabled" : "Disabled");
+    }
+
+    @Test
+    void givenPrimitiveBoolean_whenConvertingUsingTernaryOperator_thenSuccess() {
+        boolean primitiveBoolean = true;
+        assertEquals("true", primitiveBoolean ? "true" : "false");
+
+        primitiveBoolean = false;
+        assertEquals("false", primitiveBoolean ? "true" : "false");
+
+        assertEquals("The option 'IgnoreWarnings' is Enabled.", optionToString("IgnoreWarnings", true));
+    }
+
+
+    @Test
+    void givenBooleanObject_whenConvertingUsingBooleanToString_thenSuccess() {
+        Boolean myBoolean = Boolean.TRUE;
+        assertEquals("true", myBoolean.toString());
+
+        myBoolean = Boolean.FALSE;
+        assertEquals("false", myBoolean.toString());
+
+        Boolean nullBoolean = null;
+        assertThrows(NullPointerException.class, () -> nullBoolean.toString());
+    }
+
+    @Test
+    void givenBooleanObject_whenConvertingUsingStringValueOf_thenSuccess() {
+        Boolean myBoolean = Boolean.TRUE;
+        assertEquals("true", String.valueOf(myBoolean));
+
+        myBoolean = Boolean.FALSE;
+        assertEquals("false", String.valueOf(myBoolean));
+
+        Boolean nullBoolean = null;
+        assertEquals("null", String.valueOf(nullBoolean));
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-char/README.md b/core-java-modules/core-java-char/README.md
index 5f33aa6914..e4af3121c5 100644
--- a/core-java-modules/core-java-char/README.md
+++ b/core-java-modules/core-java-char/README.md
@@ -4,3 +4,4 @@ This module contains articles about Java Character Class
 
 ### Relevant Articles: 
 - [Character#isAlphabetic vs. Character#isLetter](https://www.baeldung.com/java-character-isletter-isalphabetic)
+- [Difference Between Java’s “char” and “String”](https://www.baeldung.com/java-char-vs-string)
diff --git a/core-java-modules/core-java-char/pom.xml b/core-java-modules/core-java-char/pom.xml
index 7dc0923fb5..eb6cbee952 100644
--- a/core-java-modules/core-java-char/pom.xml
+++ b/core-java-modules/core-java-char/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-char</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-char</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-char/src/test/java/com/baeldung/charandstring/DifferenceBetweenCharAndStringUnitTest.java b/core-java-modules/core-java-char/src/test/java/com/baeldung/charandstring/DifferenceBetweenCharAndStringUnitTest.java
new file mode 100644
index 0000000000..b4e1da6d71
--- /dev/null
+++ b/core-java-modules/core-java-char/src/test/java/com/baeldung/charandstring/DifferenceBetweenCharAndStringUnitTest.java
@@ -0,0 +1,56 @@
+package com.baeldung.charandstring;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+
+import org.junit.jupiter.api.Test;
+
+public class DifferenceBetweenCharAndStringUnitTest {
+
+    @Test
+    void whenPlusTwoChars_thenGetSumAsInteger() {
+        char h = 'H'; // the value is 72
+        char i = 'i'; // the value is 105
+        assertEquals(177, h + i);
+        assertInstanceOf(Integer.class, h + i);
+    }
+
+    @Test
+    void whenPlusTwoStrings_thenConcatenateThem() {
+        String i = "i";
+        String h = "H";
+        assertEquals("Hi", h + i);
+    }
+
+    @Test
+    void whenPlusCharsAndStrings_thenGetExpectedValues() {
+        char c = 'C';
+        assertEquals("C", "" + c);
+
+        char h = 'H'; // the value is 72
+        char i = 'i'; // the value is 105
+        assertEquals("Hi", "" + h + i);
+        assertEquals("Hi", h + "" + i);
+        assertEquals("177", h + i + "");
+    }
+
+    @Test
+    void whenStringChars_thenGetCharArray() {
+        char h = 'h';
+        char e = 'e';
+        char l = 'l';
+        char o = 'o';
+
+        String hello = "hello";
+        assertEquals(h, hello.charAt(0));
+        assertEquals(e, hello.charAt(1));
+        assertEquals(l, hello.charAt(2));
+        assertEquals(l, hello.charAt(3));
+        assertEquals(o, hello.charAt(4));
+
+        char[] chars = new char[] { h, e, l, l, o };
+        char[] charsFromString = hello.toCharArray();
+        assertArrayEquals(chars, charsFromString);
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-2/README.md b/core-java-modules/core-java-collections-2/README.md
index 644cc93be7..5a9bae8f9f 100644
--- a/core-java-modules/core-java-collections-2/README.md
+++ b/core-java-modules/core-java-collections-2/README.md
@@ -13,4 +13,4 @@
 - [Getting the Size of an Iterable in Java](https://www.baeldung.com/java-iterable-size)
 - [Java Null-Safe Streams from Collections](https://www.baeldung.com/java-null-safe-streams-from-collections)
 - [Differences Between Iterator and Iterable and How to Use Them?](https://www.baeldung.com/java-iterator-vs-iterable)
-- More articles: [[<-- prev]](/core-java-modules/core-java-collections-1) [[next -->]](/core-java-modules/core-java-collections-3)
\ No newline at end of file
+- More articles: [[<-- prev]](/core-java-modules/core-java-collections) [[next -->]](/core-java-modules/core-java-collections-3)
diff --git a/core-java-modules/core-java-collections-3/pom.xml b/core-java-modules/core-java-collections-3/pom.xml
index 6ef8e3c81a..373dc9db14 100644
--- a/core-java-modules/core-java-collections-3/pom.xml
+++ b/core-java-modules/core-java-collections-3/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-collections-3</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-collections-3</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-collections-4/pom.xml b/core-java-modules/core-java-collections-4/pom.xml
index e88d5a6740..1a59411ecb 100644
--- a/core-java-modules/core-java-collections-4/pom.xml
+++ b/core-java-modules/core-java-collections-4/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-collections-4</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-collections-4</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-collections-5/README.md b/core-java-modules/core-java-collections-5/README.md
index cf479ec507..0d9b12b842 100644
--- a/core-java-modules/core-java-collections-5/README.md
+++ b/core-java-modules/core-java-collections-5/README.md
@@ -3,5 +3,5 @@
 ## Core Java Collections Cookbooks and Examples
 
 ### Relevant Articles:
-
-- More articles: [[<-- prev]](/core-java-modules/core-java-collections-4)
\ No newline at end of file
+- [Introduction to Roaring Bitmap](https://www.baeldung.com/java-roaring-bitmap-intro)
+- More articles: [[<-- prev]](/core-java-modules/core-java-collections-4)
diff --git a/core-java-modules/core-java-collections-5/pom.xml b/core-java-modules/core-java-collections-5/pom.xml
index 67c9f7120c..6baecc2802 100644
--- a/core-java-modules/core-java-collections-5/pom.xml
+++ b/core-java-modules/core-java-collections-5/pom.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         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">
+    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>core-java-collections-5</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>core-java-collections-5</name>
     <packaging>jar</packaging>
 
@@ -55,4 +54,5 @@
         <roaringbitmap.version>0.9.38</roaringbitmap.version>
         <jmh.version>1.36</jmh.version>
     </properties>
+    
 </project>
diff --git a/core-java-modules/core-java-collections-array-list/pom.xml b/core-java-modules/core-java-collections-array-list/pom.xml
index e3a115854c..ee0b102bb0 100644
--- a/core-java-modules/core-java-collections-array-list/pom.xml
+++ b/core-java-modules/core-java-collections-array-list/pom.xml
@@ -4,34 +4,6 @@
     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>core-java-collections-array-list</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${maven-compiler-plugin.source}</source>
-                    <target>${maven-compiler-plugin.target}</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.plugin.version}</version>
-                <configuration>
-                    <argLine>
-                        --add-opens java.base/java.util=ALL-UNNAMED
-                    </argLine>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <properties>
-        <maven-compiler-plugin.source>16</maven-compiler-plugin.source>
-        <maven-compiler-plugin.target>16</maven-compiler-plugin.target>
-        <surefire.plugin.version>3.0.0-M3</surefire.plugin.version>
-    </properties>
     <name>core-java-collections-array-list</name>
     <packaging>jar</packaging>
 
@@ -55,4 +27,33 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${maven-compiler-plugin.source}</source>
+                    <target>${maven-compiler-plugin.target}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire.plugin.version}</version>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <maven-compiler-plugin.source>16</maven-compiler-plugin.source>
+        <maven-compiler-plugin.target>16</maven-compiler-plugin.target>
+        <surefire.plugin.version>3.0.0-M3</surefire.plugin.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-conversions-2/README.md b/core-java-modules/core-java-collections-conversions-2/README.md
index 742b52aad5..904e876032 100644
--- a/core-java-modules/core-java-collections-conversions-2/README.md
+++ b/core-java-modules/core-java-collections-conversions-2/README.md
@@ -10,4 +10,5 @@ This module contains articles about conversions among Collection types and array
 - [Arrays.asList vs new ArrayList(Arrays.asList())](https://www.baeldung.com/java-arrays-aslist-vs-new-arraylist)
 - [Iterate Over a Set in Java](https://www.baeldung.com/java-iterate-set)
 - [Convert a List of Integers to a List of Strings](https://www.baeldung.com/java-convert-list-integers-to-list-strings)
+- [Combining Two Lists Into a Map in Java](https://www.baeldung.com/java-combine-two-lists-into-map)
 - More articles: [[<-- prev]](../core-java-collections-conversions)
diff --git a/core-java-modules/core-java-collections-conversions-2/pom.xml b/core-java-modules/core-java-collections-conversions-2/pom.xml
index f6775a7a42..8cd0a6932b 100644
--- a/core-java-modules/core-java-collections-conversions-2/pom.xml
+++ b/core-java-modules/core-java-collections-conversions-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-collections-conversions-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-collections-conversions-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UserList.java b/core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UserList.java
index 7b6bed807b..5907c159cb 100644
--- a/core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UserList.java
+++ b/core-java-modules/core-java-collections-conversions-2/src/main/java/com/baeldung/modelmapper/UserList.java
@@ -9,6 +9,7 @@ import java.util.Collection;
  */
 public class UserList {
 
+    public UserList() {}
     private Collection<User> users;
 
     public Collection<User> getUsers() {
diff --git a/core-java-modules/core-java-collections-conversions/pom.xml b/core-java-modules/core-java-collections-conversions/pom.xml
index 08a452da51..78e9847c0a 100644
--- a/core-java-modules/core-java-collections-conversions/pom.xml
+++ b/core-java-modules/core-java-collections-conversions/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-collections-conversions</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-collections-conversions</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-collections-list-2/pom.xml b/core-java-modules/core-java-collections-list-2/pom.xml
index 59ab8c5f27..a305cdffc8 100644
--- a/core-java-modules/core-java-collections-list-2/pom.xml
+++ b/core-java-modules/core-java-collections-list-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-collections-list-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-collections-list-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-collections-list-3/pom.xml b/core-java-modules/core-java-collections-list-3/pom.xml
index 912204bcc6..f01fe1f3b9 100644
--- a/core-java-modules/core-java-collections-list-3/pom.xml
+++ b/core-java-modules/core-java-collections-list-3/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-collections-list-3</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-collections-list-3</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-collections-list-4/pom.xml b/core-java-modules/core-java-collections-list-4/pom.xml
index 964ea4f5a1..6d068298ec 100644
--- a/core-java-modules/core-java-collections-list-4/pom.xml
+++ b/core-java-modules/core-java-collections-list-4/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-collections-list-4</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-collections-list-4</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-collections-list-5/README.md b/core-java-modules/core-java-collections-list-5/README.md
index 78959e7d5d..4929ca4e4e 100644
--- a/core-java-modules/core-java-collections-list-5/README.md
+++ b/core-java-modules/core-java-collections-list-5/README.md
@@ -4,3 +4,5 @@ This module contains articles about the Java List collection
 
 ### Relevant Articles:
 - [Java List Interface](https://www.baeldung.com/java-list-interface)
+- [Finding All Duplicates in a List in Java](https://www.baeldung.com/java-list-find-duplicates)
+- [Moving Items Around in an Arraylist](https://www.baeldung.com/java-arraylist-move-items)
diff --git a/core-java-modules/core-java-collections-list-5/pom.xml b/core-java-modules/core-java-collections-list-5/pom.xml
index 0807f7612c..b51dda4091 100644
--- a/core-java-modules/core-java-collections-list-5/pom.xml
+++ b/core-java-modules/core-java-collections-list-5/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-collections-list-5</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-collections-list-5</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-collections-list-5/src/main/java/com/baeldung/listduplicate/ListDuplicate.java b/core-java-modules/core-java-collections-list-5/src/main/java/com/baeldung/listduplicate/ListDuplicate.java
new file mode 100644
index 0000000000..5e3e845916
--- /dev/null
+++ b/core-java-modules/core-java-collections-list-5/src/main/java/com/baeldung/listduplicate/ListDuplicate.java
@@ -0,0 +1,69 @@
+package com.baeldung.listduplicate;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public class ListDuplicate {
+    public List<Integer> listDuplicateUsingSet(List<Integer> list) {
+        List<Integer> duplicates = new ArrayList<>();
+        Set<Integer> set = new HashSet<>();
+        for (Integer i : list) {
+            if (set.contains(i)) {
+                duplicates.add(i);
+            } else {
+                set.add(i);
+            }
+        }
+        return duplicates;
+    }
+
+    public List<Integer> listDuplicateUsingMap(List<Integer> list) {
+        List<Integer> duplicates = new ArrayList<>();
+        Map<Integer, Integer> frequencyMap = new HashMap<>();
+        for (Integer number : list) {
+            frequencyMap.put(number, frequencyMap.getOrDefault(number, 0) + 1);
+        }
+        for (int number : frequencyMap.keySet()) {
+            if (frequencyMap.get(number) != 1) {
+                duplicates.add(number);
+            }
+        }
+        return duplicates;
+    }
+
+    public List<Integer> listDuplicateUsingFilterAndSetAdd(List<Integer> list) {
+        Set<Integer> elements = new HashSet<Integer>();
+        return list.stream()
+          .filter(n -> !elements.add(n))
+          .collect(Collectors.toList());
+    }
+
+    public List<Integer> listDuplicateUsingCollectionsFrequency(List<Integer> list) {
+        List<Integer> duplicates = new ArrayList<>();
+        Set<Integer> set = list.stream()
+          .filter(i -> Collections.frequency(list, i) > 1)
+          .collect(Collectors.toSet());
+        duplicates.addAll(set);
+        return duplicates;
+    }
+
+    public List<Integer> listDuplicateUsingMapAndCollectorsGroupingBy(List<Integer> list) {
+        List<Integer> duplicates = new ArrayList<>();
+        Set<Integer> set = list.stream()
+          .collect(Collectors.groupingBy(Function.identity(), Collectors.counting()))
+          .entrySet()
+          .stream()
+          .filter(m -> m.getValue() > 1)
+          .map(Map.Entry::getKey)
+          .collect(Collectors.toSet());
+        duplicates.addAll(set);
+        return duplicates;
+    }
+}
diff --git a/core-java-modules/core-java-collections-list-5/src/test/java/com/baeldung/java/list/MovingItemsInArrayListUnitTest.java b/core-java-modules/core-java-collections-list-5/src/test/java/com/baeldung/java/list/MovingItemsInArrayListUnitTest.java
new file mode 100644
index 0000000000..121d240a85
--- /dev/null
+++ b/core-java-modules/core-java-collections-list-5/src/test/java/com/baeldung/java/list/MovingItemsInArrayListUnitTest.java
@@ -0,0 +1,53 @@
+package com.baeldung.java.list;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.junit.Test;
+
+public class MovingItemsInArrayListUnitTest {
+
+    @Test
+    public void givenAList_whenManuallyReordering_thenOneItemMovesPosition() {
+        ArrayList<String> arrayList = new ArrayList<>(Arrays.asList("one", "two", "three", "four", "five"));
+
+        String removed = arrayList.remove(3);
+        arrayList.add(2, removed);
+
+        ArrayList<String> expectedResult = new ArrayList<>(Arrays.asList("one", "two", "four", "three", "five"));
+        assertEquals(expectedResult, arrayList);
+    }
+
+    @Test
+    public void givenAList_whenUsingSwap_thenItemsSwapPositions() {
+        ArrayList<String> arrayList = new ArrayList<>(Arrays.asList("one", "two", "three", "four", "five"));
+
+        Collections.swap(arrayList, 1, 3);
+
+        ArrayList<String> expectedResult = new ArrayList<>(Arrays.asList("one", "four", "three", "two", "five"));
+        assertEquals(expectedResult, arrayList);
+    }
+
+    @Test
+    public void givenAList_whenUsingRotateWithPositiveDistance_thenItemsMoveToTheRight() {
+        ArrayList<String> arrayList = new ArrayList<>(Arrays.asList("one", "two", "three", "four", "five"));
+
+        Collections.rotate(arrayList, 2);
+
+        ArrayList<String> expectedResult = new ArrayList<>(Arrays.asList("four", "five", "one", "two", "three"));
+        assertEquals(expectedResult, arrayList);
+    }
+
+    @Test
+    public void givenAList_whenUsingRotateWithNegativeDistance_thenItemsMoveToTheLeft() {
+        ArrayList<String> arrayList = new ArrayList<>(Arrays.asList("one", "two", "three", "four", "five"));
+
+        Collections.rotate(arrayList, -2);
+
+        ArrayList<String> expectedResult = new ArrayList<>(Arrays.asList("three", "four", "five", "one", "two"));
+        assertEquals(expectedResult, arrayList);
+    }
+}
diff --git a/core-java-modules/core-java-collections-list-5/src/test/java/com/baeldung/listduplicate/ListDuplicateUnitTest.java b/core-java-modules/core-java-collections-list-5/src/test/java/com/baeldung/listduplicate/ListDuplicateUnitTest.java
new file mode 100644
index 0000000000..0d81387aea
--- /dev/null
+++ b/core-java-modules/core-java-collections-list-5/src/test/java/com/baeldung/listduplicate/ListDuplicateUnitTest.java
@@ -0,0 +1,68 @@
+package com.baeldung.listduplicate;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class ListDuplicateUnitTest {
+    private static ListDuplicate listDuplicate;
+
+    @BeforeClass
+    public static void setup() {
+        listDuplicate = new ListDuplicate();
+    }
+
+    @Test
+    public void givenList_whenUsingSet_thenReturnDuplicateElements() {
+        List<Integer> list = Arrays.asList(1, 2, 3, 3, 4, 4, 5);
+        List<Integer> duplicates = listDuplicate.listDuplicateUsingSet(list);
+        Assert.assertEquals(duplicates.size(), 2);
+        Assert.assertEquals(duplicates.contains(3), true);
+        Assert.assertEquals(duplicates.contains(4), true);
+        Assert.assertEquals(duplicates.contains(1), false);
+    }
+
+    @Test
+    public void givenList_whenUsingFrequencyMap_thenReturnDuplicateElements() {
+        List<Integer> list = Arrays.asList(1, 2, 3, 3, 4, 4, 5);
+        List<Integer> duplicates = listDuplicate.listDuplicateUsingMap(list);
+        Assert.assertEquals(duplicates.size(), 2);
+        Assert.assertEquals(duplicates.contains(3), true);
+        Assert.assertEquals(duplicates.contains(4), true);
+        Assert.assertEquals(duplicates.contains(1), false);
+    }
+
+    @Test
+    public void givenList_whenUsingFilterAndSetAdd_thenReturnDuplicateElements() {
+        List<Integer> list = Arrays.asList(1, 2, 3, 3, 4, 4, 5);
+        List<Integer> duplicates = listDuplicate.listDuplicateUsingFilterAndSetAdd(list);
+        Assert.assertEquals(duplicates.size(), 2);
+        Assert.assertEquals(duplicates.contains(3), true);
+        Assert.assertEquals(duplicates.contains(4), true);
+        Assert.assertEquals(duplicates.contains(1), false);
+    }
+
+    @Test
+    public void givenList_whenUsingCollectionsFrequency_thenReturnDuplicateElements() {
+        List<Integer> list = Arrays.asList(1, 2, 3, 3, 4, 4, 5);
+        List<Integer> duplicates = listDuplicate.listDuplicateUsingCollectionsFrequency(list);
+        Assert.assertEquals(duplicates.size(), 2);
+        Assert.assertEquals(duplicates.contains(3), true);
+        Assert.assertEquals(duplicates.contains(4), true);
+        Assert.assertEquals(duplicates.contains(1), false);
+    }
+
+    @Test
+    public void givenList_whenUsingMapAndCollectorsGroupingBy_thenReturnDuplicateElements() {
+        List<Integer> list = Arrays.asList(1, 2, 3, 3, 4, 4, 5);
+        List<Integer> duplicates = listDuplicate.listDuplicateUsingCollectionsFrequency(list);
+        Assert.assertEquals(duplicates.size(), 2);
+        Assert.assertEquals(duplicates.contains(3), true);
+        Assert.assertEquals(duplicates.contains(4), true);
+        Assert.assertEquals(duplicates.contains(1), false);
+    }
+
+}
diff --git a/core-java-modules/core-java-collections-list/pom.xml b/core-java-modules/core-java-collections-list/pom.xml
index 0cc8828a0d..94abb334e0 100644
--- a/core-java-modules/core-java-collections-list/pom.xml
+++ b/core-java-modules/core-java-collections-list/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-collections-list</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-collections-list</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/java8/Java8MaxMinUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/java8/Java8MaxMinUnitTest.java
index c2cc39c685..e634fddab8 100644
--- a/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/java8/Java8MaxMinUnitTest.java
+++ b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/java8/Java8MaxMinUnitTest.java
@@ -6,6 +6,7 @@ import com.baeldung.java_8_features.Person;
 import org.junit.Test;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -71,4 +72,17 @@ public class Java8MaxMinUnitTest {
 
         assertEquals(bugatti, maxBySpeed);
     }
+
+    @Test
+    public void givenIntegerList_whenGetMinAndIndex_thenSuccess() {
+        final List<Integer> listOfIntegers = Arrays.asList(11, 13, 9, 20, 7, 3, 30);
+        final Integer expectedMinValue = 3;
+        final Integer expectedMinIndex = 5;
+
+        Integer minValue = Collections.min(listOfIntegers);
+        Integer minIndex = listOfIntegers.indexOf(minValue);
+
+        assertEquals(minValue, expectedMinValue);
+        assertEquals(minIndex, expectedMinIndex);
+    }
 }
diff --git a/core-java-modules/core-java-collections-maps-2/pom.xml b/core-java-modules/core-java-collections-maps-2/pom.xml
index 1e526ef892..15ca688ad2 100644
--- a/core-java-modules/core-java-collections-maps-2/pom.xml
+++ b/core-java-modules/core-java-collections-maps-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-collections-maps-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-collections-maps-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-collections-maps-3/pom.xml b/core-java-modules/core-java-collections-maps-3/pom.xml
index a5bb6dc338..98a0d18fe9 100644
--- a/core-java-modules/core-java-collections-maps-3/pom.xml
+++ b/core-java-modules/core-java-collections-maps-3/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-collections-maps-3</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-collections-maps-3</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-collections-maps-4/pom.xml b/core-java-modules/core-java-collections-maps-4/pom.xml
index a85e2cde2a..f1734b7379 100644
--- a/core-java-modules/core-java-collections-maps-4/pom.xml
+++ b/core-java-modules/core-java-collections-maps-4/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-collections-maps-4</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-collections-maps-4</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-collections-maps-5/pom.xml b/core-java-modules/core-java-collections-maps-5/pom.xml
index f12e044b23..593ec5a8f6 100644
--- a/core-java-modules/core-java-collections-maps-5/pom.xml
+++ b/core-java-modules/core-java-collections-maps-5/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-collections-maps-5</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-collections-maps-5</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-collections-maps-6/README.md b/core-java-modules/core-java-collections-maps-6/README.md
new file mode 100644
index 0000000000..fc12a1bb25
--- /dev/null
+++ b/core-java-modules/core-java-collections-maps-6/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Copying All Keys and Values From One Hashmap Onto Another Without Replacing Existing Keys and Values](https://www.baeldung.com/java-copy-hashmap-no-changes)
diff --git a/core-java-modules/core-java-collections-maps-6/pom.xml b/core-java-modules/core-java-collections-maps-6/pom.xml
index 9910d08691..70a04c352b 100644
--- a/core-java-modules/core-java-collections-maps-6/pom.xml
+++ b/core-java-modules/core-java-collections-maps-6/pom.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         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">
+    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>core-java-collections-maps-6</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-collections-maps-6</name>
     <packaging>jar</packaging>
+
     <parent>
         <artifactId>core-java-modules</artifactId>
         <groupId>com.baeldung.core-java-modules</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <properties>
         <spring.version>5.2.5.RELEASE</spring.version>
diff --git a/core-java-modules/core-java-collections-maps/pom.xml b/core-java-modules/core-java-collections-maps/pom.xml
index 3a1bf0d8a1..5e19117e08 100644
--- a/core-java-modules/core-java-collections-maps/pom.xml
+++ b/core-java-modules/core-java-collections-maps/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-collections-maps</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-collections-maps</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-collections-maps/src/test/java/com/baeldung/map/ImmutableMapUnitTest.java b/core-java-modules/core-java-collections-maps/src/test/java/com/baeldung/map/ImmutableMapUnitTest.java
index d308aac7eb..4ac562ef04 100644
--- a/core-java-modules/core-java-collections-maps/src/test/java/com/baeldung/map/ImmutableMapUnitTest.java
+++ b/core-java-modules/core-java-collections-maps/src/test/java/com/baeldung/map/ImmutableMapUnitTest.java
@@ -1,84 +1,126 @@
 package com.baeldung.map;
 
-import com.google.common.collect.ImmutableMap;
-import org.junit.jupiter.api.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.util.AbstractMap;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.jupiter.api.Assertions.*;
+import org.hamcrest.collection.IsMapContaining;
+import org.junit.jupiter.api.Test;
 
+import com.google.common.collect.ImmutableMap;
 
-public class ImmutableMapUnitTest {
+class ImmutableMapUnitTest {
 
-	@Test
-	public void whenCollectionsUnModifiableMapMethod_thenOriginalCollectionChangesReflectInUnmodifiableMap() {
+    @Test
+    void whenCollectionsUnModifiableMapMethod_thenOriginalCollectionChangesReflectInUnmodifiableMap() {
 
-		Map<String, String> mutableMap = new HashMap<>();
-		mutableMap.put("USA", "North America");
+        Map<String, String> mutableMap = new HashMap<>();
+        mutableMap.put("USA", "North America");
 
-		Map<String, String> unmodifiableMap = Collections.unmodifiableMap(mutableMap);
-		assertThrows(UnsupportedOperationException.class, () -> unmodifiableMap.put("Canada", "North America"));
-		
-		mutableMap.remove("USA");
-		assertFalse(unmodifiableMap.containsKey("USA"));
-		
-		mutableMap.put("Mexico", "North America");
-		assertTrue(unmodifiableMap.containsKey("Mexico"));
-	}
-	
-	@Test
-	@SuppressWarnings("deprecation")
-	public void whenGuavaImmutableMapFromCopyOfMethod_thenOriginalCollectionChangesDoNotReflectInImmutableMap() {
+        Map<String, String> unmodifiableMap = Collections.unmodifiableMap(mutableMap);
+        assertThrows(UnsupportedOperationException.class, () -> unmodifiableMap.put("Canada", "North America"));
 
-		Map<String, String> mutableMap = new HashMap<>();
-		mutableMap.put("USA", "North America");
+        mutableMap.remove("USA");
+        assertFalse(unmodifiableMap.containsKey("USA"));
 
-		ImmutableMap<String, String> immutableMap = ImmutableMap.copyOf(mutableMap);
-		assertTrue(immutableMap.containsKey("USA"));
-		
-		assertThrows(UnsupportedOperationException.class, () -> immutableMap.put("Canada", "North America"));
-		
-		mutableMap.remove("USA");
-		assertTrue(immutableMap.containsKey("USA"));
-		
-		mutableMap.put("Mexico", "North America");
-		assertFalse(immutableMap.containsKey("Mexico"));
-	}
-	
-	@Test
-	@SuppressWarnings("deprecation")
-	public void whenGuavaImmutableMapFromBuilderMethod_thenOriginalCollectionChangesDoNotReflectInImmutableMap() {
+        mutableMap.put("Mexico", "North America");
+        assertTrue(unmodifiableMap.containsKey("Mexico"));
+    }
 
-		Map<String, String> mutableMap = new HashMap<>();
-		mutableMap.put("USA", "North America");
+    @Test
+    @SuppressWarnings("deprecation")
+    void whenGuavaImmutableMapFromCopyOfMethod_thenOriginalCollectionChangesDoNotReflectInImmutableMap() {
 
-		ImmutableMap<String, String> immutableMap = ImmutableMap.<String, String>builder()
-				.putAll(mutableMap)
-				.put("Costa Rica", "North America")
-				.build();
-		assertTrue(immutableMap.containsKey("USA"));
-		assertTrue(immutableMap.containsKey("Costa Rica"));
-		
-		assertThrows(UnsupportedOperationException.class, () -> immutableMap.put("Canada", "North America"));
-		
-		mutableMap.remove("USA");
-		assertTrue(immutableMap.containsKey("USA"));
-		
-		mutableMap.put("Mexico", "North America");
-		assertFalse(immutableMap.containsKey("Mexico"));
-	}
-	
-	@Test
-	@SuppressWarnings("deprecation")
-	public void whenGuavaImmutableMapFromOfMethod_thenOriginalCollectionChangesDoNotReflectInImmutableMap() {
+        Map<String, String> mutableMap = new HashMap<>();
+        mutableMap.put("USA", "North America");
 
-		ImmutableMap<String, String> immutableMap = ImmutableMap.of("USA", "North America", "Costa Rica", "North America");
-		assertTrue(immutableMap.containsKey("USA"));
-		assertTrue(immutableMap.containsKey("Costa Rica"));
+        ImmutableMap<String, String> immutableMap = ImmutableMap.copyOf(mutableMap);
+        assertTrue(immutableMap.containsKey("USA"));
+
+        assertThrows(UnsupportedOperationException.class, () -> immutableMap.put("Canada", "North America"));
+
+        mutableMap.remove("USA");
+        assertTrue(immutableMap.containsKey("USA"));
+
+        mutableMap.put("Mexico", "North America");
+        assertFalse(immutableMap.containsKey("Mexico"));
+    }
+
+    @Test
+    @SuppressWarnings("deprecation")
+    void whenGuavaImmutableMapFromBuilderMethod_thenOriginalCollectionChangesDoNotReflectInImmutableMap() {
+
+        Map<String, String> mutableMap = new HashMap<>();
+        mutableMap.put("USA", "North America");
+
+        ImmutableMap<String, String> immutableMap = ImmutableMap.<String, String>builder()
+            .putAll(mutableMap)
+            .put("Costa Rica", "North America")
+            .build();
+        assertTrue(immutableMap.containsKey("USA"));
+        assertTrue(immutableMap.containsKey("Costa Rica"));
+
+        assertThrows(UnsupportedOperationException.class, () -> immutableMap.put("Canada", "North America"));
+
+        mutableMap.remove("USA");
+        assertTrue(immutableMap.containsKey("USA"));
+
+        mutableMap.put("Mexico", "North America");
+        assertFalse(immutableMap.containsKey("Mexico"));
+    }
+
+    @Test
+    @SuppressWarnings("deprecation")
+    void whenGuavaImmutableMapFromOfMethod_thenOriginalCollectionChangesDoNotReflectInImmutableMap() {
+
+        ImmutableMap<String, String> immutableMap = ImmutableMap.of("USA", "North America", "Costa Rica", "North America");
+        assertTrue(immutableMap.containsKey("USA"));
+        assertTrue(immutableMap.containsKey("Costa Rica"));
+
+        assertThrows(UnsupportedOperationException.class, () -> immutableMap.put("Canada", "North America"));
+    }
+
+    @Test
+    @SuppressWarnings("deprecation")
+    void givenGuavaImmutableMapFromOfEntriesMethodwhenModifyEntry_thenThrowUnsupportedOperationException() {
+
+        ImmutableMap<Integer, String> immutableMap = ImmutableMap.ofEntries(new AbstractMap.SimpleEntry<>(1, "USA"), new AbstractMap.SimpleEntry<>(2, "Canada"));
+
+        assertThrows(UnsupportedOperationException.class, () -> immutableMap.put(2, "Mexico"));
+    }
+
+    @Test
+    void givenEntrieswhenCreatingGuavaImmutableMapFromOfEntriesMethod_thenCorrect() {
+
+        ImmutableMap<Integer, String> immutableMap = ImmutableMap.ofEntries(new AbstractMap.SimpleEntry<>(1, "USA"));
+
+        assertEquals(1, immutableMap.size());
+        assertThat(immutableMap, IsMapContaining.hasEntry(1, "USA"));
+    }
+
+    @Test
+    void givenGuavaImmutableMapFromOfEntriesMethodwhenEntryKeyExists_thenThrowIllegalArgumentException() {
+
+        assertThrows(IllegalArgumentException.class, () -> ImmutableMap.ofEntries(new AbstractMap.SimpleEntry<>(1, "USA"), new AbstractMap.SimpleEntry<>(1, "Canada")));
+    }
+
+    @Test
+    void givenGuavaImmutableMapFromOfEntriesMethodwhenEntryKeyIsNull_thenThrowNullPointerException() {
+
+        assertThrows(NullPointerException.class, () -> ImmutableMap.ofEntries(new AbstractMap.SimpleEntry<>(null, "USA")));
+    }
+
+    @Test
+    void givenGuavaImmutableMapFromOfEntriesMethodwhenEntryValueIsNull_thenThrowNullPointerException() {
+
+        assertThrows(NullPointerException.class, () -> ImmutableMap.ofEntries(new AbstractMap.SimpleEntry<>(1, null)));
+    }
 
-		assertThrows(UnsupportedOperationException.class, () -> immutableMap.put("Canada", "North America"));
-	}
-	
 }
diff --git a/core-java-modules/core-java-collections-set-2/pom.xml b/core-java-modules/core-java-collections-set-2/pom.xml
index b1aadb0c22..680c01d8ca 100644
--- a/core-java-modules/core-java-collections-set-2/pom.xml
+++ b/core-java-modules/core-java-collections-set-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-collections-set-2</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>core-java-collections-set-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-collections-set/pom.xml b/core-java-modules/core-java-collections-set/pom.xml
index 0b6e324c78..e130837f1c 100644
--- a/core-java-modules/core-java-collections-set/pom.xml
+++ b/core-java-modules/core-java-collections-set/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-collections-set</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-collections-set</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-collections/pom.xml b/core-java-modules/core-java-collections/pom.xml
index eab7a35584..be91492d06 100644
--- a/core-java-modules/core-java-collections/pom.xml
+++ b/core-java-modules/core-java-collections/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-collections</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-collections</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-compiler/README.md b/core-java-modules/core-java-compiler/README.md
new file mode 100644
index 0000000000..2a1e609194
--- /dev/null
+++ b/core-java-modules/core-java-compiler/README.md
@@ -0,0 +1,6 @@
+## Core Java Compiler
+
+### Relevant Articles: 
+
+- [Compiling Java *.class Files with javac](http://www.baeldung.com/javac)
+- [Illegal Character Compilation Error](https://www.baeldung.com/java-illegal-character-error)
diff --git a/core-java-modules/core-java-compiler/pom.xml b/core-java-modules/core-java-compiler/pom.xml
new file mode 100644
index 0000000000..8f2be3f142
--- /dev/null
+++ b/core-java-modules/core-java-compiler/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>core-java-compiler</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-compiler</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.gdata</groupId>
+            <artifactId>core</artifactId>
+            <version>${gdata.version}</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <gdata.version>1.47.1</gdata.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/javac/Data.java b/core-java-modules/core-java-compiler/src/main/java/com/baeldung/javac/Data.java
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/javac/Data.java
rename to core-java-modules/core-java-compiler/src/main/java/com/baeldung/javac/Data.java
diff --git a/core-java-modules/core-java/src/main/java/javac-args/arguments b/core-java-modules/core-java-compiler/src/main/java/javac-args/arguments
similarity index 100%
rename from core-java-modules/core-java/src/main/java/javac-args/arguments
rename to core-java-modules/core-java-compiler/src/main/java/javac-args/arguments
diff --git a/core-java-modules/core-java/src/main/java/javac-args/options b/core-java-modules/core-java-compiler/src/main/java/javac-args/options
similarity index 100%
rename from core-java-modules/core-java/src/main/java/javac-args/options
rename to core-java-modules/core-java-compiler/src/main/java/javac-args/options
diff --git a/core-java-modules/core-java/src/main/java/javac-args/types b/core-java-modules/core-java-compiler/src/main/java/javac-args/types
similarity index 100%
rename from core-java-modules/core-java/src/main/java/javac-args/types
rename to core-java-modules/core-java-compiler/src/main/java/javac-args/types
diff --git a/core-java-modules/core-java/src/main/java/javac-args/xlint-ops b/core-java-modules/core-java-compiler/src/main/java/javac-args/xlint-ops
similarity index 100%
rename from core-java-modules/core-java/src/main/java/javac-args/xlint-ops
rename to core-java-modules/core-java-compiler/src/main/java/javac-args/xlint-ops
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/illegalcharacter/IllegalCharacterUnitTest.java b/core-java-modules/core-java-compiler/src/test/java/com/baeldung/illegalcharacter/IllegalCharacterUnitTest.java
similarity index 100%
rename from core-java-modules/core-java/src/test/java/com/baeldung/illegalcharacter/IllegalCharacterUnitTest.java
rename to core-java-modules/core-java-compiler/src/test/java/com/baeldung/illegalcharacter/IllegalCharacterUnitTest.java
diff --git a/core-java-modules/core-java/src/test/resources/bom-file.txt b/core-java-modules/core-java-compiler/src/test/resources/bom-file.txt
similarity index 100%
rename from core-java-modules/core-java/src/test/resources/bom-file.txt
rename to core-java-modules/core-java-compiler/src/test/resources/bom-file.txt
diff --git a/core-java-modules/core-java-concurrency-2/pom.xml b/core-java-modules/core-java-concurrency-2/pom.xml
index c61f28a6b3..e373c829cc 100644
--- a/core-java-modules/core-java-concurrency-2/pom.xml
+++ b/core-java-modules/core-java-concurrency-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-concurrency-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-concurrency-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-concurrency-advanced-2/pom.xml b/core-java-modules/core-java-concurrency-advanced-2/pom.xml
index 1f19dc8cca..5c96684311 100644
--- a/core-java-modules/core-java-concurrency-advanced-2/pom.xml
+++ b/core-java-modules/core-java-concurrency-advanced-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-concurrency-advanced-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-concurrency-advanced-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobSchedulerUnitTest.java b/core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobSchedulerManualTest.java
similarity index 93%
rename from core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobSchedulerUnitTest.java
rename to core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobSchedulerManualTest.java
index 20e6a5ef5b..bd71cfc263 100644
--- a/core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobSchedulerUnitTest.java
+++ b/core-java-modules/core-java-concurrency-advanced-2/src/test/java/com/baeldung/concurrent/prioritytaskexecution/PriorityJobSchedulerManualTest.java
@@ -2,7 +2,8 @@ package com.baeldung.concurrent.prioritytaskexecution;
 
 import org.junit.Test;
 
-public class PriorityJobSchedulerUnitTest {
+//Converted to ManualTest due to thread sleep
+public class PriorityJobSchedulerManualTest {
     private static final int POOL_SIZE = 1;
     private static final int QUEUE_SIZE = 10;
 
diff --git a/core-java-modules/core-java-concurrency-advanced-3/pom.xml b/core-java-modules/core-java-concurrency-advanced-3/pom.xml
index 49a72112b4..7fa859c2d5 100644
--- a/core-java-modules/core-java-concurrency-advanced-3/pom.xml
+++ b/core-java-modules/core-java-concurrency-advanced-3/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-concurrency-advanced-3</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-concurrency-advanced-3</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-concurrency-advanced-4/pom.xml b/core-java-modules/core-java-concurrency-advanced-4/pom.xml
index 5bd7ccfa07..2ffe19b13c 100644
--- a/core-java-modules/core-java-concurrency-advanced-4/pom.xml
+++ b/core-java-modules/core-java-concurrency-advanced-4/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-concurrency-advanced-4</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-concurrency-advanced-4</name>
     <packaging>jar</packaging>
 
@@ -14,9 +13,6 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
-    <dependencies>
-    </dependencies>
-
     <build>
         <finalName>core-java-concurrency-advanced-4</finalName>
         <plugins>
diff --git a/core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/Consumer.java b/core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/Consumer.java
index 5a059b74df..933a1b5f52 100644
--- a/core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/Consumer.java
+++ b/core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/Consumer.java
@@ -1,12 +1,13 @@
 package com.baeldung.producerconsumer;
 
+import java.util.logging.Logger;
+
 public class Consumer implements Runnable {
+    private static final Logger log = Logger.getLogger(Consumer.class.getCanonicalName());
     private final DataQueue dataQueue;
-    private volatile boolean runFlag;
 
     public Consumer(DataQueue dataQueue) {
         this.dataQueue = dataQueue;
-        runFlag = true;
     }
 
     @Override
@@ -15,29 +16,31 @@ public class Consumer implements Runnable {
     }
 
     public void consume() {
-        while (runFlag) {
-            Message message;
-            if (dataQueue.isEmpty()) {
-                try {
-                    dataQueue.waitOnEmpty();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
+        while (dataQueue.runFlag) {
+            synchronized (dataQueue) {
+                while (dataQueue.isEmpty() && dataQueue.runFlag) {
+                    try {
+                        dataQueue.waitOnEmpty();
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                        break;
+                    }
+                }
+                if (!dataQueue.runFlag) {
                     break;
                 }
+                Message message = dataQueue.remove();
+                dataQueue.notifyAllForFull();
+                useMessage(message);
             }
-            if (!runFlag) {
-                break;
-            }
-            message = dataQueue.remove();
-            dataQueue.notifyAllForFull();
-            useMessage(message);
         }
-        System.out.println("Consumer Stopped");
+        log.info("Consumer Stopped");
     }
 
     private void useMessage(Message message) {
         if (message != null) {
-            System.out.printf("[%s] Consuming Message. Id: %d, Data: %f\n", Thread.currentThread().getName(), message.getId(), message.getData());
+            log.info(String.format("[%s] Consuming Message. Id: %d, Data: %f%n",
+                Thread.currentThread().getName(), message.getId(), message.getData()));
 
             //Sleeping on random time to make it realistic
             ThreadUtil.sleep((long) (message.getData() * 100));
@@ -45,7 +48,7 @@ public class Consumer implements Runnable {
     }
 
     public void stop() {
-        runFlag = false;
+        dataQueue.runFlag = false;
         dataQueue.notifyAllForEmpty();
     }
 }
diff --git a/core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/DataQueue.java b/core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/DataQueue.java
index 6ab4fa2bc3..8867ddeb63 100644
--- a/core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/DataQueue.java
+++ b/core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/DataQueue.java
@@ -9,6 +9,8 @@ public class DataQueue {
     private final Object FULL_QUEUE = new Object();
     private final Object EMPTY_QUEUE = new Object();
 
+    public boolean runFlag = true;
+
     DataQueue(int maxSize) {
         this.maxSize = maxSize;
     }
diff --git a/core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/Producer.java b/core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/Producer.java
index 80d693bd97..ca89d0c866 100644
--- a/core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/Producer.java
+++ b/core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/Producer.java
@@ -1,14 +1,15 @@
 package com.baeldung.producerconsumer;
 
+import java.util.logging.Logger;
+
 public class Producer implements Runnable {
+    private static final Logger log = Logger.getLogger(Producer.class.getCanonicalName());
     private final DataQueue dataQueue;
-    private volatile boolean runFlag;
 
     private static int idSequence = 0;
 
     public Producer(DataQueue dataQueue) {
         this.dataQueue = dataQueue;
-        runFlag = true;
     }
 
     @Override
@@ -17,28 +18,31 @@ public class Producer implements Runnable {
     }
 
     public void produce() {
-        while (runFlag) {
-            Message message = generateMessage();
-            while (dataQueue.isFull()) {
-                try {
-                    dataQueue.waitOnFull();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
+        while (dataQueue.runFlag) {
+            synchronized (dataQueue) {
+                while (dataQueue.isFull() && dataQueue.runFlag) {
+                    try {
+                        dataQueue.waitOnFull();
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                        break;
+                    }
+                }
+                if (!dataQueue.runFlag) {
                     break;
                 }
+                Message message = generateMessage();
+                dataQueue.add(message);
+                dataQueue.notifyAllForEmpty();
             }
-            if (!runFlag) {
-                break;
-            }
-            dataQueue.add(message);
-            dataQueue.notifyAllForEmpty();
         }
-        System.out.println("Producer Stopped");
+        log.info("Producer Stopped");
     }
 
     private Message generateMessage() {
-        Message message = new Message(++idSequence, Math.random());
-        System.out.printf("[%s] Generated Message. Id: %d, Data: %f\n", Thread.currentThread().getName(), message.getId(), message.getData());
+        Message message = new Message(incrementAndGetId(), Math.random());
+        log.info(String.format("[%s] Generated Message. Id: %d, Data: %f%n",
+            Thread.currentThread().getName(), message.getId(), message.getData()));
 
         //Sleeping on random time to make it realistic
         ThreadUtil.sleep((long) (message.getData() * 100));
@@ -46,8 +50,12 @@ public class Producer implements Runnable {
         return message;
     }
 
+    private static int incrementAndGetId() {
+        return ++idSequence;
+    }
+
     public void stop() {
-        runFlag = false;
+        dataQueue.runFlag = false;
         dataQueue.notifyAllForFull();
     }
 }
diff --git a/core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/SimpleProducerConsumerDemonstrator.java b/core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/SimpleProducerConsumerDemonstrator.java
index f1f6e1cc9c..500dc9ca07 100644
--- a/core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/SimpleProducerConsumerDemonstrator.java
+++ b/core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/producerconsumer/SimpleProducerConsumerDemonstrator.java
@@ -2,10 +2,12 @@ package com.baeldung.producerconsumer;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingDeque;
+import java.util.logging.Logger;
 
 import static com.baeldung.producerconsumer.ThreadUtil.sleep;
 
 public class SimpleProducerConsumerDemonstrator {
+    private static final Logger log = Logger.getLogger(SimpleProducerConsumerDemonstrator.class.getCanonicalName());
     BlockingQueue<Double> blockingQueue = new LinkedBlockingDeque<>(5);
 
     private void produce() {
@@ -17,7 +19,7 @@ public class SimpleProducerConsumerDemonstrator {
                 e.printStackTrace();
                 break;
             }
-            System.out.printf("[%s] Value produced: %f\n", Thread.currentThread().getName(), value);
+            log.info(String.format("[%s] Value produced: %f%n", Thread.currentThread().getName(), value));
         }
     }
 
@@ -31,7 +33,7 @@ public class SimpleProducerConsumerDemonstrator {
                 break;
             }
             // Consume value
-            System.out.printf("[%s] Value consumed: %f\n", Thread.currentThread().getName(), value);
+            log.info(String.format("[%s] Value consumed: %f%n", Thread.currentThread().getName(), value));
         }
     }
 
diff --git a/core-java-modules/core-java-concurrency-advanced/pom.xml b/core-java-modules/core-java-concurrency-advanced/pom.xml
index 3c726e1284..18cfc5371c 100644
--- a/core-java-modules/core-java-concurrency-advanced/pom.xml
+++ b/core-java-modules/core-java-concurrency-advanced/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-concurrency-advanced</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-concurrency-advanced</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/Worker.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/Worker.java
index 389e25719b..d23f1faa69 100644
--- a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/Worker.java
+++ b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/countdownlatch/Worker.java
@@ -1,9 +1,14 @@
 package com.baeldung.concurrent.countdownlatch;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
 public class Worker implements Runnable {
+
+    private static Logger log = LoggerFactory.getLogger(Worker.class);
     private final List<String> outputScraper;
     private final CountDownLatch countDownLatch;
 
@@ -15,7 +20,7 @@ public class Worker implements Runnable {
     @Override
     public void run() {
         // Do some work
-        System.out.println("Doing some logic");
+        log.debug("Doing some logic");
         outputScraper.add("Counted down");
         countDownLatch.countDown();
     }
diff --git a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/phaser/LongRunningAction.java b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/phaser/LongRunningAction.java
index c022c02085..44f84ad77c 100644
--- a/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/phaser/LongRunningAction.java
+++ b/core-java-modules/core-java-concurrency-advanced/src/main/java/com/baeldung/concurrent/phaser/LongRunningAction.java
@@ -1,8 +1,13 @@
 package com.baeldung.concurrent.phaser;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.concurrent.Phaser;
 
 class LongRunningAction implements Runnable {
+
+    private static Logger log = LoggerFactory.getLogger(LongRunningAction.class);
     private String threadName;
     private Phaser ph;
 
@@ -14,18 +19,18 @@ class LongRunningAction implements Runnable {
 
     @Override
     public void run() {
-        System.out.println("This is phase " + ph.getPhase());
-        System.out.println("Thread " + threadName + " before long running action");
+        log.info("This is phase {}", ph.getPhase());
+        log.info("Thread {} before long running action", threadName);
         
         try {
             Thread.sleep(2000);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        
-        System.out.println("Thread " + threadName + " action completed and waiting for others");
+
+        log.debug("Thread {} action completed and waiting for others", threadName);
         ph.arriveAndAwaitAdvance();
-        System.out.println("Thread " + threadName + " proceeding in phase " + ph.getPhase());
+        log.debug("Thread {} proceeding in phase {}", threadName, ph.getPhase());
         
         ph.arriveAndDeregister();
     }
diff --git a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/phaser/PhaserUnitTest.java b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/phaser/PhaserUnitTest.java
index 88c18b5149..384a1837c1 100644
--- a/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/phaser/PhaserUnitTest.java
+++ b/core-java-modules/core-java-concurrency-advanced/src/test/java/com/baeldung/concurrent/phaser/PhaserUnitTest.java
@@ -4,6 +4,9 @@ import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Phaser;
@@ -13,6 +16,8 @@ import static junit.framework.TestCase.assertEquals;
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class PhaserUnitTest {
 
+    private static Logger log = LoggerFactory.getLogger(PhaserUnitTest.class);
+
     @Test
     public void givenPhaser_whenCoordinateWorksBetweenThreads_thenShouldCoordinateBetweenMultiplePhases() {
         //given
@@ -26,19 +31,19 @@ public class PhaserUnitTest {
         executorService.submit(new LongRunningAction("thread-3", ph));
 
         //then
-        System.out.println("Thread " + Thread.currentThread().getName() + " waiting for others");
+        log.debug("Thread {} waiting for others", Thread.currentThread().getName());
         ph.arriveAndAwaitAdvance();
-        System.out.println("Thread " + Thread.currentThread().getName() + " proceeding in phase " + ph.getPhase());
+        log.debug("Thread {} proceeding in phase {}", Thread.currentThread().getName(), ph.getPhase());
         
         assertEquals(1, ph.getPhase());
 
         //and
         executorService.submit(new LongRunningAction("thread-4", ph));
         executorService.submit(new LongRunningAction("thread-5", ph));
-        
-        System.out.println("Thread " + Thread.currentThread().getName() + " waiting for others");
+
+        log.debug("Thread {} waiting for others", Thread.currentThread().getName());
         ph.arriveAndAwaitAdvance();
-        System.out.println("Thread " + Thread.currentThread().getName() + " proceeding in phase " + ph.getPhase());
+        log.debug("Thread {} proceeding in phase {}", Thread.currentThread().getName(), ph.getPhase());
         
         assertEquals(2, ph.getPhase());
 
diff --git a/httpclient4/src/main/resources/logback.xml b/core-java-modules/core-java-concurrency-advanced/src/test/resources/logback-test.xml
similarity index 100%
rename from httpclient4/src/main/resources/logback.xml
rename to core-java-modules/core-java-concurrency-advanced/src/test/resources/logback-test.xml
diff --git a/core-java-modules/core-java-concurrency-basic-2/pom.xml b/core-java-modules/core-java-concurrency-basic-2/pom.xml
index 9ca12da7fb..0cdfd68f03 100644
--- a/core-java-modules/core-java-concurrency-basic-2/pom.xml
+++ b/core-java-modules/core-java-concurrency-basic-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-concurrency-basic-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-concurrency-basic-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-concurrency-basic-3/README.md b/core-java-modules/core-java-concurrency-basic-3/README.md
index 477f37e00a..da148599b0 100644
--- a/core-java-modules/core-java-concurrency-basic-3/README.md
+++ b/core-java-modules/core-java-concurrency-basic-3/README.md
@@ -5,4 +5,6 @@ This module contains articles about basic Java concurrency.
 ### Relevant Articles: 
 
 - [How to Handle InterruptedException in Java](https://www.baeldung.com/java-interrupted-exception)
+- [Thread.sleep() vs Awaitility.await()](https://www.baeldung.com/java-thread-sleep-vs-awaitility-await)
+- [Is CompletableFuture Non-blocking?](https://www.baeldung.com/java-completablefuture-non-blocking)
 - [[<-- Prev]](../core-java-concurrency-basic-2)
diff --git a/core-java-modules/core-java-concurrency-basic-3/pom.xml b/core-java-modules/core-java-concurrency-basic-3/pom.xml
index 7289877550..1983d3c163 100644
--- a/core-java-modules/core-java-concurrency-basic-3/pom.xml
+++ b/core-java-modules/core-java-concurrency-basic-3/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-concurrency-basic-3</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-concurrency-basic-3</name>
     <packaging>jar</packaging>
 
@@ -14,6 +13,15 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${awaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
     <build>
         <finalName>core-java-concurrency-basic-3</finalName>
         <resources>
@@ -28,12 +36,4 @@
         <awaitility.version>4.2.0</awaitility.version>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>${awaitility.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-concurrency-basic-3/src/main/java/com/baeldung/concurrent/completablefuture/NonBlockingExample.java b/core-java-modules/core-java-concurrency-basic-3/src/main/java/com/baeldung/concurrent/completablefuture/NonBlockingExample.java
new file mode 100644
index 0000000000..b97f7d0dee
--- /dev/null
+++ b/core-java-modules/core-java-concurrency-basic-3/src/main/java/com/baeldung/concurrent/completablefuture/NonBlockingExample.java
@@ -0,0 +1,17 @@
+package com.baeldung.concurrent.completablefuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.CompletableFuture;
+
+public class NonBlockingExample {
+
+    private static final Logger logger = LoggerFactory.getLogger(NonBlockingExample.class);
+
+    public static void main(String[] args) {
+        CompletableFuture.supplyAsync(() -> "Baeldung")
+          .thenApply(String::length)
+          .thenAccept(s -> logger.info(String.valueOf(s)));
+    }
+}
diff --git a/core-java-modules/core-java-concurrency-basic-3/src/test/java/com/baeldung/concurrent/RequestProcessorUnitTest.java b/core-java-modules/core-java-concurrency-basic-3/src/test/java/com/baeldung/concurrent/RequestProcessorUnitTest.java
index c437b08b34..4a400f7beb 100644
--- a/core-java-modules/core-java-concurrency-basic-3/src/test/java/com/baeldung/concurrent/RequestProcessorUnitTest.java
+++ b/core-java-modules/core-java-concurrency-basic-3/src/test/java/com/baeldung/concurrent/RequestProcessorUnitTest.java
@@ -20,7 +20,8 @@ public class RequestProcessorUnitTest {
     void whenWaitingWithThreadSleep_thenStatusIsDone() throws InterruptedException {
         String requestId = requestProcessor.processRequest();
 
-        Thread.sleep(2000);
+        //The sleep value should be greater than the maximum time the request takes to complete
+        Thread.sleep(2010);
 
         assertEquals("DONE", requestProcessor.getStatus(requestId));
     }
@@ -31,7 +32,8 @@ public class RequestProcessorUnitTest {
         String requestId = requestProcessor.processRequest();
 
         Awaitility.await()
-          .atMost(2, TimeUnit.SECONDS)
+           //The timeout value should exceed the maximum time the request takes to complete, for the time amount of a poll (500 ms)
+          .atMost(2501, TimeUnit.MILLISECONDS)
           .pollDelay(500, TimeUnit.MILLISECONDS)
           .until(() -> requestProcessor.getStatus(requestId), not(equalTo("PROCESSING")));
 
diff --git a/core-java-modules/core-java-concurrency-basic-3/src/test/java/com/baeldung/concurrent/completablefuture/BlockingUnitTest.java b/core-java-modules/core-java-concurrency-basic-3/src/test/java/com/baeldung/concurrent/completablefuture/BlockingUnitTest.java
new file mode 100644
index 0000000000..75d8d73c2f
--- /dev/null
+++ b/core-java-modules/core-java-concurrency-basic-3/src/test/java/com/baeldung/concurrent/completablefuture/BlockingUnitTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.concurrent.completablefuture;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class BlockingUnitTest {
+
+    @Test
+    void givenCompletableFuture_whenGet_thenReturnResult()
+      throws ExecutionException, InterruptedException {
+        CompletableFuture<String> completableFuture = CompletableFuture
+          .supplyAsync(() -> "Baeldung")
+          .thenApply(String::toUpperCase);
+
+        assertEquals("BAELDUNG", completableFuture.get());
+    }
+
+    @Test
+    void givenCompletableFuture_whenJoin_thenReturnResult() {
+        CompletableFuture<String> completableFuture = CompletableFuture
+          .supplyAsync(() -> "Blocking")
+          .thenApply(s -> s + " Operation")
+          .thenApply(String::toLowerCase);
+
+        assertEquals("blocking operation", completableFuture.join());
+    }
+}
diff --git a/core-java-modules/core-java-concurrency-basic/pom.xml b/core-java-modules/core-java-concurrency-basic/pom.xml
index 1e3157291a..36d59f254c 100644
--- a/core-java-modules/core-java-concurrency-basic/pom.xml
+++ b/core-java-modules/core-java-concurrency-basic/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-concurrency-basic</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-concurrency-basic</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-concurrency-collections-2/pom.xml b/core-java-modules/core-java-concurrency-collections-2/pom.xml
index 9a95662fae..a85721e474 100644
--- a/core-java-modules/core-java-concurrency-collections-2/pom.xml
+++ b/core-java-modules/core-java-concurrency-collections-2/pom.xml
@@ -3,7 +3,6 @@
     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>core-java-concurrency-collections-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-concurrency-collections-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-concurrency-collections/pom.xml b/core-java-modules/core-java-concurrency-collections/pom.xml
index 8b8d2fe03b..a35da4ce49 100644
--- a/core-java-modules/core-java-concurrency-collections/pom.xml
+++ b/core-java-modules/core-java-concurrency-collections/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-concurrency-collections</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-concurrency-collections</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-concurrency-simple/pom.xml b/core-java-modules/core-java-concurrency-simple/pom.xml
index 159a105035..a16df4fc97 100644
--- a/core-java-modules/core-java-concurrency-simple/pom.xml
+++ b/core-java-modules/core-java-concurrency-simple/pom.xml
@@ -3,7 +3,6 @@
     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>core-java-concurrency-simple</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-concurrency-simple</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/sandbox/SandboxJavaManualTest.java b/core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/sandbox/SandboxJavaManualTest.java
similarity index 100%
rename from core-java-modules/core-java/src/test/java/com/baeldung/sandbox/SandboxJavaManualTest.java
rename to core-java-modules/core-java-concurrency-simple/src/test/java/com/baeldung/sandbox/SandboxJavaManualTest.java
diff --git a/core-java-modules/core-java-console/pom.xml b/core-java-modules/core-java-console/pom.xml
index 200e2707dd..4debf9388b 100644
--- a/core-java-modules/core-java-console/pom.xml
+++ b/core-java-modules/core-java-console/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-console</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-console</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-date-operations-1/pom.xml b/core-java-modules/core-java-date-operations-1/pom.xml
index c5d46723d8..5bfbb5bab0 100644
--- a/core-java-modules/core-java-date-operations-1/pom.xml
+++ b/core-java-modules/core-java-date-operations-1/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-date-operations-1</artifactId>
-    <version>${project.parent.version}</version>
     <name>core-java-date-operations-1</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-date-operations-1/src/main/java/com/baeldung/date/DayOfTheWeek.java b/core-java-modules/core-java-date-operations-1/src/main/java/com/baeldung/date/DayOfTheWeek.java
new file mode 100644
index 0000000000..a5622038ce
--- /dev/null
+++ b/core-java-modules/core-java-date-operations-1/src/main/java/com/baeldung/date/DayOfTheWeek.java
@@ -0,0 +1,41 @@
+package com.baeldung.date;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.temporal.TemporalAdjusters;
+import java.time.temporal.TemporalField;
+import java.time.temporal.WeekFields;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+public class DayOfTheWeek {
+
+    public LocalDate getDateOfFirstDayOfTheWeek_UsingLocale(LocalDate localDate, Locale locale){
+        TemporalField fieldISO = WeekFields.of(locale).dayOfWeek();
+        return localDate.with(fieldISO, 1);
+    }
+
+    public LocalDate getDateOfFirstDayOfTheWeek_UsingISODayOfWeek(LocalDate localDate){
+        TemporalField dayOfWeek = WeekFields.ISO.dayOfWeek();
+        return localDate.with(dayOfWeek, dayOfWeek.range().getMinimum());
+    }
+
+    public LocalDate getDateOfFirstDayOfTheWeek_UsingDayOfWeek(LocalDate localDate){
+        DayOfWeek weekStart = DayOfWeek.MONDAY;
+        return localDate.with(TemporalAdjusters.previousOrSame(weekStart));
+    }
+
+    public LocalDate getDateOfFirstDayOfTheWeek_UsingCalendar(LocalDate localDate){
+        Calendar calendar = Calendar.getInstance();
+        ZoneId zoneId = ZoneId.systemDefault();
+        Date date = Date.from(localDate.atStartOfDay(zoneId).toInstant());
+        calendar.setTime(date);
+        while (calendar.get(Calendar.DAY_OF_WEEK) != Calendar.MONDAY) {
+            calendar.add(Calendar.DATE, -1);
+        }
+       return LocalDateTime.ofInstant(calendar.toInstant(), calendar.getTimeZone().toZoneId()).toLocalDate();
+    }
+}
diff --git a/core-java-modules/core-java-date-operations-1/src/test/java/com/baeldung/date/DayOfTheWeekUnitTest.java b/core-java-modules/core-java-date-operations-1/src/test/java/com/baeldung/date/DayOfTheWeekUnitTest.java
new file mode 100644
index 0000000000..9b29d2cc19
--- /dev/null
+++ b/core-java-modules/core-java-date-operations-1/src/test/java/com/baeldung/date/DayOfTheWeekUnitTest.java
@@ -0,0 +1,68 @@
+package com.baeldung.date;
+
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class DayOfTheWeekUnitTest {
+
+    DayOfTheWeek dayOfTheWeek = new DayOfTheWeek();
+
+    @Test
+    public void whenInputDateIsMonday_ThenFirstDayOfWeekIsSameAsInputDay() {
+        TestData testData = new TestData(LocalDate.of(2023, 2, 20),LocalDate.of(2023,2,20) );
+        Assertions.assertEquals(testData.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingISODayOfWeek(testData.inputDate));
+        Assertions.assertEquals(testData.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingCalendar(testData.inputDate));
+        Assertions.assertEquals(testData.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingDayOfWeek(testData.inputDate));
+    }
+
+    @Test
+    public void whenInputDateIsSunday_ThenFirstDayOfWeekIsPreviousWeekMonday() {
+        TestData testData = new TestData(LocalDate.of(2023, 2, 19), LocalDate.of(2023,2,13));
+        Assertions.assertEquals(testData.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingISODayOfWeek(testData.inputDate));
+        Assertions.assertEquals(testData.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingCalendar(testData.inputDate));
+        Assertions.assertEquals(testData.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingDayOfWeek(testData.inputDate));
+    }
+
+    @Test
+    void whenInputDateIsNewYearMidWeek_ThenFirstDayOfWeekIsPreviousYearLastMonday() {
+        TestData testData = new TestData(LocalDate.of(2022, 1, 1), LocalDate.of(2021,12,27));
+        Assertions.assertEquals(testData.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingISODayOfWeek(testData.inputDate));
+        Assertions.assertEquals(testData.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingCalendar(testData.inputDate));
+        Assertions.assertEquals(testData.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingDayOfWeek(testData.inputDate));
+     }
+
+    @Test
+    void whenInputDataHasLocale_ThenFirstDayOfWeekIsMondayOrSundayInDifferentLocale() {
+        List<TestData> testData = Arrays.asList(
+                new TestData(LocalDate.of(2023, 2, 20),Locale.FRANCE,LocalDate.of(2023,2,20)),
+                new TestData(LocalDate.of(2023, 2, 19),Locale.FRANCE,LocalDate.of(2023,2,13)),
+                new TestData(LocalDate.of(2022, 1, 1),Locale.FRANCE,LocalDate.of(2021,12,27)),
+                // day of week starts from sunday in USA
+                new TestData(LocalDate.of(2023, 2, 20),Locale.US,LocalDate.of(2023,2,19)),
+                new TestData(LocalDate.of(2023, 2, 19),Locale.US,LocalDate.of(2023,2,19)),
+                new TestData(LocalDate.of(2022, 1, 1),Locale.US,LocalDate.of(2021,12,26))
+        );
+        testData.forEach(data -> Assertions.assertEquals(data.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingLocale(data.inputDate,data.inputLocale)));
+    }
+
+    private static class TestData{
+        private final LocalDate inputDate;
+        private Locale inputLocale;
+        private final LocalDate expectedOutput;
+
+        private TestData(LocalDate inputDate, LocalDate expectedOutput){
+            this.inputDate = inputDate;
+            this.expectedOutput = expectedOutput;
+        }
+
+        private TestData(LocalDate inputDate, Locale inputLocale, LocalDate expectedOutput){
+            this.inputDate = inputDate;
+            this.inputLocale = inputLocale;
+            this.expectedOutput = expectedOutput;
+        }
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-date-operations-2/pom.xml b/core-java-modules/core-java-date-operations-2/pom.xml
index 461ba70b62..c6a22a4166 100644
--- a/core-java-modules/core-java-date-operations-2/pom.xml
+++ b/core-java-modules/core-java-date-operations-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-date-operations-2</artifactId>
-    <version>${project.parent.version}</version>
     <name>core-java-date-operations-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-date-operations-3/README.md b/core-java-modules/core-java-date-operations-3/README.md
index 944ab4bd1b..0d36f9c8a2 100644
--- a/core-java-modules/core-java-date-operations-3/README.md
+++ b/core-java-modules/core-java-date-operations-3/README.md
@@ -5,4 +5,5 @@ This module contains articles about date operations in Java.
 
 - [Create Date From Unix Timestamp in Java](https://www.baeldung.com/java-date-unix-timestamp)
 - [Convert java.util.Date to java.sql.Date](https://www.baeldung.com/java-convert-util-date-to-sql)
+- [How to Determine Date of the First Day of the Week Using LocalDate in Java](https://www.baeldung.com/java-first-day-of-the-week)
 - [[<-- Prev]](/core-java-modules/core-java-date-operations-2)
diff --git a/core-java-modules/core-java-date-operations-3/pom.xml b/core-java-modules/core-java-date-operations-3/pom.xml
index 8713139ba8..89c21a31c1 100644
--- a/core-java-modules/core-java-date-operations-3/pom.xml
+++ b/core-java-modules/core-java-date-operations-3/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-date-operations-3</artifactId>
-    <version>${project.parent.version}</version>
     <name>core-java-date-operations-3</name>
     <packaging>jar</packaging>
 
@@ -14,10 +13,4 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
-    <dependencies>
-    </dependencies>
-
-    <properties>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-date-operations-3/src/main/java/com/baeldung/date/DayOfTheWeek.java b/core-java-modules/core-java-date-operations-3/src/main/java/com/baeldung/date/DayOfTheWeek.java
new file mode 100644
index 0000000000..a5622038ce
--- /dev/null
+++ b/core-java-modules/core-java-date-operations-3/src/main/java/com/baeldung/date/DayOfTheWeek.java
@@ -0,0 +1,41 @@
+package com.baeldung.date;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.temporal.TemporalAdjusters;
+import java.time.temporal.TemporalField;
+import java.time.temporal.WeekFields;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+public class DayOfTheWeek {
+
+    public LocalDate getDateOfFirstDayOfTheWeek_UsingLocale(LocalDate localDate, Locale locale){
+        TemporalField fieldISO = WeekFields.of(locale).dayOfWeek();
+        return localDate.with(fieldISO, 1);
+    }
+
+    public LocalDate getDateOfFirstDayOfTheWeek_UsingISODayOfWeek(LocalDate localDate){
+        TemporalField dayOfWeek = WeekFields.ISO.dayOfWeek();
+        return localDate.with(dayOfWeek, dayOfWeek.range().getMinimum());
+    }
+
+    public LocalDate getDateOfFirstDayOfTheWeek_UsingDayOfWeek(LocalDate localDate){
+        DayOfWeek weekStart = DayOfWeek.MONDAY;
+        return localDate.with(TemporalAdjusters.previousOrSame(weekStart));
+    }
+
+    public LocalDate getDateOfFirstDayOfTheWeek_UsingCalendar(LocalDate localDate){
+        Calendar calendar = Calendar.getInstance();
+        ZoneId zoneId = ZoneId.systemDefault();
+        Date date = Date.from(localDate.atStartOfDay(zoneId).toInstant());
+        calendar.setTime(date);
+        while (calendar.get(Calendar.DAY_OF_WEEK) != Calendar.MONDAY) {
+            calendar.add(Calendar.DATE, -1);
+        }
+       return LocalDateTime.ofInstant(calendar.toInstant(), calendar.getTimeZone().toZoneId()).toLocalDate();
+    }
+}
diff --git a/core-java-modules/core-java-date-operations-3/src/test/java/com/baeldung/date/DayOfTheWeekUnitTest.java b/core-java-modules/core-java-date-operations-3/src/test/java/com/baeldung/date/DayOfTheWeekUnitTest.java
new file mode 100644
index 0000000000..cdc0eb1d6b
--- /dev/null
+++ b/core-java-modules/core-java-date-operations-3/src/test/java/com/baeldung/date/DayOfTheWeekUnitTest.java
@@ -0,0 +1,68 @@
+package com.baeldung.date;
+
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class DayOfTheWeekUnitTest {
+
+    DayOfTheWeek dayOfTheWeek = new DayOfTheWeek();
+
+    @Test
+    void whenInputDateIsMonday_ThenFirstDayOfWeekIsSameAsInputDay() {
+        TestData testData = new TestData(LocalDate.of(2023, 2, 20),LocalDate.of(2023,2,20) );
+        Assertions.assertEquals(testData.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingISODayOfWeek(testData.inputDate));
+        Assertions.assertEquals(testData.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingCalendar(testData.inputDate));
+        Assertions.assertEquals(testData.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingDayOfWeek(testData.inputDate));
+    }
+
+    @Test
+    void whenInputDateIsSunday_ThenFirstDayOfWeekIsPreviousWeekMonday() {
+        TestData testData = new TestData(LocalDate.of(2023, 2, 19), LocalDate.of(2023,2,13));
+        Assertions.assertEquals(testData.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingISODayOfWeek(testData.inputDate));
+        Assertions.assertEquals(testData.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingCalendar(testData.inputDate));
+        Assertions.assertEquals(testData.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingDayOfWeek(testData.inputDate));
+    }
+
+    @Test
+    void whenInputDateIsNewYearMidWeek_ThenFirstDayOfWeekIsPreviousYearLastMonday() {
+        TestData testData = new TestData(LocalDate.of(2022, 1, 1), LocalDate.of(2021,12,27));
+        Assertions.assertEquals(testData.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingISODayOfWeek(testData.inputDate));
+        Assertions.assertEquals(testData.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingCalendar(testData.inputDate));
+        Assertions.assertEquals(testData.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingDayOfWeek(testData.inputDate));
+     }
+
+    @Test
+    void whenInputDataHasLocale_ThenFirstDayOfWeekIsMondayOrSundayInDifferentLocale() {
+        List<TestData> testData = Arrays.asList(
+                new TestData(LocalDate.of(2023, 2, 20),Locale.FRANCE,LocalDate.of(2023,2,20)),
+                new TestData(LocalDate.of(2023, 2, 19),Locale.FRANCE,LocalDate.of(2023,2,13)),
+                new TestData(LocalDate.of(2022, 1, 1),Locale.FRANCE,LocalDate.of(2021,12,27)),
+                // day of week starts from sunday in USA
+                new TestData(LocalDate.of(2023, 2, 20),Locale.US,LocalDate.of(2023,2,19)),
+                new TestData(LocalDate.of(2023, 2, 19),Locale.US,LocalDate.of(2023,2,19)),
+                new TestData(LocalDate.of(2022, 1, 1),Locale.US,LocalDate.of(2021,12,26))
+        );
+        testData.forEach(data -> Assertions.assertEquals(data.expectedOutput, dayOfTheWeek.getDateOfFirstDayOfTheWeek_UsingLocale(data.inputDate,data.inputLocale)));
+    }
+
+    private static class TestData{
+        private final LocalDate inputDate;
+        private Locale inputLocale;
+        private final LocalDate expectedOutput;
+
+        private TestData(LocalDate inputDate, LocalDate expectedOutput){
+            this.inputDate = inputDate;
+            this.expectedOutput = expectedOutput;
+        }
+
+        private TestData(LocalDate inputDate, Locale inputLocale, LocalDate expectedOutput){
+            this.inputDate = inputDate;
+            this.inputLocale = inputLocale;
+            this.expectedOutput = expectedOutput;
+        }
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-datetime-string-2/pom.xml b/core-java-modules/core-java-datetime-string-2/pom.xml
index 3ec9ccaac4..458fba25a2 100644
--- a/core-java-modules/core-java-datetime-string-2/pom.xml
+++ b/core-java-modules/core-java-datetime-string-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-datetime-string-2</artifactId>
-    <version>${project.parent.version}</version>
     <name>core-java-datetime-string-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-datetime-string/pom.xml b/core-java-modules/core-java-datetime-string/pom.xml
index 2b3c2edb02..3efb2fe728 100644
--- a/core-java-modules/core-java-datetime-string/pom.xml
+++ b/core-java-modules/core-java-datetime-string/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-datetime-string</artifactId>
-    <version>${project.parent.version}</version>
     <name>core-java-datetime-string</name>
     <packaging>jar</packaging>
 
@@ -20,7 +19,6 @@
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang3.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/commons-validator/commons-validator -->
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
diff --git a/core-java-modules/core-java-documentation/README.md b/core-java-modules/core-java-documentation/README.md
new file mode 100644
index 0000000000..b66b9e8c05
--- /dev/null
+++ b/core-java-modules/core-java-documentation/README.md
@@ -0,0 +1,6 @@
+## Core Java Documentation
+
+### Relevant Articles: 
+
+- [Introduction to Javadoc](http://www.baeldung.com/javadoc)
+
diff --git a/core-java-modules/core-java-documentation/pom.xml b/core-java-modules/core-java-documentation/pom.xml
new file mode 100644
index 0000000000..be18af1b10
--- /dev/null
+++ b/core-java-modules/core-java-documentation/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>core-java-documentation</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-documentation</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>${maven-javadoc-plugin.version}</version>
+                <configuration>
+                    <source>${source.version}</source>
+                    <target>${target.version}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <!-- maven plugins -->
+        <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
+        <source.version>1.8</source.version>
+        <target.version>1.8</target.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/javadoc/CodeSnippetFormatting.java b/core-java-modules/core-java-documentation/src/main/java/com/baeldung/javadoc/CodeSnippetFormatting.java
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/javadoc/CodeSnippetFormatting.java
rename to core-java-modules/core-java-documentation/src/main/java/com/baeldung/javadoc/CodeSnippetFormatting.java
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/javadoc/Person.java b/core-java-modules/core-java-documentation/src/main/java/com/baeldung/javadoc/Person.java
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/javadoc/Person.java
rename to core-java-modules/core-java-documentation/src/main/java/com/baeldung/javadoc/Person.java
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/javadoc/SuperHero.java b/core-java-modules/core-java-documentation/src/main/java/com/baeldung/javadoc/SuperHero.java
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/javadoc/SuperHero.java
rename to core-java-modules/core-java-documentation/src/main/java/com/baeldung/javadoc/SuperHero.java
diff --git a/core-java-modules/core-java-exceptions-2/pom.xml b/core-java-modules/core-java-exceptions-2/pom.xml
index 9103672cd4..8bf5605f09 100644
--- a/core-java-modules/core-java-exceptions-2/pom.xml
+++ b/core-java-modules/core-java-exceptions-2/pom.xml
@@ -5,8 +5,6 @@
     <artifactId>core-java-exceptions-2</artifactId>
     <name>core-java-exceptions-2</name>
     <packaging>jar</packaging>
-    <description> </description>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung.core-java-modules</groupId>
diff --git a/core-java-modules/core-java-exceptions-3/pom.xml b/core-java-modules/core-java-exceptions-3/pom.xml
index 7eaa57edf1..6ef979b54a 100644
--- a/core-java-modules/core-java-exceptions-3/pom.xml
+++ b/core-java-modules/core-java-exceptions-3/pom.xml
@@ -3,9 +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>
-    <groupId>com.baeldung.exceptions</groupId>
     <artifactId>core-java-exceptions-3</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-exceptions-3</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-exceptions-4/pom.xml b/core-java-modules/core-java-exceptions-4/pom.xml
index e9eb1bf379..c41c782fcc 100644
--- a/core-java-modules/core-java-exceptions-4/pom.xml
+++ b/core-java-modules/core-java-exceptions-4/pom.xml
@@ -3,9 +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>
-    <groupId>com.baeldung.exceptions</groupId>
     <artifactId>core-java-exceptions-4</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-exceptions-4</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-exceptions/pom.xml b/core-java-modules/core-java-exceptions/pom.xml
index 866248b416..0bb6e86c76 100644
--- a/core-java-modules/core-java-exceptions/pom.xml
+++ b/core-java-modules/core-java-exceptions/pom.xml
@@ -3,9 +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>
-    <groupId>com.baeldung.exceptions</groupId>
     <artifactId>core-java-exceptions</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-exceptions</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-function/pom.xml b/core-java-modules/core-java-function/pom.xml
index ebc34aaf4b..e8b538ad24 100644
--- a/core-java-modules/core-java-function/pom.xml
+++ b/core-java-modules/core-java-function/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-function</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-function</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-functional/pom.xml b/core-java-modules/core-java-functional/pom.xml
index 9ad47f8133..4b0bf9f730 100644
--- a/core-java-modules/core-java-functional/pom.xml
+++ b/core-java-modules/core-java-functional/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-functional</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-functional</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-hex/pom.xml b/core-java-modules/core-java-hex/pom.xml
index afac1c4d66..71e6b15b2e 100644
--- a/core-java-modules/core-java-hex/pom.xml
+++ b/core-java-modules/core-java-hex/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-hex</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-hex</name>
     <packaging>jar</packaging>
 
@@ -14,12 +13,4 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
-    <dependencies>
-        
-    </dependencies>
-
-    <properties>
-        
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-httpclient/pom.xml b/core-java-modules/core-java-httpclient/pom.xml
index 3df0447ff0..f3730d1b45 100644
--- a/core-java-modules/core-java-httpclient/pom.xml
+++ b/core-java-modules/core-java-httpclient/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-httpclient</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-httpclient</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-io-2/pom.xml b/core-java-modules/core-java-io-2/pom.xml
index b5f43d5a94..8f4f2518fe 100644
--- a/core-java-modules/core-java-io-2/pom.xml
+++ b/core-java-modules/core-java-io-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-io-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-io-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-io-3/pom.xml b/core-java-modules/core-java-io-3/pom.xml
index 4901133854..26ea301837 100644
--- a/core-java-modules/core-java-io-3/pom.xml
+++ b/core-java-modules/core-java-io-3/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-io-3</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-io-3</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-io-4/pom.xml b/core-java-modules/core-java-io-4/pom.xml
index 2cc05698fc..30177e5c09 100644
--- a/core-java-modules/core-java-io-4/pom.xml
+++ b/core-java-modules/core-java-io-4/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-io-4</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-io-4</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-io-4/src/main/java/com/baeldung/iostreams/DataStream.java b/core-java-modules/core-java-io-4/src/main/java/com/baeldung/iostreams/DataStream.java
index 71c55d31b9..84d6c1ad80 100644
--- a/core-java-modules/core-java-io-4/src/main/java/com/baeldung/iostreams/DataStream.java
+++ b/core-java-modules/core-java-io-4/src/main/java/com/baeldung/iostreams/DataStream.java
@@ -7,12 +7,14 @@ public class DataStream {
         PrintStream out = new PrintStream(fileName);
         out.print(content);
         out.flush();
+        out.close();
     }
 
     public static void textDataProcessingCharStream(String fileName, String content) throws IOException {
         PrintWriter out = new PrintWriter(fileName);
         out.print(content);
         out.flush();
+        out.close();
     }
 
     public static void nonTextDataProcessing(String fileName, String streamOutputFile, String writerOutputFile) throws IOException {
@@ -33,5 +35,6 @@ public class DataStream {
             writer.write(c);
         }
         writer.close();
+        inputStream.close();
     }
 }
\ No newline at end of file
diff --git a/core-java-modules/core-java-io-4/src/test/java/com/baeldung/iostreams/DataStreamUnitTest.java b/core-java-modules/core-java-io-4/src/test/java/com/baeldung/iostreams/DataStreamUnitTest.java
index a5a53d5a08..7d697171ce 100644
--- a/core-java-modules/core-java-io-4/src/test/java/com/baeldung/iostreams/DataStreamUnitTest.java
+++ b/core-java-modules/core-java-io-4/src/test/java/com/baeldung/iostreams/DataStreamUnitTest.java
@@ -23,32 +23,29 @@ public class DataStreamUnitTest {
 
     @Test
     public void whenUsingByteStream_thenWriteTextToFile() throws IOException {
-        DataStream dataStream = new DataStream();
-        dataStream.textDataProcessingByteStream(dataProcessingTextFile, textFileContent);
+        DataStream.textDataProcessingByteStream(dataProcessingTextFile, textFileContent);
 
         File file = new File(dataProcessingTextFile);
         assertTrue(file.exists());
         assertEquals(textFileContent, FileUtils.readFileToString(file, "utf-8"));
 
-        Files.delete(Paths.get(dataProcessingTextFile));
+        Files.deleteIfExists(Paths.get(dataProcessingTextFile));
     }
 
     @Test
     public void whenUsingCharStream_thenWriteTextToFile() throws IOException {
-        DataStream dataStream = new DataStream();
-        dataStream.textDataProcessingCharStream(dataProcessingTextFile, textFileContent);
+        DataStream.textDataProcessingCharStream(dataProcessingTextFile, textFileContent);
 
         File file = new File(dataProcessingTextFile);
         assertTrue(file.exists());
         assertEquals(textFileContent, FileUtils.readFileToString(file, "utf-8"));
 
-        Files.delete(Paths.get(dataProcessingTextFile));
+        Files.deleteIfExists(Paths.get(dataProcessingTextFile));
     }
 
     @Test
     public void whenUsingStreams_thenWriteNonTextData() throws IOException {
-        DataStream dataStream = new DataStream();
-        dataStream.nonTextDataProcessing(dataProcessingImageFile, dataProcessingByteStreamFile, dataProcessingCharStreamFile);
+        DataStream.nonTextDataProcessing(dataProcessingImageFile, dataProcessingByteStreamFile, dataProcessingCharStreamFile);
 
         File file = new File(dataProcessingImageFile);
         File byteStreamOutputFile = new File(dataProcessingByteStreamFile);
@@ -60,7 +57,7 @@ public class DataStreamUnitTest {
         assertTrue(FileUtils.contentEquals(file, byteStreamOutputFile));
         assertFalse(FileUtils.contentEquals(file, charStreamOutputFile));
 
-        Files.delete(Paths.get(dataProcessingByteStreamFile));
-        Files.delete(Paths.get(dataProcessingCharStreamFile));
+        Files.deleteIfExists(Paths.get(dataProcessingByteStreamFile));
+        Files.deleteIfExists(Paths.get(dataProcessingCharStreamFile));
     }
 }
diff --git a/core-java-modules/core-java-io-4/src/test/resources/iostreams/TestFile.txt b/core-java-modules/core-java-io-4/src/test/resources/iostreams/TestFile.txt
new file mode 100644
index 0000000000..5dd01c177f
--- /dev/null
+++ b/core-java-modules/core-java-io-4/src/test/resources/iostreams/TestFile.txt
@@ -0,0 +1 @@
+Hello, world!
\ No newline at end of file
diff --git a/core-java-modules/core-java-io-apis-2/README.md b/core-java-modules/core-java-io-apis-2/README.md
index f3d72fe8b5..1633dc4828 100644
--- a/core-java-modules/core-java-io-apis-2/README.md
+++ b/core-java-modules/core-java-io-apis-2/README.md
@@ -5,3 +5,6 @@ This module contains articles about core Java input/output(IO) APIs.
 ### Relevant Articles:
 - [Constructing a Relative Path From Two Absolute Paths in Java](https://www.baeldung.com/java-relative-path-absolute)
 - [Java Scanner Taking a Character Input](https://www.baeldung.com/java-scanner-character-input)
+- [Get the Desktop Path in Java](https://www.baeldung.com/java-desktop-path)
+- [Integer.parseInt(scanner.nextLine()) and scanner.nextInt() in Java](https://www.baeldung.com/java-scanner-integer)
+- [Difference Between FileReader and BufferedReader in Java](https://www.baeldung.com/java-filereader-vs-bufferedreader)
diff --git a/core-java-modules/core-java-io-apis-2/pom.xml b/core-java-modules/core-java-io-apis-2/pom.xml
index 70c3a87da2..22c04cdc58 100644
--- a/core-java-modules/core-java-io-apis-2/pom.xml
+++ b/core-java-modules/core-java-io-apis-2/pom.xml
@@ -1,47 +1,115 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>core-java-io-apis-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <name>core-java-io-apis-2</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.baeldung.core-java-modules</groupId>
-        <artifactId>core-java-modules</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <!-- logging -->
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-        <dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>core-java-io-apis-2</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>core-java-io-apis-2</artifactId>
+    <name>core-java-io-apis-2</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <!-- logging -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+            <version>${org.slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.7.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+        </dependency>
+        <!-- this is all you need to write tests with JUnit Jupiter -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- this dependency is needed to create parameterized tests -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${junit-jupiter-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- contains the engine that actually runs the Jupiter-tests -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-jupiter-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>7.1.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>7.5</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+    <properties>
+        <junit-jupiter-version>5.2.0</junit-jupiter-version>
+    </properties>
+    <build>
+        <finalName>core-java-io-apis-2</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-io-apis-2/src/main/java/com/baeldung/multinput/MultiInputs.java b/core-java-modules/core-java-io-apis-2/src/main/java/com/baeldung/multinput/MultiInputs.java
new file mode 100644
index 0000000000..df799b2511
--- /dev/null
+++ b/core-java-modules/core-java-io-apis-2/src/main/java/com/baeldung/multinput/MultiInputs.java
@@ -0,0 +1,36 @@
+package com.baeldung.multinput;
+
+import java.util.InputMismatchException;
+import java.util.Scanner;
+
+public class MultiInputs {
+    public void UsingSpaceDelimiter(){
+        Scanner scanner = new Scanner(System.in);
+        System.out.print("Enter two numbers: ");
+        int num1 = scanner.nextInt();
+        int num2 = scanner.nextInt();
+        System.out.println("You entered " + num1 + " and " + num2);
+
+    }
+    public void UsingREDelimiter(){
+        Scanner scanner = new Scanner(System.in);
+        scanner.useDelimiter("[\\s,]+");
+        System.out.print("Enter two numbers separated by a space or a comma: ");
+        int num1 = scanner.nextInt();
+        int num2 = scanner.nextInt();
+        System.out.println("You entered " + num1 + " and " + num2);
+
+    }
+    public void UsingCustomDelimiter(){
+        Scanner scanner = new Scanner(System.in);
+        scanner.useDelimiter(";");
+        System.out.print("Enter two numbers separated by a semicolon: ");
+        try { int num1 = scanner.nextInt();
+            int num2 = scanner.nextInt();
+            System.out.println("You entered " + num1 + " and " + num2); }
+        catch (InputMismatchException e)
+        { System.out.println("Invalid input. Please enter two integers separated by a semicolon."); }
+
+    }
+}
+
diff --git a/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/absolutetorelative/AbsoluteToRelativeUnitTest.java b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/absolutetorelative/AbsoluteToRelativeUnitTest.java
index 0830b0808a..9b3f424a30 100644
--- a/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/absolutetorelative/AbsoluteToRelativeUnitTest.java
+++ b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/absolutetorelative/AbsoluteToRelativeUnitTest.java
@@ -1,93 +1,92 @@
-package com.baeldung.absolutetorelative;
-
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.net.URI;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-public class AbsoluteToRelativeUnitTest {
-
-    // given - until using Paths, no need to create physical files
-    private final Path pathOne = Paths.get("/baeldung/bar/one.txt");
-    private final Path pathTwo = Paths.get("/baeldung/bar/two.txt");
-    private final Path pathThree = Paths.get("/baeldung/foo/three.txt");
-
-    private final URI uriOne = pathOne.toUri();
-    private final URI uriTwo = pathTwo.toUri();
-    private final URI uriThree = pathThree.toUri();
-
-    @Test
-    public void givenAbsolutePaths_whenRelativizePathOneToPathTwo_thenRelativeIsReturned() {
-        Path result = pathOne.relativize(pathTwo);
-
-        Assertions.assertThat(result)
-                .isRelative()
-                .isEqualTo(Paths.get("../two.txt"));
-    }
-
-    @Test
-    public void givenAbsolutePaths_whenRelativizePathTwoToPathOne_thenRelativeIsReturned() {
-        Path result = pathTwo.relativize(pathOne);
-
-        Assertions.assertThat(result)
-                .isRelative()
-                .isEqualTo(Paths.get("../one.txt"));
-    }
-
-    @Test
-    public void givenAbsolutePaths_whenRelativizePathOneParentToPathTwo_thenRelativeIsReturned() {
-        Path result = pathOne.getParent().relativize(pathTwo);
-
-        Assertions.assertThat(result)
-                .isRelative()
-                .isEqualTo(Paths.get("two.txt"));
-    }
-
-    @Test
-    public void givenAbsolutePaths_whenRelativizePathOneToPathThree_thenRelativeIsReturned() {
-        Path result = pathOne.relativize(pathThree);
-
-        Assertions.assertThat(result)
-                .isRelative()
-                .isEqualTo(Paths.get("../../foo/three.txt"));
-    }
-
-    @Test
-    public void givenAbsolutePaths_whenRelativizePathThreeToPathOne_thenRelativeIsReturned() {
-        Path result = pathThree.relativize(pathOne);
-
-        Assertions.assertThat(result)
-                .isRelative()
-                .isEqualTo(Paths.get("../../bar/one.txt"));
-    }
-
-    @Test
-    public void givenAbsoluteURIs_whenRelativizeUriOneToUriTwo_thenAbsoluteIsReturned() {
-        URI result = uriOne.relativize(uriTwo);
-
-        Assertions.assertThat(result)
-                .asString()
-                .contains("/baeldung/bar/two.txt");
-    }
-
-    @Test
-    public void givenAbsoluteURIs_whenRelativizeUriOneParentToUriTwo_thenRelativeIsReturned() {
-        URI result = pathOne.getParent().toUri().relativize(uriTwo);
-
-        Assertions.assertThat(result)
-                .asString()
-                .contains("two.txt");
-    }
-
-    @Test
-    public void givenAbsoluteURIs_whenRelativizeUriOneParentToUriThree_thenAbsoluteIsReturned() {
-        URI result = pathOne.getParent().toUri().relativize(uriThree);
-
-        Assertions.assertThat(result)
-                .asString()
-                .contains("/baeldung/foo/three.txt");
-    }
-
-}
+package com.baeldung.absolutetorelative;
+
+import java.net.URI;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class AbsoluteToRelativeUnitTest {
+
+    // given - until using Paths, no need to create physical files
+    private final Path pathOne = Paths.get("/baeldung/bar/one.txt");
+    private final Path pathTwo = Paths.get("/baeldung/bar/two.txt");
+    private final Path pathThree = Paths.get("/baeldung/foo/three.txt");
+
+    private final URI uriOne = pathOne.toUri();
+    private final URI uriTwo = pathTwo.toUri();
+    private final URI uriThree = pathThree.toUri();
+
+    @Test
+    public void givenAbsolutePaths_whenRelativizePathOneToPathTwo_thenRelativeIsReturned() {
+        Path result = pathOne.relativize(pathTwo);
+
+        org.assertj.core.api.Assertions.assertThat(result)
+                .isRelative()
+                .isEqualTo(Paths.get("../two.txt"));
+    }
+
+    @Test
+    public void givenAbsolutePaths_whenRelativizePathTwoToPathOne_thenRelativeIsReturned() {
+        Path result = pathTwo.relativize(pathOne);
+
+        org.assertj.core.api.Assertions.assertThat(result)
+                .isRelative()
+                .isEqualTo(Paths.get("../one.txt"));
+    }
+
+    @Test
+    public void givenAbsolutePaths_whenRelativizePathOneParentToPathTwo_thenRelativeIsReturned() {
+        Path result = pathOne.getParent().relativize(pathTwo);
+
+        org.assertj.core.api.Assertions.assertThat(result)
+                .isRelative()
+                .isEqualTo(Paths.get("two.txt"));
+    }
+
+    @Test
+    public void givenAbsolutePaths_whenRelativizePathOneToPathThree_thenRelativeIsReturned() {
+        Path result = pathOne.relativize(pathThree);
+
+        org.assertj.core.api.Assertions.assertThat(result)
+                .isRelative()
+                .isEqualTo(Paths.get("../../foo/three.txt"));
+    }
+
+    @Test
+    public void givenAbsolutePaths_whenRelativizePathThreeToPathOne_thenRelativeIsReturned() {
+        Path result = pathThree.relativize(pathOne);
+
+        org.assertj.core.api.Assertions.assertThat(result)
+                .isRelative()
+                .isEqualTo(Paths.get("../../bar/one.txt"));
+    }
+
+    @Test
+    public void givenAbsoluteURIs_whenRelativizeUriOneToUriTwo_thenAbsoluteIsReturned() {
+        URI result = uriOne.relativize(uriTwo);
+
+        org.assertj.core.api.Assertions.assertThat(result)
+                .asString()
+                .contains("/baeldung/bar/two.txt");
+    }
+
+    @Test
+    public void givenAbsoluteURIs_whenRelativizeUriOneParentToUriTwo_thenRelativeIsReturned() {
+        URI result = pathOne.getParent().toUri().relativize(uriTwo);
+
+        org.assertj.core.api.Assertions.assertThat(result)
+                .asString()
+                .contains("two.txt");
+    }
+
+    @Test
+    public void givenAbsoluteURIs_whenRelativizeUriOneParentToUriThree_thenAbsoluteIsReturned() {
+        URI result = pathOne.getParent().toUri().relativize(uriThree);
+
+        org.assertj.core.api.Assertions.assertThat(result)
+                .asString()
+                .contains("/baeldung/foo/three.txt");
+    }
+
+}
diff --git a/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/bufferedreadervsfilereader/BufferedReaderUnitTest.java b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/bufferedreadervsfilereader/BufferedReaderUnitTest.java
new file mode 100644
index 0000000000..06b7d38821
--- /dev/null
+++ b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/bufferedreadervsfilereader/BufferedReaderUnitTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.bufferedreadervsfilereader;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+
+import org.junit.jupiter.api.Assertions;
+import org.testng.annotations.Test;
+public class BufferedReaderUnitTest {
+
+    @Test
+    public void whenReadingAFile_thenReadsLineByLine() {
+        StringBuilder result = new StringBuilder();
+
+        try (BufferedReader br = new BufferedReader(new FileReader("src/test/resources/sampleText1.txt"))) {
+            String line;
+
+            while((line = br.readLine()) != null) {
+                result.append(line);
+                result.append('\n');
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        assertEquals("first line\nsecond line\nthird line\n", result.toString());
+    }
+
+}
diff --git a/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/bufferedreadervsfilereader/FileReaderUnitTest.java b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/bufferedreadervsfilereader/FileReaderUnitTest.java
new file mode 100644
index 0000000000..5df870e7b5
--- /dev/null
+++ b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/bufferedreadervsfilereader/FileReaderUnitTest.java
@@ -0,0 +1,30 @@
+package com.baeldung.bufferedreadervsfilereader;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.FileReader;
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+
+public class FileReaderUnitTest {
+
+    @Test
+    public void whenReadingAFile_thenReadsCharByChar() {
+        StringBuilder result = new StringBuilder();
+
+        try (FileReader fr = new FileReader("src/test/resources/sampleText2.txt")) {
+            int i = fr.read();
+
+            while(i != -1) {
+                result.append((char)i);
+
+                i = fr.read();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        assertEquals("qwerty", result.toString());
+    }
+}
diff --git a/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/multinput/TestMultipleInputsUnitTest.java b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/multinput/TestMultipleInputsUnitTest.java
new file mode 100644
index 0000000000..317d9e817e
--- /dev/null
+++ b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/multinput/TestMultipleInputsUnitTest.java
@@ -0,0 +1,47 @@
+package com.baeldung.multinput;
+    import java.io.ByteArrayInputStream;
+    import java.io.InputStream;
+    import java.util.InputMismatchException;
+    import org.junit.jupiter.api.Assertions;
+    import org.testng.annotations.Test;
+import com.baeldung.multinput.MultiInputs;
+public class TestMultipleInputsUnitTest {
+    @Test
+    public void givenMultipleInputs_whenUsingSpaceDelimiter_thenExpectPrintingOutputs() {
+        String input = "10 20\n";
+        InputStream in = new ByteArrayInputStream(input.getBytes());
+        System.setIn(in);
+        MultiInputs mi = new MultiInputs();
+        mi.UsingSpaceDelimiter();
+        // You can add assertions here to verify the behavior of the method
+    }
+
+    @Test
+    public void givenMultipleInputs_whenUsingREDelimiter_thenExpectPrintingOutputs() {
+        String input = "30, 40\n";
+        InputStream in = new ByteArrayInputStream(input.getBytes());
+        System.setIn(in);
+        MultiInputs mi = new MultiInputs();
+        mi.UsingREDelimiter();
+        // You can add assertions here to verify the behavior of the method
+    }
+
+    @Test
+    public void givenMultipleInputs_whenUsingCustomDelimiter_thenExpectPrintingOutputs() {
+        String input = "50; 60\n";
+        InputStream in = new ByteArrayInputStream(input.getBytes());
+        System.setIn(in);
+        MultiInputs mi = new MultiInputs();
+        mi.UsingCustomDelimiter();
+        // You can add assertions here to verify the behavior of the method
+    }
+
+    @Test
+    public void givenInvalidInput_whenUsingSpaceDelimiter_thenExpectInputMismatchException() {
+        String input = "abc\n";
+        InputStream in = new ByteArrayInputStream(input.getBytes());
+        System.setIn(in);
+        MultiInputs mi = new MultiInputs();
+        Assertions.assertThrows(InputMismatchException.class, mi::UsingSpaceDelimiter);
+    }
+}
diff --git a/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/path/DesktopPathUnitTest.java b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/path/DesktopPathUnitTest.java
new file mode 100644
index 0000000000..1b71512c5c
--- /dev/null
+++ b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/path/DesktopPathUnitTest.java
@@ -0,0 +1,27 @@
+package com.baeldung.path;
+
+import java.io.File;
+
+import javax.swing.filechooser.FileSystemView;
+
+import org.junit.jupiter.api.Test;
+
+public class DesktopPathUnitTest {
+    // Adapt DESKTOP_PATH variable to your own system path
+    // private static final String DESKTOP_PATH = "C:\\Users\\HRAF\\Desktop";
+
+    @Test
+    public void whenUsingGetUserHomeProperty_thenShouldEqualDesktopPath() {
+        String desktopPath = System.getProperty("user.home") + File.separator + "Desktop";
+        // assertEquals(DESKTOP_PATH, desktopPath);
+    }
+
+    @Test
+    public void whenUsingFileSystemViewGetHomeDirectory_thenShouldEqualDesktopPath() {
+        FileSystemView view = FileSystemView.getFileSystemView();
+        File file = view.getHomeDirectory();
+        String path = file.getPath();
+        // assertEquals(DESKTOP_PATH, path);
+    }
+
+}
diff --git a/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/scanner/NextLineVsNextIntUnitTest.java b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/scanner/NextLineVsNextIntUnitTest.java
new file mode 100644
index 0000000000..3aae0469d0
--- /dev/null
+++ b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/scanner/NextLineVsNextIntUnitTest.java
@@ -0,0 +1,85 @@
+package com.baeldung.scanner;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.InputMismatchException;
+import java.util.Scanner;
+
+import org.junit.jupiter.api.Test;
+
+public class NextLineVsNextIntUnitTest {
+
+    @Test
+    void whenInputLineIsNumber_thenNextLineAndNextIntBothWork() {
+        String input = "42\n";
+
+        //nextLine()
+        Scanner sc1 = new Scanner(input);
+        int num1 = Integer.parseInt(sc1.nextLine());
+        assertEquals(42, num1);
+
+        //nextInt()
+        Scanner sc2 = new Scanner(input);
+        int num2 = sc2.nextInt();
+        assertEquals(42, num2);
+
+    }
+
+    @Test
+    void whenInputIsNotValidNumber_thenNextLineAndNextIntThrowDifferentException() {
+        String input = "Nan\n";
+
+        //nextLine() -> NumberFormatException
+        Scanner sc1 = new Scanner(input);
+        assertThrows(NumberFormatException.class, () -> Integer.parseInt(sc1.nextLine()));
+
+        //nextInt() -> InputMismatchException
+        Scanner sc2 = new Scanner(input);
+        assertThrows(InputMismatchException.class, sc2::nextInt);
+    }
+
+    @Test
+    void whenUsingNextInt_thenTheNextTokenAfterItFailsToParseIsNotConsumed() {
+        String input = "42 is a magic number\n";
+
+        //nextInt() to read '42'
+        Scanner sc2 = new Scanner(input);
+        int num2 = sc2.nextInt();
+        assertEquals(42, num2);
+
+        // call nextInt() again on "is"
+        assertThrows(InputMismatchException.class, sc2::nextInt);
+
+        String theNextToken = sc2.next();
+        assertEquals("is", theNextToken);
+
+        theNextToken = sc2.next();
+        assertEquals("a", theNextToken);
+    }
+
+    @Test
+    void whenReadingTwoInputLines_thenNextLineAndNextIntBehaveDifferently() {
+
+        String input = new StringBuilder().append("42\n")
+          .append("It is a magic number.\n")
+          .toString();
+
+        //nextLine()
+        Scanner sc1 = new Scanner(input);
+        int num1 = Integer.parseInt(sc1.nextLine());
+        String nextLineText1 = sc1.nextLine();
+        assertEquals(42, num1);
+        assertEquals("It is a magic number.", nextLineText1);
+
+        //nextInt()
+        Scanner sc2 = new Scanner(input);
+        int num2 = sc2.nextInt();
+        assertEquals(42, num2);
+
+        // nextInt() leaves the newline character (\n) behind
+        String nextLineText2 = sc2.nextLine();
+        assertEquals("", nextLineText2);
+    }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/scanner/ScanACharacterUnitTest.java b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/scanner/ScanACharacterUnitTest.java
index 1a70c6e3af..340b58bbf6 100644
--- a/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/scanner/ScanACharacterUnitTest.java
+++ b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/scanner/ScanACharacterUnitTest.java
@@ -1,38 +1,38 @@
-package com.baeldung.scanner;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.util.Scanner;
-
-import org.junit.jupiter.api.Test;
-
-public class ScanACharacterUnitTest {
-
-    // given - input scanner source, no need to scan from console
-    String input = new StringBuilder().append("abc\n")
-      .append("mno\n")
-      .append("xyz\n")
-      .toString();
-
-    @Test
-    public void givenInputSource_whenScanCharUsingNext_thenOneCharIsRead() {
-        Scanner sc = new Scanner(input);
-        char c = sc.next().charAt(0);
-        assertEquals('a', c);
-    }
-
-    @Test
-    public void givenInputSource_whenScanCharUsingFindInLine_thenOneCharIsRead() {
-        Scanner sc = new Scanner(input);
-        char c = sc.findInLine(".").charAt(0);
-        assertEquals('a', c);
-    }
-
-    @Test
-    public void givenInputSource_whenScanCharUsingUseDelimiter_thenOneCharIsRead() {
-        Scanner sc = new Scanner(input);
-        char c = sc.useDelimiter("").next().charAt(0);
-        assertEquals('a', c);
-    }
-
-}
+package com.baeldung.scanner;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Scanner;
+
+import org.junit.jupiter.api.Test;
+
+public class ScanACharacterUnitTest {
+
+    // given - input scanner source, no need to scan from console
+    String input = new StringBuilder().append("abc\n")
+      .append("mno\n")
+      .append("xyz\n")
+      .toString();
+
+    @Test
+    public void givenInputSource_whenScanCharUsingNext_thenOneCharIsRead() {
+        Scanner sc = new Scanner(input);
+        char c = sc.next().charAt(0);
+        assertEquals('a', c);
+    }
+
+    @Test
+    public void givenInputSource_whenScanCharUsingFindInLine_thenOneCharIsRead() {
+        Scanner sc = new Scanner(input);
+        char c = sc.findInLine(".").charAt(0);
+        assertEquals('a', c);
+    }
+
+    @Test
+    public void givenInputSource_whenScanCharUsingUseDelimiter_thenOneCharIsRead() {
+        Scanner sc = new Scanner(input);
+        char c = sc.useDelimiter("").next().charAt(0);
+        assertEquals('a', c);
+    }
+
+}
diff --git a/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/scanner/ScannerToArrayUnitTest.java b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/scanner/ScannerToArrayUnitTest.java
new file mode 100644
index 0000000000..f64bd7b1fc
--- /dev/null
+++ b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/scanner/ScannerToArrayUnitTest.java
@@ -0,0 +1,107 @@
+package com.baeldung.scanner;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+
+import org.junit.jupiter.api.Test;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.ObjectArrays;
+
+public class ScannerToArrayUnitTest {
+
+    @Test
+    void whenMultipleElementsInOneLine_thenGetExpectedArray() {
+        String input = "Java Kotlin Ruby Python Go\n";
+        String[] expected = new String[] { "Java", "Kotlin", "Ruby", "Python", "Go" };
+
+        // scanner.next()
+        Scanner scanner1 = new Scanner(input);
+        String[] result1 = new String[5];
+        int i = 0;
+        while (i < result1.length) {
+            result1[i] = scanner1.next();
+            i++;
+        }
+        assertArrayEquals(expected, result1);
+
+        //split()
+        Scanner scanner2 = new Scanner(input);
+        String[] result2 = scanner2.nextLine()
+          .split("\\s+");
+        assertArrayEquals(expected, result2);
+    }
+
+    @Test
+    void whenOneElementPerLine_thenGetExpectedArray() {
+        String input = new StringBuilder().append("Baeldung Java\n")
+          .append("Baeldung Kotlin\n")
+          .append("Baeldung Linux\n")
+          .toString();
+
+        String[] expected = new String[] { "Baeldung Java", "Baeldung Kotlin", "Baeldung Linux" };
+
+        String[] result = new String[3];
+        Scanner scanner = new Scanner(input);
+        int i = 0;
+        while (i < result.length) {
+            result[i] = scanner.nextLine();
+            i++;
+        }
+        assertArrayEquals(expected, result);
+    }
+
+    @Test
+    void whenOneElementPerLine_thenGetExpectedList() {
+        String input = new StringBuilder().append("Baeldung Java\n")
+          .append("Baeldung Kotlin\n")
+          .append("Baeldung Linux\n")
+          .toString();
+
+        List<String> expected = Lists.newArrayList("Baeldung Java", "Baeldung Kotlin", "Baeldung Linux");
+
+        List<String> result = new ArrayList<>();
+        Scanner scanner = new Scanner(input);
+        while (scanner.hasNextLine()) {
+            result.add(scanner.nextLine());
+        }
+        assertEquals(expected, result);
+    }
+
+    @Test
+    void whenEveryTokenIsAnElement_thenGetExpectedList() {
+        String input = new StringBuilder().append("Linux Windows MacOS\n")
+          .append("Java Kotlin Python Go\n")
+          .toString();
+
+        List<String> expected = Lists.newArrayList("Linux", "Windows", "MacOS", "Java", "Kotlin", "Python", "Go");
+        List<String> result = new ArrayList<>();
+        Scanner scanner = new Scanner(input);
+        while (scanner.hasNext()) {
+            result.add(scanner.next());
+        }
+        assertEquals(expected, result);
+    }
+
+    @Test
+    void whenEveryTokenIsAnElement_thenGetExpectedArray() {
+        String input = new StringBuilder().append("Linux Windows MacOS\n")
+          .append("Java Kotlin Python Go\n")
+          .toString();
+
+        String[] expected = new String[] { "Linux", "Windows", "MacOS", "Java", "Kotlin", "Python", "Go" };
+        String[] result = new String[] {};
+
+        Scanner scanner = new Scanner(input);
+        while (scanner.hasNextLine()) {
+            String[] lineInArray = scanner.nextLine()
+              .split("\\s+");
+            result = ObjectArrays.concat(result, lineInArray, String.class);
+        }
+        assertArrayEquals(expected, result);
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-io-apis-2/src/test/resources/sampleText1.txt b/core-java-modules/core-java-io-apis-2/src/test/resources/sampleText1.txt
new file mode 100644
index 0000000000..ea0584cfe0
--- /dev/null
+++ b/core-java-modules/core-java-io-apis-2/src/test/resources/sampleText1.txt
@@ -0,0 +1,3 @@
+first line
+second line
+third line
diff --git a/core-java-modules/core-java-io-apis-2/src/test/resources/sampleText2.txt b/core-java-modules/core-java-io-apis-2/src/test/resources/sampleText2.txt
new file mode 100644
index 0000000000..f2289097d4
--- /dev/null
+++ b/core-java-modules/core-java-io-apis-2/src/test/resources/sampleText2.txt
@@ -0,0 +1 @@
+qwerty
\ No newline at end of file
diff --git a/core-java-modules/core-java-io-apis/pom.xml b/core-java-modules/core-java-io-apis/pom.xml
index fab2bff959..f9d404cd5b 100644
--- a/core-java-modules/core-java-io-apis/pom.xml
+++ b/core-java-modules/core-java-io-apis/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-io-apis</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-io-apis</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-io-conversions-2/pom.xml b/core-java-modules/core-java-io-conversions-2/pom.xml
index 24708ad967..2c49bbfd81 100644
--- a/core-java-modules/core-java-io-conversions-2/pom.xml
+++ b/core-java-modules/core-java-io-conversions-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-io-conversions-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-io-conversions-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-io-conversions-2/src/test/java/com/baeldung/inputstreamtostring/JavaInputStreamToXUnitTest.java b/core-java-modules/core-java-io-conversions-2/src/test/java/com/baeldung/inputstreamtostring/JavaInputStreamToXUnitTest.java
index 03f528766b..341a820b01 100644
--- a/core-java-modules/core-java-io-conversions-2/src/test/java/com/baeldung/inputstreamtostring/JavaInputStreamToXUnitTest.java
+++ b/core-java-modules/core-java-io-conversions-2/src/test/java/com/baeldung/inputstreamtostring/JavaInputStreamToXUnitTest.java
@@ -49,7 +49,7 @@ public class JavaInputStreamToXUnitTest {
         final InputStream inputStream = new ByteArrayInputStream(originalString.getBytes());
 
         final StringBuilder textBuilder = new StringBuilder();
-        try (Reader reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName(StandardCharsets.UTF_8.name())))) {
+        try (Reader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))) {
             int c;
             while ((c = reader.read()) != -1) {
                 textBuilder.append((char) c);
@@ -63,7 +63,7 @@ public class JavaInputStreamToXUnitTest {
         final String originalString = randomAlphabetic(DEFAULT_SIZE);
         final InputStream inputStream = new ByteArrayInputStream(originalString.getBytes());
 
-        final String text = new BufferedReader(new InputStreamReader(inputStream, Charset.forName(StandardCharsets.UTF_8.name())))
+        final String text = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))
           .lines()
           .collect(Collectors.joining("\n"));
 
diff --git a/core-java-modules/core-java-io-conversions/pom.xml b/core-java-modules/core-java-io-conversions/pom.xml
index 8d5a47a1ac..a44c352df2 100644
--- a/core-java-modules/core-java-io-conversions/pom.xml
+++ b/core-java-modules/core-java-io-conversions/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-io-conversions</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-io-conversions</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-io/pom.xml b/core-java-modules/core-java-io/pom.xml
index e645534b46..ce072e6875 100644
--- a/core-java-modules/core-java-io/pom.xml
+++ b/core-java-modules/core-java-io/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-io</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-io</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-jar/pom.xml b/core-java-modules/core-java-jar/pom.xml
index 0ce2414f1e..e4a43bdf1f 100644
--- a/core-java-modules/core-java-jar/pom.xml
+++ b/core-java-modules/core-java-jar/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-jar</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-jar</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-jndi/pom.xml b/core-java-modules/core-java-jndi/pom.xml
index 23a2fe3bfb..e48bec6622 100644
--- a/core-java-modules/core-java-jndi/pom.xml
+++ b/core-java-modules/core-java-jndi/pom.xml
@@ -3,9 +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>
-    <groupId>com.baeldung.jndi</groupId>
     <artifactId>core-java-jndi</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>core-java-jndi</name>
 
     <parent>
@@ -51,6 +49,18 @@
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
+                <configuration combine.self="override">
+                    <forkCount>3</forkCount>
+                    <reuseForks>false</reuseForks>
+                    <includes>
+                        <include>SpringContextTest</include>
+                        <include>**/*UnitTest</include>
+                    </includes>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/exceptions/JndiExceptionsUnitTest.java b/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/exceptions/JndiExceptionsUnitTest.java
index 77f1e52f08..4d202f8f0c 100644
--- a/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/exceptions/JndiExceptionsUnitTest.java
+++ b/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/exceptions/JndiExceptionsUnitTest.java
@@ -21,7 +21,6 @@ public class JndiExceptionsUnitTest {
 
     @Test
     @Order(1)
-    @Disabled
     void givenNoContext_whenLookupObject_thenThrowNoInitialContext() {
         assertThrows(NoInitialContextException.class, () -> {
             JndiTemplate jndiTemplate = new JndiTemplate();
diff --git a/core-java-modules/core-java-jpms/pom.xml b/core-java-modules/core-java-jpms/pom.xml
index 62aa49f299..3cfa0e3f45 100644
--- a/core-java-modules/core-java-jpms/pom.xml
+++ b/core-java-modules/core-java-jpms/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-jpms</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>core-java-jpms</name>
     <packaging>pom</packaging>
 
@@ -15,8 +14,8 @@
     </parent>
 
     <modules>
-        <module>decoupling-pattern1</module>
-        <module>decoupling-pattern2</module>
+        <module>service-provider-factory-pattern</module>
+        <module>service-loader-api-pattern</module>
     </modules>
 
     <build>
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule2/pom.xml b/core-java-modules/core-java-jpms/service-loader-api-pattern/consumermodule2/pom.xml
similarity index 92%
rename from core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule2/pom.xml
rename to core-java-modules/core-java-jpms/service-loader-api-pattern/consumermodule2/pom.xml
index 13d0b2d201..f928912ffd 100644
--- a/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule2/pom.xml
+++ b/core-java-modules/core-java-jpms/service-loader-api-pattern/consumermodule2/pom.xml
@@ -8,8 +8,8 @@
     <version>1.0</version>
 
     <parent>
-        <groupId>com.baeldung.decoupling-pattern2</groupId>
-        <artifactId>decoupling-pattern2</artifactId>
+        <groupId>com.baeldung.service-loader-api-pattern</groupId>
+        <artifactId>service-loader-api-pattern</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule2/src/main/java/com/baeldung/consumermodule/Application.java b/core-java-modules/core-java-jpms/service-loader-api-pattern/consumermodule2/src/main/java/com/baeldung/consumermodule/Application.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule2/src/main/java/com/baeldung/consumermodule/Application.java
rename to core-java-modules/core-java-jpms/service-loader-api-pattern/consumermodule2/src/main/java/com/baeldung/consumermodule/Application.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule2/src/main/java/module-info.java b/core-java-modules/core-java-jpms/service-loader-api-pattern/consumermodule2/src/main/java/module-info.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule2/src/main/java/module-info.java
rename to core-java-modules/core-java-jpms/service-loader-api-pattern/consumermodule2/src/main/java/module-info.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/pom.xml b/core-java-modules/core-java-jpms/service-loader-api-pattern/pom.xml
similarity index 92%
rename from core-java-modules/core-java-jpms/decoupling-pattern2/pom.xml
rename to core-java-modules/core-java-jpms/service-loader-api-pattern/pom.xml
index 5b2e4cfc82..13a443eab5 100644
--- a/core-java-modules/core-java-jpms/decoupling-pattern2/pom.xml
+++ b/core-java-modules/core-java-jpms/service-loader-api-pattern/pom.xml
@@ -3,8 +3,8 @@
     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>
-    <groupId>com.baeldung.decoupling-pattern2</groupId>
-    <artifactId>decoupling-pattern2</artifactId>
+    <groupId>com.baeldung.service-loader-api-pattern</groupId>
+    <artifactId>service-loader-api-pattern</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/providermodule/pom.xml b/core-java-modules/core-java-jpms/service-loader-api-pattern/providermodule/pom.xml
similarity index 91%
rename from core-java-modules/core-java-jpms/decoupling-pattern2/providermodule/pom.xml
rename to core-java-modules/core-java-jpms/service-loader-api-pattern/providermodule/pom.xml
index ddb8aeccd1..bcee01f631 100644
--- a/core-java-modules/core-java-jpms/decoupling-pattern2/providermodule/pom.xml
+++ b/core-java-modules/core-java-jpms/service-loader-api-pattern/providermodule/pom.xml
@@ -8,8 +8,8 @@
     <version>1.0</version>
 
     <parent>
-        <groupId>com.baeldung.decoupling-pattern2</groupId>
-        <artifactId>decoupling-pattern2</artifactId>
+        <groupId>com.baeldung.service-loader-api-pattern</groupId>
+        <artifactId>service-loader-api-pattern</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/providermodule/src/main/java/com/baeldung/providermodule/LowercaseTextService.java b/core-java-modules/core-java-jpms/service-loader-api-pattern/providermodule/src/main/java/com/baeldung/providermodule/LowercaseTextService.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern2/providermodule/src/main/java/com/baeldung/providermodule/LowercaseTextService.java
rename to core-java-modules/core-java-jpms/service-loader-api-pattern/providermodule/src/main/java/com/baeldung/providermodule/LowercaseTextService.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/providermodule/src/main/java/module-info.java b/core-java-modules/core-java-jpms/service-loader-api-pattern/providermodule/src/main/java/module-info.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern2/providermodule/src/main/java/module-info.java
rename to core-java-modules/core-java-jpms/service-loader-api-pattern/providermodule/src/main/java/module-info.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule2/pom.xml b/core-java-modules/core-java-jpms/service-loader-api-pattern/servicemodule2/pom.xml
similarity index 88%
rename from core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule2/pom.xml
rename to core-java-modules/core-java-jpms/service-loader-api-pattern/servicemodule2/pom.xml
index 06ef900092..f40745541b 100644
--- a/core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule2/pom.xml
+++ b/core-java-modules/core-java-jpms/service-loader-api-pattern/servicemodule2/pom.xml
@@ -8,8 +8,8 @@
     <version>1.0</version>
 
     <parent>
-        <groupId>com.baeldung.decoupling-pattern2</groupId>
-        <artifactId>decoupling-pattern2</artifactId>
+        <groupId>com.baeldung.service-loader-api-pattern</groupId>
+        <artifactId>service-loader-api-pattern</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule2/src/main/java/com/baeldung/servicemodule/TextService.java b/core-java-modules/core-java-jpms/service-loader-api-pattern/servicemodule2/src/main/java/com/baeldung/servicemodule/TextService.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule2/src/main/java/com/baeldung/servicemodule/TextService.java
rename to core-java-modules/core-java-jpms/service-loader-api-pattern/servicemodule2/src/main/java/com/baeldung/servicemodule/TextService.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule2/src/main/java/module-info.java b/core-java-modules/core-java-jpms/service-loader-api-pattern/servicemodule2/src/main/java/module-info.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule2/src/main/java/module-info.java
rename to core-java-modules/core-java-jpms/service-loader-api-pattern/servicemodule2/src/main/java/module-info.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule1/pom.xml b/core-java-modules/core-java-jpms/service-provider-factory-pattern/consumermodule1/pom.xml
similarity index 89%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule1/pom.xml
rename to core-java-modules/core-java-jpms/service-provider-factory-pattern/consumermodule1/pom.xml
index f82e72b85d..ba92733f34 100644
--- a/core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule1/pom.xml
+++ b/core-java-modules/core-java-jpms/service-provider-factory-pattern/consumermodule1/pom.xml
@@ -8,8 +8,8 @@
     <packaging>jar</packaging>
 
     <parent>
-        <groupId>com.baeldung.decoupling-pattern1</groupId>
-        <artifactId>decoupling-pattern1</artifactId>
+        <groupId>com.baeldung.service-provider-factory-pattern</groupId>
+        <artifactId>service-provider-factory-pattern</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule1/src/main/java/com/baeldung/consumermodule/Application.java b/core-java-modules/core-java-jpms/service-provider-factory-pattern/consumermodule1/src/main/java/com/baeldung/consumermodule/Application.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule1/src/main/java/com/baeldung/consumermodule/Application.java
rename to core-java-modules/core-java-jpms/service-provider-factory-pattern/consumermodule1/src/main/java/com/baeldung/consumermodule/Application.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule1/src/main/java/module-info.java b/core-java-modules/core-java-jpms/service-provider-factory-pattern/consumermodule1/src/main/java/module-info.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule1/src/main/java/module-info.java
rename to core-java-modules/core-java-jpms/service-provider-factory-pattern/consumermodule1/src/main/java/module-info.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/pom.xml b/core-java-modules/core-java-jpms/service-provider-factory-pattern/pom.xml
similarity index 91%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/pom.xml
rename to core-java-modules/core-java-jpms/service-provider-factory-pattern/pom.xml
index 2121b46b82..35a9912312 100644
--- a/core-java-modules/core-java-jpms/decoupling-pattern1/pom.xml
+++ b/core-java-modules/core-java-jpms/service-provider-factory-pattern/pom.xml
@@ -3,8 +3,8 @@
     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>
-    <groupId>com.baeldung.decoupling-pattern1</groupId>
-    <artifactId>decoupling-pattern1</artifactId>
+    <groupId>com.baeldung.service-provider-factory-pattern</groupId>
+    <artifactId>service-provider-factory-pattern</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/pom.xml b/core-java-modules/core-java-jpms/service-provider-factory-pattern/servicemodule1/pom.xml
similarity index 86%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/pom.xml
rename to core-java-modules/core-java-jpms/service-provider-factory-pattern/servicemodule1/pom.xml
index fc4b5854f9..d6e50ee9ff 100644
--- a/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/pom.xml
+++ b/core-java-modules/core-java-jpms/service-provider-factory-pattern/servicemodule1/pom.xml
@@ -9,8 +9,8 @@
     <packaging>jar</packaging>
 
     <parent>
-        <groupId>com.baeldung.decoupling-pattern1</groupId>
-        <artifactId>decoupling-pattern1</artifactId>
+        <groupId>com.baeldung.service-provider-factory-pattern</groupId>
+        <artifactId>service-provider-factory-pattern</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/com/baeldung/servicemodule/external/TextService.java b/core-java-modules/core-java-jpms/service-provider-factory-pattern/servicemodule1/src/main/java/com/baeldung/servicemodule/external/TextService.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/com/baeldung/servicemodule/external/TextService.java
rename to core-java-modules/core-java-jpms/service-provider-factory-pattern/servicemodule1/src/main/java/com/baeldung/servicemodule/external/TextService.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/com/baeldung/servicemodule/external/TextServiceFactory.java b/core-java-modules/core-java-jpms/service-provider-factory-pattern/servicemodule1/src/main/java/com/baeldung/servicemodule/external/TextServiceFactory.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/com/baeldung/servicemodule/external/TextServiceFactory.java
rename to core-java-modules/core-java-jpms/service-provider-factory-pattern/servicemodule1/src/main/java/com/baeldung/servicemodule/external/TextServiceFactory.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/com/baeldung/servicemodule/internal/LowercaseTextService.java b/core-java-modules/core-java-jpms/service-provider-factory-pattern/servicemodule1/src/main/java/com/baeldung/servicemodule/internal/LowercaseTextService.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/com/baeldung/servicemodule/internal/LowercaseTextService.java
rename to core-java-modules/core-java-jpms/service-provider-factory-pattern/servicemodule1/src/main/java/com/baeldung/servicemodule/internal/LowercaseTextService.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/com/baeldung/servicemodule/internal/UppercaseTextService.java b/core-java-modules/core-java-jpms/service-provider-factory-pattern/servicemodule1/src/main/java/com/baeldung/servicemodule/internal/UppercaseTextService.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/com/baeldung/servicemodule/internal/UppercaseTextService.java
rename to core-java-modules/core-java-jpms/service-provider-factory-pattern/servicemodule1/src/main/java/com/baeldung/servicemodule/internal/UppercaseTextService.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/module-info.java b/core-java-modules/core-java-jpms/service-provider-factory-pattern/servicemodule1/src/main/java/module-info.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/module-info.java
rename to core-java-modules/core-java-jpms/service-provider-factory-pattern/servicemodule1/src/main/java/module-info.java
diff --git a/core-java-modules/core-java-jvm-2/pom.xml b/core-java-modules/core-java-jvm-2/pom.xml
index 01628b0908..2ccc847a6f 100644
--- a/core-java-modules/core-java-jvm-2/pom.xml
+++ b/core-java-modules/core-java-jvm-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-jvm-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-jvm-2</name>
     <packaging>jar</packaging>
 
@@ -27,9 +26,28 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <compilerArgs>
+                        <arg>--add-exports=java.base/jdk.internal.vm.annotation=ALL-UNNAMED</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <jol-core.version>0.10</jol-core.version>
         <reflections.version>0.10.2</reflections.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-jvm-2/src/test/java/com/baeldung/memlayout/MemoryLayoutUnitTest.java b/core-java-modules/core-java-jvm-2/src/test/java/com/baeldung/memlayout/MemoryLayoutUnitTest.java
index 2f226d7657..760115877e 100644
--- a/core-java-modules/core-java-jvm-2/src/test/java/com/baeldung/memlayout/MemoryLayoutUnitTest.java
+++ b/core-java-modules/core-java-jvm-2/src/test/java/com/baeldung/memlayout/MemoryLayoutUnitTest.java
@@ -3,7 +3,8 @@ package com.baeldung.memlayout;
 import org.junit.Test;
 import org.openjdk.jol.info.ClassLayout;
 import org.openjdk.jol.vm.VM;
-import sun.misc.Contended;
+
+import jdk.internal.vm.annotation.Contended;
 
 public class MemoryLayoutUnitTest {
 
diff --git a/core-java-modules/core-java-jvm-3/README.md b/core-java-modules/core-java-jvm-3/README.md
index 0c8a325cf2..3ff393a5ad 100644
--- a/core-java-modules/core-java-jvm-3/README.md
+++ b/core-java-modules/core-java-jvm-3/README.md
@@ -6,4 +6,5 @@ This module contains articles about working with the Java Virtual Machine (JVM).
 
 - [Difference Between Class.getResource() and ClassLoader.getResource()](https://www.baeldung.com/java-class-vs-classloader-getresource)
 - [Compiling and Executing Code From a String in Java](https://www.baeldung.com/java-string-compile-execute-code)
+- [Difference Between Class.forName() and Class.forName().newInstance()](https://www.baeldung.com/java-class-forname-vs-class-forname-newinstance)
 - More articles: [[<-- prev]](/core-java-modules/core-java-jvm-2)
diff --git a/core-java-modules/core-java-jvm-3/pom.xml b/core-java-modules/core-java-jvm-3/pom.xml
index cb2d8b0b85..78f4201c94 100644
--- a/core-java-modules/core-java-jvm-3/pom.xml
+++ b/core-java-modules/core-java-jvm-3/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-jvm-3</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-jvm-3</name>
     <packaging>jar</packaging>
 
@@ -14,7 +13,4 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
-    <dependencies>
-    </dependencies>
-
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/loadclass/MyClassForLoad.java b/core-java-modules/core-java-jvm-3/src/main/java/com/baeldung/loadclass/MyClassForLoad.java
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/loadclass/MyClassForLoad.java
rename to core-java-modules/core-java-jvm-3/src/main/java/com/baeldung/loadclass/MyClassForLoad.java
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/loadclass/LoadClassUnitTest.java b/core-java-modules/core-java-jvm-3/src/test/java/com/baeldung/loadclass/LoadClassUnitTest.java
similarity index 100%
rename from core-java-modules/core-java/src/test/java/com/baeldung/loadclass/LoadClassUnitTest.java
rename to core-java-modules/core-java-jvm-3/src/test/java/com/baeldung/loadclass/LoadClassUnitTest.java
diff --git a/core-java-modules/core-java-jvm/pom.xml b/core-java-modules/core-java-jvm/pom.xml
index d26c72323f..52bdf8bc5d 100644
--- a/core-java-modules/core-java-jvm/pom.xml
+++ b/core-java-modules/core-java-jvm/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-jvm</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-jvm</name>
     <packaging>jar</packaging>
 
@@ -30,13 +29,6 @@
             <artifactId>esapi</artifactId>
             <version>${esapi.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.sun</groupId>
-            <artifactId>tools</artifactId>
-            <version>${sun.tools.version}</version>
-            <scope>system</scope>
-            <systemPath>${java.home}/../lib/tools.jar</systemPath>
-        </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
@@ -176,9 +168,8 @@
 
     <properties>
         <javaassist.version>3.27.0-GA</javaassist.version>
-        <sun.tools.version>1.8.0</sun.tools.version>
         <jol-core.version>0.10</jol-core.version>
-        <asm.version>8.0.1</asm.version>
+        <asm.version>9.4</asm.version>
         <bcel.version>6.5.0</bcel.version>
     </properties>
 
diff --git a/core-java-modules/core-java-jvm/src/main/java/com/baeldung/classloader/PrintClassLoader.java b/core-java-modules/core-java-jvm/src/main/java/com/baeldung/classloader/PrintClassLoader.java
index 09ee68bf6e..cd7000b419 100644
--- a/core-java-modules/core-java-jvm/src/main/java/com/baeldung/classloader/PrintClassLoader.java
+++ b/core-java-modules/core-java-jvm/src/main/java/com/baeldung/classloader/PrintClassLoader.java
@@ -1,13 +1,7 @@
 package com.baeldung.classloader;
 
-import com.sun.javafx.util.Logging;
+import java.sql.DriverManager;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
 import java.util.ArrayList;
 
 public class PrintClassLoader {
@@ -15,7 +9,7 @@ public class PrintClassLoader {
     public void printClassLoaders() throws ClassNotFoundException {
 
         System.out.println("Classloader of this class:" + PrintClassLoader.class.getClassLoader());
-        System.out.println("Classloader of Logging:" + Logging.class.getClassLoader());
+        System.out.println("Classloader of DriverManager:" + DriverManager.class.getClassLoader());
         System.out.println("Classloader of ArrayList:" + ArrayList.class.getClassLoader());
 
     }
diff --git a/core-java-modules/core-java-jvm/src/test/java/com/baeldung/bytecode/ViewBytecodeUnitTest.java b/core-java-modules/core-java-jvm/src/test/java/com/baeldung/bytecode/ViewBytecodeUnitTest.java
index 5b0fdf26d4..2a7366c322 100644
--- a/core-java-modules/core-java-jvm/src/test/java/com/baeldung/bytecode/ViewBytecodeUnitTest.java
+++ b/core-java-modules/core-java-jvm/src/test/java/com/baeldung/bytecode/ViewBytecodeUnitTest.java
@@ -33,7 +33,7 @@ public class ViewBytecodeUnitTest {
         JavaClass objectClazz = Repository.lookupClass("java.lang.Object");
         
         assertEquals(objectClazz.getClassName(), "java.lang.Object");   
-        assertEquals(objectClazz.getMethods().length, 14);
+        assertEquals(objectClazz.getMethods().length, 12);
         assertTrue(objectClazz.toString().contains("public class java.lang.Object"));
     }
     
@@ -43,7 +43,7 @@ public class ViewBytecodeUnitTest {
         ClassFile cf = cp.get("java.lang.Object").getClassFile();
         
         assertEquals(cf.getName(), "java.lang.Object");
-        assertEquals(cf.getMethods().size(), 14);
+        assertEquals(cf.getMethods().size(), 12);
     }
     
 }
diff --git a/core-java-modules/core-java-lambdas/pom.xml b/core-java-modules/core-java-lambdas/pom.xml
index f1e61ab8bf..a7fc5355d7 100644
--- a/core-java-modules/core-java-lambdas/pom.xml
+++ b/core-java-modules/core-java-lambdas/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-lambdas</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lambdas</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-lang-2/pom.xml b/core-java-modules/core-java-lang-2/pom.xml
index 4a89a22577..22055cf252 100644
--- a/core-java-modules/core-java-lang-2/pom.xml
+++ b/core-java-modules/core-java-lang-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-lang-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lang-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-lang-2/src/test/java/com/baeldung/headlessmode/HeadlessModeUnitTest.java b/core-java-modules/core-java-lang-2/src/test/java/com/baeldung/headlessmode/HeadlessModeUnitTest.java
index a17c1600f3..d64d8c16da 100644
--- a/core-java-modules/core-java-lang-2/src/test/java/com/baeldung/headlessmode/HeadlessModeUnitTest.java
+++ b/core-java-modules/core-java-lang-2/src/test/java/com/baeldung/headlessmode/HeadlessModeUnitTest.java
@@ -3,13 +3,12 @@ package com.baeldung.headlessmode;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-import java.awt.Canvas;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Frame;
-import java.awt.GraphicsEnvironment;
-import java.awt.HeadlessException;
+import java.awt.*;
 import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
+import java.awt.image.ComponentColorModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.WritableRaster;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -58,7 +57,7 @@ public class HeadlessModeUnitTest {
         boolean result = false;
         try (InputStream inStream = HeadlessModeUnitTest.class.getResourceAsStream(IN_FILE); FileOutputStream outStream = new FileOutputStream(OUT_FILE)) {
             BufferedImage inputImage = ImageIO.read(inStream);
-            result = ImageIO.write(inputImage, FORMAT, outStream);
+            result = ImageIO.write(removeAlphaChannel(inputImage), FORMAT, outStream);
         }
 
         assertThat(result).isTrue();
@@ -84,4 +83,10 @@ public class HeadlessModeUnitTest {
         assertThat(FlexibleApp.iAmFlexible()).isEqualTo(FlexibleApp.HEADED);
     }
 
+    private BufferedImage removeAlphaChannel(BufferedImage inputImage) {
+        final WritableRaster raster = inputImage.getRaster();
+        final WritableRaster newRaster = raster.createWritableChild(0, 0, inputImage.getWidth(), inputImage.getHeight(), 0, 0, new int[]{0, 1, 2});
+        ColorModel newCM = new ComponentColorModel(inputImage.getColorModel().getColorSpace(), false, false, Transparency.OPAQUE, DataBuffer.TYPE_BYTE);
+        return new BufferedImage(newCM, newRaster, false, null);
+    }
 }
diff --git a/core-java-modules/core-java-lang-3/pom.xml b/core-java-modules/core-java-lang-3/pom.xml
index 331d91dff6..f29fa6494a 100644
--- a/core-java-modules/core-java-lang-3/pom.xml
+++ b/core-java-modules/core-java-lang-3/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-lang-3</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lang-3</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-lang-4/pom.xml b/core-java-modules/core-java-lang-4/pom.xml
index de67ddf55a..6977621a0e 100644
--- a/core-java-modules/core-java-lang-4/pom.xml
+++ b/core-java-modules/core-java-lang-4/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-lang-4</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lang-4</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-lang-5/README.md b/core-java-modules/core-java-lang-5/README.md
index 5ff3e83d2c..b8deff199e 100644
--- a/core-java-modules/core-java-lang-5/README.md
+++ b/core-java-modules/core-java-lang-5/README.md
@@ -14,4 +14,3 @@ This module contains articles about core features in the Java language
 - [Convert Between int and char in Java](https://www.baeldung.com/java-convert-int-char)
 - [Converting a Number from One Base to Another in Java](https://www.baeldung.com/java-converting-a-number-from-one-base-to-another)
 - [Check if Command-Line Arguments Are Null in Java](https://www.baeldung.com/java-check-command-line-args)
-- [Determine if a Class Implements an Interface in Java](https://www.baeldung.com/java-check-class-implements-interface)
diff --git a/core-java-modules/core-java-lang-5/pom.xml b/core-java-modules/core-java-lang-5/pom.xml
index 767ebb6e35..8e95fc4405 100644
--- a/core-java-modules/core-java-lang-5/pom.xml
+++ b/core-java-modules/core-java-lang-5/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-lang-5</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lang-5</name>
     <packaging>jar</packaging>
 
@@ -13,12 +12,6 @@
         <artifactId>core-java-modules</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    
-    <properties>
-        <commons-lang3.version>3.12.0</commons-lang3.version>
-        <reflections.version>0.10.2</reflections.version>
-    </properties>
-    
 
     <build>
         <finalName>core-java-lang-5</finalName>
@@ -30,18 +23,9 @@
         </resources>
     </build>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-    
-        <dependency>
-            <groupId>org.reflections</groupId>
-            <artifactId>reflections</artifactId>
-            <version>${reflections.version}</version>
-        </dependency>
-    </dependencies>
-    
+    <properties>
+        <commons-lang3.version>3.12.0</commons-lang3.version>
+        <reflections.version>0.10.2</reflections.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/rawtypes/RawTypesUnitTest.java b/core-java-modules/core-java-lang-5/src/test/java/com/baeldung/rawtypes/RawTypesUnitTest.java
similarity index 100%
rename from core-java-modules/core-java/src/test/java/com/baeldung/rawtypes/RawTypesUnitTest.java
rename to core-java-modules/core-java-lang-5/src/test/java/com/baeldung/rawtypes/RawTypesUnitTest.java
diff --git a/core-java-modules/core-java-lang-math-2/pom.xml b/core-java-modules/core-java-lang-math-2/pom.xml
index e6ead53350..223c791d35 100644
--- a/core-java-modules/core-java-lang-math-2/pom.xml
+++ b/core-java-modules/core-java-lang-math-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-lang-math-2</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>core-java-lang-math-2</name>
 
     <parent>
diff --git a/core-java-modules/core-java-lang-math-3/README.md b/core-java-modules/core-java-lang-math-3/README.md
index 89adc23100..847bd314a7 100644
--- a/core-java-modules/core-java-lang-math-3/README.md
+++ b/core-java-modules/core-java-lang-math-3/README.md
@@ -10,4 +10,5 @@
 - [Create a BMI Calculator in Java](https://www.baeldung.com/java-body-mass-index-calculator)
 - [Java Program to Calculate the Standard Deviation](https://www.baeldung.com/java-calculate-standard-deviation)
 - [Java Program to Print Pascal’s Triangle](https://www.baeldung.com/java-pascal-triangle)
+- [Java Money and the Currency API](http://www.baeldung.com/java-money-and-currency)
 - More articles: [[<-- Prev]](/core-java-modules/core-java-lang-math-2)
diff --git a/core-java-modules/core-java-lang-math-3/pom.xml b/core-java-modules/core-java-lang-math-3/pom.xml
index 38cb6dfa17..7860f57735 100644
--- a/core-java-modules/core-java-lang-math-3/pom.xml
+++ b/core-java-modules/core-java-lang-math-3/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-lang-math-3</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>core-java-lang-math-3</name>
 
     <parent>
@@ -24,11 +23,17 @@
             <artifactId>javaluator</artifactId>
             <version>${javaluator.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.javamoney</groupId>
+            <artifactId>moneta</artifactId>
+            <version>${javamoney.moneta.version}</version>
+        </dependency>
     </dependencies>
 
     <properties>
         <exp4j.version>0.4.8</exp4j.version>
         <javaluator.version>3.0.3</javaluator.version>
+        <javamoney.moneta.version>1.1</javamoney.moneta.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/money/JavaMoney.java b/core-java-modules/core-java-lang-math-3/src/main/java/com/baeldung/money/JavaMoney.java
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/money/JavaMoney.java
rename to core-java-modules/core-java-lang-math-3/src/main/java/com/baeldung/money/JavaMoney.java
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/money/JavaMoneyUnitManualTest.java b/core-java-modules/core-java-lang-math-3/src/test/java/com/baeldung/money/JavaMoneyUnitManualTest.java
similarity index 100%
rename from core-java-modules/core-java/src/test/java/com/baeldung/money/JavaMoneyUnitManualTest.java
rename to core-java-modules/core-java-lang-math-3/src/test/java/com/baeldung/money/JavaMoneyUnitManualTest.java
diff --git a/core-java-modules/core-java-lang-math/pom.xml b/core-java-modules/core-java-lang-math/pom.xml
index 37550b67d8..551e5db1d5 100644
--- a/core-java-modules/core-java-lang-math/pom.xml
+++ b/core-java-modules/core-java-lang-math/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-lang-math</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lang-math</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-lang-oop-constructors-2/README.md b/core-java-modules/core-java-lang-oop-constructors-2/README.md
new file mode 100644
index 0000000000..d9b162c7a6
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-constructors-2/README.md
@@ -0,0 +1,7 @@
+## Core Java Lang OOP - Constructors - Part 2
+
+This module contains article about constructors in Java
+
+### Relevant Articles:
+- [Different Ways to Create an Object in Java](https://www.baeldung.com/java-different-ways-to-create-objects)
+- More articles: [[<-- Prev]](/core-java-modules/core-java-lang-oop-constructors)
\ No newline at end of file
diff --git a/core-java-modules/core-java-lang-oop-constructors-2/pom.xml b/core-java-modules/core-java-lang-oop-constructors-2/pom.xml
new file mode 100644
index 0000000000..c6d9d84774
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-constructors-2/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>core-java-lang-oop-constructors-2</artifactId>
+    <name>core-java-lang-oop-constructors-2</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <artifactId>core-java-modules</artifactId>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-lang-oop-constructors-2/src/main/java/com/baeldung/objectcreation/objects/ClonableRabbit.java b/core-java-modules/core-java-lang-oop-constructors-2/src/main/java/com/baeldung/objectcreation/objects/ClonableRabbit.java
new file mode 100644
index 0000000000..0d97e010fb
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-constructors-2/src/main/java/com/baeldung/objectcreation/objects/ClonableRabbit.java
@@ -0,0 +1,18 @@
+package com.baeldung.objectcreation.objects;
+
+public class ClonableRabbit implements Cloneable {
+
+    String name = "";
+
+    public ClonableRabbit(String name) {
+        this.name = name;
+    }
+    
+    public String getName() {
+        return name;
+    }
+    
+    public Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
+}
diff --git a/core-java-modules/core-java-lang-oop-constructors-2/src/main/java/com/baeldung/objectcreation/objects/Rabbit.java b/core-java-modules/core-java-lang-oop-constructors-2/src/main/java/com/baeldung/objectcreation/objects/Rabbit.java
new file mode 100644
index 0000000000..c8a8159544
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-constructors-2/src/main/java/com/baeldung/objectcreation/objects/Rabbit.java
@@ -0,0 +1,17 @@
+package com.baeldung.objectcreation.objects;
+
+public class Rabbit {
+
+    String name = "";
+    
+    public Rabbit() {
+    }
+    
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/core-java-modules/core-java-lang-oop-constructors-2/src/main/java/com/baeldung/objectcreation/objects/RabbitType.java b/core-java-modules/core-java-lang-oop-constructors-2/src/main/java/com/baeldung/objectcreation/objects/RabbitType.java
new file mode 100644
index 0000000000..b7afe5fe2f
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-constructors-2/src/main/java/com/baeldung/objectcreation/objects/RabbitType.java
@@ -0,0 +1,7 @@
+package com.baeldung.objectcreation.objects;
+
+public enum RabbitType {
+    PET,
+    TAME,
+    WILD
+}
diff --git a/core-java-modules/core-java-lang-oop-constructors-2/src/main/java/com/baeldung/objectcreation/objects/SerializableRabbit.java b/core-java-modules/core-java-lang-oop-constructors-2/src/main/java/com/baeldung/objectcreation/objects/SerializableRabbit.java
new file mode 100644
index 0000000000..cb5f2d0b71
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-constructors-2/src/main/java/com/baeldung/objectcreation/objects/SerializableRabbit.java
@@ -0,0 +1,21 @@
+package com.baeldung.objectcreation.objects;
+
+import java.io.Serializable;
+
+public class SerializableRabbit implements Serializable {
+    
+    private static final long serialVersionUID = 2589844379773087465L;
+    
+    String name = "";
+    
+    public SerializableRabbit() {
+    }
+    
+    public String getName() {
+        return name;
+    }
+    
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/core-java-modules/core-java-lang-oop-constructors-2/src/main/java/com/baeldung/objectcreation/utils/CreateRabbits.java b/core-java-modules/core-java-lang-oop-constructors-2/src/main/java/com/baeldung/objectcreation/utils/CreateRabbits.java
new file mode 100644
index 0000000000..8b3c84e89c
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-constructors-2/src/main/java/com/baeldung/objectcreation/utils/CreateRabbits.java
@@ -0,0 +1,71 @@
+package com.baeldung.objectcreation.utils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.util.function.Supplier;
+
+import com.baeldung.objectcreation.objects.ClonableRabbit;
+import com.baeldung.objectcreation.objects.Rabbit;
+import com.baeldung.objectcreation.objects.RabbitType;
+import com.baeldung.objectcreation.objects.SerializableRabbit;
+
+public final class CreateRabbits {
+
+    public static Rabbit createRabbitUsingNewOperator() {
+        Rabbit rabbit = new Rabbit();
+        
+        return rabbit;
+    }
+
+    public static Rabbit createRabbitUsingClassForName() throws InstantiationException, IllegalAccessException, ClassNotFoundException {
+        Rabbit rabbit = (Rabbit) Class.forName("com.baeldung.objectcreation.objects.Rabbit").newInstance();
+        
+        return rabbit;
+    }
+    
+    public static Rabbit createRabbitUsingClassNewInstance() throws InstantiationException, IllegalAccessException {
+        Rabbit rabbit = Rabbit.class.newInstance();
+        
+        return rabbit;
+    }
+    
+    public static Rabbit createRabbitUsingConstructorNewInstance() throws InstantiationException, IllegalAccessException, IllegalArgumentException,
+            InvocationTargetException, NoSuchMethodException, SecurityException {
+        Rabbit rabbit = Rabbit.class.getConstructor().newInstance();
+        
+        return rabbit;
+    }
+    
+    public static ClonableRabbit createRabbitUsingClone(ClonableRabbit originalRabbit) throws CloneNotSupportedException {
+        ClonableRabbit clonedRabbit = (ClonableRabbit) originalRabbit.clone();
+        
+        return  clonedRabbit;
+    }
+    
+    public static SerializableRabbit createRabbitUsingDeserialization(File file) throws IOException, ClassNotFoundException {
+        try (FileInputStream fis = new FileInputStream(file);
+             ObjectInputStream ois = new ObjectInputStream(fis);) {   
+            return (SerializableRabbit) ois.readObject();
+        }
+    }
+    
+    public static Rabbit createRabbitUsingSupplier() {
+        Supplier<Rabbit> rabbitSupplier = Rabbit::new;
+        Rabbit rabbit = rabbitSupplier.get();
+        
+        return rabbit;
+    }
+    
+    public static Rabbit[] createRabbitArray() {
+        Rabbit[] rabbitArray = new Rabbit[10];
+        
+        return rabbitArray;
+    }
+    
+    public static RabbitType createRabbitTypeEnum() {
+        return RabbitType.PET; //any RabbitType could be returned here, PET is just an example.
+    }
+}
diff --git a/core-java-modules/core-java-lang-oop-constructors-2/src/test/java/com/baeldung/objectcreation/CreateRabbitsUnitTest.java b/core-java-modules/core-java-lang-oop-constructors-2/src/test/java/com/baeldung/objectcreation/CreateRabbitsUnitTest.java
new file mode 100644
index 0000000000..653beba096
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-constructors-2/src/test/java/com/baeldung/objectcreation/CreateRabbitsUnitTest.java
@@ -0,0 +1,100 @@
+package com.baeldung.objectcreation;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.lang.reflect.InvocationTargetException;
+
+import org.junit.Test;
+
+import com.baeldung.objectcreation.objects.ClonableRabbit;
+import com.baeldung.objectcreation.objects.Rabbit;
+import com.baeldung.objectcreation.objects.RabbitType;
+import com.baeldung.objectcreation.objects.SerializableRabbit;
+import com.baeldung.objectcreation.utils.CreateRabbits;
+
+public class CreateRabbitsUnitTest {
+
+    @Test
+    public void whenUsingNewOperator_thenRabbitIsReturned() {
+        assertTrue(CreateRabbits.createRabbitUsingNewOperator() instanceof Rabbit);
+    }
+
+    @Test
+    public void whenUsingClassForName_thenRabbitIsReturned() throws InstantiationException, IllegalAccessException, ClassNotFoundException {
+        assertTrue(CreateRabbits.createRabbitUsingClassForName() instanceof Rabbit);
+    }
+    
+    @Test
+    public void whenUsingClassNewInstance_thenRabbitIsReturned() throws InstantiationException, IllegalAccessException {
+        assertTrue(CreateRabbits.createRabbitUsingClassNewInstance() instanceof Rabbit);
+    }
+
+    @Test
+    public void whenUsingConstructorNewInstance_thenRabbitIsReturned() throws InstantiationException, IllegalAccessException, IllegalArgumentException,
+            InvocationTargetException, NoSuchMethodException, SecurityException {
+        assertTrue(CreateRabbits.createRabbitUsingConstructorNewInstance() instanceof Rabbit);
+    }
+    
+    @Test
+    public void givenClonableRabbit_whenUsingCloneMethod_thenClonedRabbitIsReturned() throws CloneNotSupportedException {
+        //given
+        ClonableRabbit originalRabbit = new ClonableRabbit("Peter");
+        
+        //when
+        ClonableRabbit clonedRabbit = CreateRabbits.createRabbitUsingClone(originalRabbit);
+        
+        //then
+        assertTrue(clonedRabbit instanceof ClonableRabbit);
+        assertNotEquals(originalRabbit, clonedRabbit);
+        assertEquals("Peter", clonedRabbit.getName());
+    }
+    
+    @Test
+    public void givenSerializedRabbit_whenDeserializing_thenNewRabbitIsReturned() throws IOException, ClassNotFoundException {        
+        //given
+        SerializableRabbit originalRabbit = new SerializableRabbit();
+        originalRabbit.setName("Peter");
+
+        File resourcesFolder = new File("src/test/resources");
+        resourcesFolder.mkdirs(); //creates the directory in case it doesn't exist
+        
+        File file = new File(resourcesFolder, "rabbit.ser");
+        
+        try (FileOutputStream fileOutputStream = new FileOutputStream(file);
+            ObjectOutputStream objectOutputStream = new ObjectOutputStream(fileOutputStream);) {
+            objectOutputStream.writeObject(originalRabbit);
+        }
+        
+        //when
+        SerializableRabbit newRabbit = CreateRabbits.createRabbitUsingDeserialization(file);
+        
+        //then
+        assertTrue(newRabbit instanceof SerializableRabbit);
+        assertNotEquals(originalRabbit, newRabbit);
+        assertEquals("Peter", newRabbit.getName());
+        
+        //clean up
+        file.delete();
+    }
+    
+    @Test
+    public void whenUsingSupplier_thenRabbitIsReturned() {
+        assertTrue(CreateRabbits.createRabbitUsingSupplier() instanceof Rabbit);
+    }
+    
+    @Test
+    public void whenUsingArrays_thenRabbitArrayIsReturned() {
+        assertTrue(CreateRabbits.createRabbitArray() instanceof Rabbit[]);
+    }
+    
+    @Test
+    public void whenUsingEnums_thenRabbitTypeIsReturned() {
+        assertTrue(CreateRabbits.createRabbitTypeEnum() instanceof RabbitType);
+    }
+}
diff --git a/core-java-modules/core-java-lang-oop-constructors/README.md b/core-java-modules/core-java-lang-oop-constructors/README.md
index a552a79721..c35cb836a5 100644
--- a/core-java-modules/core-java-lang-oop-constructors/README.md
+++ b/core-java-modules/core-java-lang-oop-constructors/README.md
@@ -12,3 +12,5 @@ This module contains article about constructors in Java
 - [Java Implicit Super Constructor is Undefined Error](https://www.baeldung.com/java-implicit-super-constructor-is-undefined-error)
 - [Constructor Specification in Java](https://www.baeldung.com/java-constructor-specification)
 - [Static vs. Instance Initializer Block in Java](https://www.baeldung.com/java-static-instance-initializer-blocks)
+- [Accessing Private Constructor in Java](https://www.baeldung.com/java-private-constructor-access)
+- More articles: [[next -->]](/core-java-modules/core-java-lang-oop-constructors-2)
\ No newline at end of file
diff --git a/core-java-modules/core-java-lang-oop-methods/README.md b/core-java-modules/core-java-lang-oop-methods/README.md
index f34606f26a..053cafac3e 100644
--- a/core-java-modules/core-java-lang-oop-methods/README.md
+++ b/core-java-modules/core-java-lang-oop-methods/README.md
@@ -11,3 +11,4 @@ This module contains articles about methods in Java
 - [The Covariant Return Type in Java](https://www.baeldung.com/java-covariant-return-type)
 - [Does a Method’s Signature Include the Return Type in Java?](https://www.baeldung.com/java-method-signature-return-type)
 - [Solving the Hide Utility Class Public Constructor Sonar Warning](https://www.baeldung.com/java-sonar-hide-implicit-constructor)
+- [Best Practices for Passing Many Arguments to a Method in Java](https://www.baeldung.com/java-best-practices-many-parameters-method)
diff --git a/core-java-modules/core-java-lang-oop-methods/src/main/java/com/baeldung/methods/Car.java b/core-java-modules/core-java-lang-oop-methods/src/main/java/com/baeldung/methods/Car.java
new file mode 100644
index 0000000000..a72d7dd0f1
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-methods/src/main/java/com/baeldung/methods/Car.java
@@ -0,0 +1,98 @@
+package com.baeldung.methods;
+
+public class Car {
+
+    private final String make;
+    private final String model;
+    private final int year;
+    private final String color;
+    private final boolean automatic;
+    private final int numDoors;
+    private final String features;
+
+    private Car(CarBuilder carBuilder) {
+        this.make = carBuilder.make;
+        this.model = carBuilder.model;
+        this.year = carBuilder.year;
+        this.color = carBuilder.color;
+        this.automatic = carBuilder.automatic;
+        this.numDoors = carBuilder.numDoors;
+        this.features = carBuilder.features;
+    }
+
+    public String getMake() {
+        return make;
+    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public int getYear() {
+        return year;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public boolean isAutomatic() {
+        return automatic;
+    }
+
+    public int getNumDoors() {
+        return numDoors;
+    }
+
+    public String getFeatures() {
+        return features;
+    }
+
+    public static class CarBuilder {
+
+        private final String make;
+        private final String model;
+        private final int year;
+
+        private String color = "unknown";
+        private boolean automatic = false;
+        private int numDoors = 4;
+        private String features = "";
+
+        public CarBuilder(String make, String model, int year) {
+            this.make = make;
+            this.model = model;
+            this.year = year;
+        }
+
+        public CarBuilder color(String color) {
+            this.color = color;
+            return this;
+        }
+
+        public CarBuilder automatic(boolean automatic) {
+            this.automatic = automatic;
+            return this;
+        }
+
+        public CarBuilder numDoors(int numDoors) {
+            this.numDoors = numDoors;
+            return this;
+        }
+
+        public CarBuilder features(String features) {
+            this.features = features;
+            return this;
+        }
+
+        public Car build() {
+            return new Car(this);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "Car [make=" + make + ", model=" + model + ", year=" + year + ", color=" + color + ", automatic=" + automatic + ", numDoors=" + numDoors + ", features=" + features + "]";
+    }
+
+}
diff --git a/core-java-modules/core-java-lang-oop-methods/src/main/java/com/baeldung/methods/Motorcycle.java b/core-java-modules/core-java-lang-oop-methods/src/main/java/com/baeldung/methods/Motorcycle.java
new file mode 100644
index 0000000000..8a1fce4a5d
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-methods/src/main/java/com/baeldung/methods/Motorcycle.java
@@ -0,0 +1,52 @@
+package com.baeldung.methods;
+
+import java.io.Serializable;
+
+public class Motorcycle extends Vehicle implements Serializable {
+
+    private static final long serialVersionUID = 5973661295933599929L;
+
+    private int year;
+    private String features = "";
+
+    public Motorcycle() {
+        super();
+    }
+
+    public Motorcycle(String make, String model, String color, int weight, boolean statusNew, int year) {
+        super(make, model, color, weight, statusNew);
+        this.year = year;
+    }
+
+    public Motorcycle(Vehicle vehicle, int year) {
+        super(vehicle);
+        this.year = year;
+    }
+
+    public int getYear() {
+        return year;
+    }
+
+    public void setYear(int year) {
+        this.year = year;
+    }
+
+    public void setFeatures(String features) {
+        this.features = features;
+    }
+
+    public String getFeatures() {
+        return features;
+    }
+
+    public void addMotorcycleFeatures(String... features) {
+        StringBuilder str = new StringBuilder(this.getFeatures());
+        for (String feature : features) {
+            if (!str.toString().isEmpty())
+                str.append(", ");
+            str.append(feature);
+        }
+        this.setFeatures(str.toString());
+    }
+
+}
diff --git a/core-java-modules/core-java-lang-oop-methods/src/main/java/com/baeldung/methods/Vehicle.java b/core-java-modules/core-java-lang-oop-methods/src/main/java/com/baeldung/methods/Vehicle.java
new file mode 100644
index 0000000000..0c6964d255
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-methods/src/main/java/com/baeldung/methods/Vehicle.java
@@ -0,0 +1,33 @@
+package com.baeldung.methods;
+
+public class Vehicle {
+
+    static String defaultValue = "DEFAULT";
+    private String make = defaultValue;
+    private String model = defaultValue;
+    private String color = defaultValue;
+    private int weight = 0;
+    private boolean statusNew = true;
+
+    public Vehicle() {
+        super();
+    }
+
+    public Vehicle(String make, String model, String color, int weight, boolean statusNew) {
+        this.make = make;
+        this.model = model;
+        this.color = color;
+        this.weight = weight;
+        this.statusNew = statusNew;
+    }
+
+    public Vehicle(Vehicle vehicle) {
+        this(vehicle.make, vehicle.model, vehicle.color, vehicle.weight, vehicle.statusNew);
+    }
+
+    @Override
+    public String toString() {
+        return "Vehicle [make=" + make + ", model=" + model + ", color=" + color + ", weight=" + weight + ", statusNew=" + statusNew + "]";
+    }
+
+}
diff --git a/core-java-modules/core-java-lang-oop-methods/src/main/java/com/baeldung/methods/VehicleProcessor.java b/core-java-modules/core-java-lang-oop-methods/src/main/java/com/baeldung/methods/VehicleProcessor.java
new file mode 100644
index 0000000000..a7d5975813
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-methods/src/main/java/com/baeldung/methods/VehicleProcessor.java
@@ -0,0 +1,20 @@
+package com.baeldung.methods;
+
+public class VehicleProcessor {
+
+    Vehicle processVehicle(String make, String model, String color, int weight, boolean status) {
+        return new Vehicle(make, model, color, weight, status);
+    }
+
+    Vehicle processVehicle(Vehicle vehicle) {
+        return new Vehicle(vehicle);
+    }
+
+    Car processCar(Car car) {
+        return new Car.CarBuilder(car.getMake(), car.getModel(), car.getYear()).color(car.getColor())
+            .automatic(car.isAutomatic())
+            .features(car.getFeatures())
+            .build();
+    }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-lang-oop-methods/src/test/java/com/baeldung/methods/VehicleProcessorUnitTest.java b/core-java-modules/core-java-lang-oop-methods/src/test/java/com/baeldung/methods/VehicleProcessorUnitTest.java
new file mode 100644
index 0000000000..928fbcb426
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-methods/src/test/java/com/baeldung/methods/VehicleProcessorUnitTest.java
@@ -0,0 +1,58 @@
+package com.baeldung.methods;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+class VehicleProcessorUnitTest {
+
+    VehicleProcessor vehicleProcessor = new VehicleProcessor();
+    Vehicle vehicle = new Vehicle("Ford", "Focus", "red", 2200, true);
+
+    @Test
+    void givenAllArguments_whenMethodCall_thenVerifyCallIsDoneCorrectly() {
+        Vehicle veh = vehicleProcessor.processVehicle("Ford", "Focus", "red", 2200, true);
+        assertThat(veh.toString()).hasToString(vehicle.toString());
+    }
+
+    @Test
+    void givenParameterObject_whenMethodCall_thenVerifyCallIsDoneCorrectly() {
+        Vehicle veh = vehicleProcessor.processVehicle(vehicle);
+        assertThat(veh.toString()).hasToString(vehicle.toString());
+    }
+
+    @Test
+    void givenJavaBeanPattern_whenMethodCall_thenVerifyCallIsDoneCorrectly() {
+        Motorcycle motorcycle = new Motorcycle("Ducati", "Monster", "yellow", 235, true, 2023);
+        motorcycle.setFeatures("GPS");
+
+        vehicleProcessor.processVehicle(motorcycle);
+        assertThat(motorcycle.getFeatures()).isEqualToIgnoringCase("GPS");
+    }
+
+    @Test
+    void givenJavaVarargs_whenMethodCall_thenAssertTheReturnedConcatenatedString() {
+        Motorcycle motorcycle = new Motorcycle("Ducati", "Monster", "red", 350, true, 2023);
+        motorcycle.addMotorcycleFeatures("abs");
+        assertThat(motorcycle.getFeatures()).isEqualToIgnoringCase("abs");
+
+        motorcycle.addMotorcycleFeatures("navi", "charger");
+        assertThat(motorcycle.getFeatures()).isEqualToIgnoringCase("abs, navi, charger");
+
+        motorcycle.addMotorcycleFeatures("wifi", "phone", "satellite");
+        assertThat(motorcycle.getFeatures()).isEqualToIgnoringCase("abs, navi, charger, wifi, phone, satellite");
+    }
+
+    @Test
+    void givenJavaBuilderPattern_whenMethodCall_thenVerifyCallIsDoneCorrectly() {
+        Car car = new Car.CarBuilder("Ford", "Focus", 2023).color("blue")
+            .automatic(true)
+            .features("abs, navi, charger, wifi, phone, satellite")
+            .build();
+
+        Car result = vehicleProcessor.processCar(car);
+
+        assertThat(result.toString()).hasToString(car.toString());
+    }
+
+}
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/staticclass/Pizza.java b/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticclass/Pizza.java
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/staticclass/Pizza.java
rename to core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticclass/Pizza.java
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticmodifier/Car.java b/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticmodifier/Car.java
index 950f008dcd..1158851fbd 100644
--- a/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticmodifier/Car.java
+++ b/core-java-modules/core-java-lang-oop-modifiers/src/main/java/com/baeldung/staticmodifier/Car.java
@@ -42,6 +42,10 @@ public class Car {
         this.engine = engine;
     }
 
+    public static String getCarsInformation(Car car) {
+        return car.getName() + "-" + car.getEngine();
+    }
+
     public static void setNumberOfCars(int numberOfCars) {
         Car.numberOfCars = numberOfCars;
     }
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/test/java/com/baeldung/staticmethod/CallNonStaticMethodUnitTest.java b/core-java-modules/core-java-lang-oop-modifiers/src/test/java/com/baeldung/staticmethod/CallNonStaticMethodUnitTest.java
new file mode 100644
index 0000000000..1171cb2e7a
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-modifiers/src/test/java/com/baeldung/staticmethod/CallNonStaticMethodUnitTest.java
@@ -0,0 +1,21 @@
+package com.baeldung.staticmethod;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.AfterClass;
+import org.junit.Test;
+
+import com.baeldung.staticmodifier.Car;
+
+public class CallNonStaticMethodUnitTest {
+    @AfterClass
+    public static void setUpCarInstance() {
+        Car.setNumberOfCars(0);
+    }
+    @Test
+    public void whenCallingNonStaticMethodInStaticMethodWithInstanceClass_thenSuccess() {
+        Car car = new Car("Jaguar", "V8");
+        assertEquals("Jaguar-V8", Car.getCarsInformation(car));
+    }
+
+}
diff --git a/core-java-modules/core-java-lang-oop-modifiers/src/test/java/com/baeldung/staticmodifier/CarUnitTest.java b/core-java-modules/core-java-lang-oop-modifiers/src/test/java/com/baeldung/staticmodifier/CarUnitTest.java
index f55955caa8..68bbe8f0a2 100644
--- a/core-java-modules/core-java-lang-oop-modifiers/src/test/java/com/baeldung/staticmodifier/CarUnitTest.java
+++ b/core-java-modules/core-java-lang-oop-modifiers/src/test/java/com/baeldung/staticmodifier/CarUnitTest.java
@@ -2,9 +2,16 @@ package com.baeldung.staticmodifier;
 
 import static org.junit.Assert.*;
 
+import org.junit.AfterClass;
 import org.junit.Test;
 
 public class CarUnitTest {
+
+    @AfterClass
+    public static void setUpCarInstance() {
+        Car.setNumberOfCars(0);
+    }
+
     @Test
     public void whenNumberOfCarObjectsInitialized_thenStaticCounterIncreases() {
         new Car("Jaguar", "V8");
diff --git a/core-java-modules/core-java-lang-oop-types-2/README.md b/core-java-modules/core-java-lang-oop-types-2/README.md
index ca8742d6c0..f46a1a3306 100644
--- a/core-java-modules/core-java-lang-oop-types-2/README.md
+++ b/core-java-modules/core-java-lang-oop-types-2/README.md
@@ -9,3 +9,4 @@ This module contains articles about types in Java
 - [Generate a Random Value From an Enum](https://www.baeldung.com/java-enum-random-value)
 - [Filling a List With All Enum Values in Java](https://www.baeldung.com/java-enum-values-to-list)
 - [Comparing a String to an Enum Value in Java](https://www.baeldung.com/java-comparing-string-to-enum)
+- [Implementing toString() on enums in Java](https://www.baeldung.com/java-enums-tostring)
diff --git a/core-java-modules/core-java-lang-oop-types-2/src/main/java/com/baeldung/enumtostring/FastFood1.java b/core-java-modules/core-java-lang-oop-types-2/src/main/java/com/baeldung/enumtostring/FastFood1.java
new file mode 100644
index 0000000000..26338fe46c
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-types-2/src/main/java/com/baeldung/enumtostring/FastFood1.java
@@ -0,0 +1,25 @@
+package com.baeldung.enumtostring;
+
+public enum FastFood1 {
+    PIZZA,
+    BURGER,
+    TACO,
+    CHICKEN,
+    ;
+
+    @Override
+    public String toString() {
+        switch (this) {
+        case PIZZA:
+            return "Pizza Pie";
+        case BURGER:
+            return "Cheese Burger";
+        case TACO:
+            return "Crunchy Taco";
+        case CHICKEN:
+            return "Fried Chicken";
+        default:
+            return "";
+        }
+    }
+}
diff --git a/core-java-modules/core-java-lang-oop-types-2/src/main/java/com/baeldung/enumtostring/FastFood2.java b/core-java-modules/core-java-lang-oop-types-2/src/main/java/com/baeldung/enumtostring/FastFood2.java
new file mode 100644
index 0000000000..8ca7166dec
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-types-2/src/main/java/com/baeldung/enumtostring/FastFood2.java
@@ -0,0 +1,28 @@
+package com.baeldung.enumtostring;
+
+public enum FastFood2 {
+    PIZZA {
+        @Override
+        public String toString() {
+            return "Pizza Pie";
+        }
+    },
+    BURGER {
+        @Override
+        public String toString() {
+            return "Cheese Burger";
+        }
+    },
+    TACO {
+        @Override
+        public String toString() {
+            return "Crunchy Taco";
+        }
+    },
+    CHICKEN {
+        @Override
+        public String toString() {
+            return "Fried Chicken";
+        }
+    }
+}
diff --git a/core-java-modules/core-java-lang-oop-types-2/src/main/java/com/baeldung/enumtostring/FastFood3.java b/core-java-modules/core-java-lang-oop-types-2/src/main/java/com/baeldung/enumtostring/FastFood3.java
new file mode 100644
index 0000000000..f6db8f4095
--- /dev/null
+++ b/core-java-modules/core-java-lang-oop-types-2/src/main/java/com/baeldung/enumtostring/FastFood3.java
@@ -0,0 +1,29 @@
+package com.baeldung.enumtostring;
+
+public enum FastFood3 {
+    PIZZA("Pizza Pie"),
+    BURGER("Cheese Burger"),
+    TACO("Crunchy Taco"),
+    CHICKEN("Fried Chicken"),
+    ;
+
+    private final String prettyName;
+
+    FastFood3(String prettyName) {
+        this.prettyName = prettyName;
+    }
+
+    FastFood3 fromString(String prettyName) {
+        for (FastFood3 f : values()) {
+            if (f.prettyName.equals(prettyName)) {
+                return f;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return prettyName;
+    }
+}
diff --git a/core-java-modules/core-java-lang-operators-2/pom.xml b/core-java-modules/core-java-lang-operators-2/pom.xml
index 9d925c553a..4170f9f6a0 100644
--- a/core-java-modules/core-java-lang-operators-2/pom.xml
+++ b/core-java-modules/core-java-lang-operators-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-lang-operators-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lang-operators-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-lang-operators/pom.xml b/core-java-modules/core-java-lang-operators/pom.xml
index c61fb81354..1815d01dcc 100644
--- a/core-java-modules/core-java-lang-operators/pom.xml
+++ b/core-java-modules/core-java-lang-operators/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-lang-operators</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lang-operators</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-lang-syntax-2/pom.xml b/core-java-modules/core-java-lang-syntax-2/pom.xml
index fdb0503174..bae5f0b6bd 100644
--- a/core-java-modules/core-java-lang-syntax-2/pom.xml
+++ b/core-java-modules/core-java-lang-syntax-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-lang-syntax-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lang-syntax-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-lang-syntax/pom.xml b/core-java-modules/core-java-lang-syntax/pom.xml
index 7cdbc40fbc..005bdc73cc 100644
--- a/core-java-modules/core-java-lang-syntax/pom.xml
+++ b/core-java-modules/core-java-lang-syntax/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-lang-syntax</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lang-syntax</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-lang/pom.xml b/core-java-modules/core-java-lang/pom.xml
index 4989c6a5a7..27cf0ac276 100644
--- a/core-java-modules/core-java-lang/pom.xml
+++ b/core-java-modules/core-java-lang/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-lang</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-lang</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-locale/README.md b/core-java-modules/core-java-locale/README.md
new file mode 100644
index 0000000000..744b5e760f
--- /dev/null
+++ b/core-java-modules/core-java-locale/README.md
@@ -0,0 +1,6 @@
+ Core Java Locale
+
+### Relevant Articles: 
+
+- [A Guide to the ResourceBundle](http://www.baeldung.com/java-resourcebundle)
+
diff --git a/core-java-modules/core-java-locale/pom.xml b/core-java-modules/core-java-locale/pom.xml
new file mode 100644
index 0000000000..f493d572a1
--- /dev/null
+++ b/core-java-modules/core-java-locale/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>core-java-locale</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-locale</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    
+    <dependencies>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/resourcebundle/ExampleControl.java b/core-java-modules/core-java-locale/src/main/java/com/baeldung/resourcebundle/ExampleControl.java
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/resourcebundle/ExampleControl.java
rename to core-java-modules/core-java-locale/src/main/java/com/baeldung/resourcebundle/ExampleControl.java
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/resourcebundle/ExampleResource.java b/core-java-modules/core-java-locale/src/main/java/com/baeldung/resourcebundle/ExampleResource.java
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/resourcebundle/ExampleResource.java
rename to core-java-modules/core-java-locale/src/main/java/com/baeldung/resourcebundle/ExampleResource.java
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/resourcebundle/ExampleResource_pl.java b/core-java-modules/core-java-locale/src/main/java/com/baeldung/resourcebundle/ExampleResource_pl.java
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/resourcebundle/ExampleResource_pl.java
rename to core-java-modules/core-java-locale/src/main/java/com/baeldung/resourcebundle/ExampleResource_pl.java
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/resourcebundle/ExampleResource_pl_PL.java b/core-java-modules/core-java-locale/src/main/java/com/baeldung/resourcebundle/ExampleResource_pl_PL.java
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/resourcebundle/ExampleResource_pl_PL.java
rename to core-java-modules/core-java-locale/src/main/java/com/baeldung/resourcebundle/ExampleResource_pl_PL.java
diff --git a/core-java-modules/core-java/src/main/resources/resourcebundle/resource.properties b/core-java-modules/core-java-locale/src/main/resources/resourcebundle/resource.properties
similarity index 100%
rename from core-java-modules/core-java/src/main/resources/resourcebundle/resource.properties
rename to core-java-modules/core-java-locale/src/main/resources/resourcebundle/resource.properties
diff --git a/core-java-modules/core-java/src/main/resources/resourcebundle/resource_en.properties b/core-java-modules/core-java-locale/src/main/resources/resourcebundle/resource_en.properties
similarity index 100%
rename from core-java-modules/core-java/src/main/resources/resourcebundle/resource_en.properties
rename to core-java-modules/core-java-locale/src/main/resources/resourcebundle/resource_en.properties
diff --git a/core-java-modules/core-java/src/main/resources/resourcebundle/resource_pl_PL.properties b/core-java-modules/core-java-locale/src/main/resources/resourcebundle/resource_pl_PL.properties
similarity index 100%
rename from core-java-modules/core-java/src/main/resources/resourcebundle/resource_pl_PL.properties
rename to core-java-modules/core-java-locale/src/main/resources/resourcebundle/resource_pl_PL.properties
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/resourcebundle/ExampleResourceUnitTest.java b/core-java-modules/core-java-locale/src/test/java/com/baeldung/resourcebundle/ExampleResourceUnitTest.java
similarity index 100%
rename from core-java-modules/core-java/src/test/java/com/baeldung/resourcebundle/ExampleResourceUnitTest.java
rename to core-java-modules/core-java-locale/src/test/java/com/baeldung/resourcebundle/ExampleResourceUnitTest.java
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/resourcebundle/PropertyResourceUnitTest.java b/core-java-modules/core-java-locale/src/test/java/com/baeldung/resourcebundle/PropertyResourceUnitTest.java
similarity index 100%
rename from core-java-modules/core-java/src/test/java/com/baeldung/resourcebundle/PropertyResourceUnitTest.java
rename to core-java-modules/core-java-locale/src/test/java/com/baeldung/resourcebundle/PropertyResourceUnitTest.java
diff --git a/core-java-modules/core-java-networking-2/pom.xml b/core-java-modules/core-java-networking-2/pom.xml
index 982f4fa346..34f16a9938 100644
--- a/core-java-modules/core-java-networking-2/pom.xml
+++ b/core-java-modules/core-java-networking-2/pom.xml
@@ -15,9 +15,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>${httpclient.version}</version>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>${commons-codec.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -52,11 +52,11 @@
     </build>
 
     <properties>
-        <httpclient.version>4.5.9</httpclient.version>
         <angus.mail.version>2.0.1</angus.mail.version>
         <async-http-client.version>2.4.5</async-http-client.version>
         <jakarta.bind.version>2.3.3</jakarta.bind.version>
         <greenmail.version>2.0.0-alpha-3</greenmail.version>
+        <commons-codec.version>1.15</commons-codec.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/url/auth/HttpClient.java b/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/url/auth/HttpClient.java
index 779f8aa898..f9d747a133 100644
--- a/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/url/auth/HttpClient.java
+++ b/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/url/auth/HttpClient.java
@@ -21,7 +21,7 @@ public class HttpClient {
         this.password = password;
     }
 
-    public int sendRquestWithAuthHeader(String url) throws IOException {
+    public int sendRequestWithAuthHeader(String url) throws IOException {
         HttpURLConnection connection = null;
         try {
             connection = createConnection(url);
@@ -34,7 +34,7 @@ public class HttpClient {
         }
     }
 
-    public int sendRquestWithAuthenticator(String url) throws IOException {
+    public int sendRequestWithAuthenticator(String url) throws IOException {
         setAuthenticator();
 
         HttpURLConnection connection = null;
diff --git a/core-java-modules/core-java-networking-2/src/test/java/com/baeldung/url/auth/HttpClientLiveTest.java b/core-java-modules/core-java-networking-2/src/test/java/com/baeldung/url/auth/HttpClientLiveTest.java
index 01d580bc65..387b228953 100644
--- a/core-java-modules/core-java-networking-2/src/test/java/com/baeldung/url/auth/HttpClientLiveTest.java
+++ b/core-java-modules/core-java-networking-2/src/test/java/com/baeldung/url/auth/HttpClientLiveTest.java
@@ -7,28 +7,28 @@ import org.junit.Test;
 public class HttpClientLiveTest {
 
     @Test
-    public void sendRquestWithAuthHeader() throws Exception {
+    public void sendRequestWithAuthHeader() throws Exception {
         HttpClient httpClient = new HttpClient("user1", "pass1");
 
-        int status = httpClient.sendRquestWithAuthHeader("https://httpbin.org/basic-auth/user1/pass1");
+        int status = httpClient.sendRequestWithAuthHeader("https://httpbin.org/basic-auth/user1/pass1");
 
         assertTrue(isSuccess(status));
     }
 
     @Test
-    public void sendRquestWithAuthHeader_whenIncorrectCredentials_thenNotSuccessful() throws Exception {
+    public void sendRequestWithAuthHeader_whenIncorrectCredentials_thenNotSuccessful() throws Exception {
         HttpClient httpClient = new HttpClient("John", "Smith");
 
-        int status = httpClient.sendRquestWithAuthHeader("https://httpbin.org/basic-auth/user1/pass1");
+        int status = httpClient.sendRequestWithAuthHeader("https://httpbin.org/basic-auth/user1/pass1");
 
         assertTrue(isUnauthorized(status));
     }
 
     @Test
-    public void sendRquestWithAuthenticator() throws Exception {
+    public void sendRequestWithAuthenticator() throws Exception {
         HttpClient httpClient = new HttpClient("user2", "pass2");
 
-        int status = httpClient.sendRquestWithAuthenticator("https://httpbin.org/basic-auth/user2/pass2");
+        int status = httpClient.sendRequestWithAuthenticator("https://httpbin.org/basic-auth/user2/pass2");
 
         assertTrue(isSuccess(status));
     }
@@ -37,7 +37,7 @@ public class HttpClientLiveTest {
     public void sendRquestWithAuthenticator_whenIncorrectCredentials_thenNotSuccessful() throws Exception {
         HttpClient httpClient = new HttpClient("John", "Smith");
 
-        int status = httpClient.sendRquestWithAuthenticator("https://httpbin.org/basic-auth/user2/pass2");
+        int status = httpClient.sendRequestWithAuthenticator("https://httpbin.org/basic-auth/user2/pass2");
 
         assertTrue(isUnauthorized(status));
     }
diff --git a/core-java-modules/core-java-networking-4/README.md b/core-java-modules/core-java-networking-4/README.md
index daec647ebe..10ca7caf41 100644
--- a/core-java-modules/core-java-networking-4/README.md
+++ b/core-java-modules/core-java-networking-4/README.md
@@ -2,3 +2,5 @@
 - [Difference Between URI.create() and new URI()](https://www.baeldung.com/java-uri-create-and-new-uri)
 - [Validating URL in Java](https://www.baeldung.com/java-validate-url)
 - [Validating IPv4 Address in Java](https://www.baeldung.com/java-validate-ipv4-address)
+- [Download a Webpage in Java](https://www.baeldung.com/java-download-webpage)
+- [URL Query Manipulation in Java](https://www.baeldung.com/java-url-query-manipulation)
diff --git a/core-java-modules/core-java-networking-4/pom.xml b/core-java-modules/core-java-networking-4/pom.xml
index 29531a5767..cbe6356d0f 100644
--- a/core-java-modules/core-java-networking-4/pom.xml
+++ b/core-java-modules/core-java-networking-4/pom.xml
@@ -14,12 +14,40 @@
     </parent>
 
     <dependencies>
-        <!-- https://mvnrepository.com/artifact/commons-validator/commons-validator -->
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
             <version>${apache.commons-validator.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>${jsoup.version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.2</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api -->
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-common</artifactId>
+            <version>2.22.2</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.springframework/spring-web -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>6.0.6</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -28,6 +56,7 @@
 
     <properties>
         <apache.commons-validator.version>1.7</apache.commons-validator.version>
+        <jsoup.version>1.15.4</jsoup.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-networking-4/src/test/java/com/baeldung/downloadwebpage/DownloadWebpageUnitTest.java b/core-java-modules/core-java-networking-4/src/test/java/com/baeldung/downloadwebpage/DownloadWebpageUnitTest.java
new file mode 100644
index 0000000000..23b8928ecb
--- /dev/null
+++ b/core-java-modules/core-java-networking-4/src/test/java/com/baeldung/downloadwebpage/DownloadWebpageUnitTest.java
@@ -0,0 +1,48 @@
+package com.baeldung.downloadwebpage;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.junit.jupiter.api.Test;
+
+class DownloadWebpageUnitTest {
+
+    @Test
+    public void givenURLConnection_whenRetrieveWebpage_thenWebpageIsNotNullAndContainsHtmlTag() throws IOException {
+        URL url = new URL("https://example.com");
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        connection.setRequestMethod("GET");
+
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
+            StringBuilder responseBuilder = new StringBuilder();
+            String line;
+            while ((line = reader.readLine()) != null) {
+                responseBuilder.append(line);
+            }
+
+            assertNotNull(responseBuilder);
+            assertTrue(responseBuilder.toString()
+              .contains("<html>"));
+        }
+
+    }
+
+    @Test
+    public void givenJsoup_whenRetrievingWebpage_thenWebpageDocumentIsNotNullAndContainsHtmlTag() throws IOException {
+
+        Document document = Jsoup.connect("https://example.com")
+          .get();
+        String webpage = document.html();
+
+        assertNotNull(webpage);
+        assertTrue(webpage.contains("<html>"));
+
+    }
+
+}
diff --git a/core-java-modules/core-java-networking-4/src/test/java/com/baeldung/urlquerymanipulation/UrlQueryManipulationUnitTest.java b/core-java-modules/core-java-networking-4/src/test/java/com/baeldung/urlquerymanipulation/UrlQueryManipulationUnitTest.java
new file mode 100644
index 0000000000..cc53a3e3a8
--- /dev/null
+++ b/core-java-modules/core-java-networking-4/src/test/java/com/baeldung/urlquerymanipulation/UrlQueryManipulationUnitTest.java
@@ -0,0 +1,53 @@
+package com.baeldung.urlquerymanipulation;
+
+import static junit.framework.TestCase.assertEquals;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import javax.ws.rs.core.UriBuilder;
+
+import org.apache.http.client.utils.URIBuilder;
+
+import org.junit.Test;
+import org.springframework.web.util.UriComponentsBuilder;
+
+public class UrlQueryManipulationUnitTest {
+
+    @Test
+    public void whenUsingApacheUriBuilder_thenParametersAreCorrectlyAdded() throws URISyntaxException {
+        String url = "baeldung.com";
+        String key = "article";
+        String value = "alpha";
+        URI uri = new URIBuilder(url).addParameter(key, value)
+          .build();
+
+        assertEquals("baeldung.com?article=alpha", uri.toString());
+    }
+
+    @Test
+    public void whenUsingJavaUriBuilder_thenParametersAreCorrectlyAdded() {
+        String url = "baeldung.com";
+        String key = "article";
+        String value = "beta";
+        URI uri = UriBuilder.fromUri(url)
+          .queryParam(key, value)
+          .build();
+
+        assertEquals("baeldung.com?article=beta", uri.toString());
+    }
+
+    @Test
+    public void whenUsingSpringUriComponentsBuilder_thenParametersAreCorrectlyAdded() {
+        String url = "baeldung.com";
+        String key = "article";
+        String value = "charlie";
+        URI uri = UriComponentsBuilder.fromUriString(url)
+          .queryParam(key, value)
+          .build()
+          .toUri();
+
+        assertEquals("baeldung.com?article=charlie", uri.toString());
+    }
+
+}
diff --git a/core-java-modules/core-java-networking/pom.xml b/core-java-modules/core-java-networking/pom.xml
index 9974134eae..59aadbd1ed 100644
--- a/core-java-modules/core-java-networking/pom.xml
+++ b/core-java-modules/core-java-networking/pom.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    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">
+         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>core-java-networking</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-networking</name>
     <packaging>jar</packaging>
 
@@ -20,6 +19,11 @@
             <artifactId>spring-web</artifactId>
             <version>${springframework.spring-web.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${apache.httpclient.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -28,6 +32,7 @@
 
     <properties>
         <springframework.spring-web.version>4.3.4.RELEASE</springframework.spring-web.version>
+        <apache.httpclient.version>4.5.14</apache.httpclient.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/url/UrlUnitTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/url/UrlUnitTest.java
index 112f2cf53f..87d9d7a620 100644
--- a/core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/url/UrlUnitTest.java
+++ b/core-java-modules/core-java-networking/src/test/java/com/baeldung/networking/url/UrlUnitTest.java
@@ -1,11 +1,19 @@
 package com.baeldung.networking.url;
 
+import static java.util.stream.Collectors.toList;
 import static org.junit.Assert.assertEquals;
 
 import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.Map;
 
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.message.BasicNameValuePair;
 import org.junit.Test;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import com.google.common.collect.ImmutableMap;
 
 public class UrlUnitTest {
 
@@ -101,4 +109,44 @@ public class UrlUnitTest {
         assertEquals("http://baeldung.com:9000/guidelines.txt", url.toString());
     }
 
-}
+    @Test
+    public void givenUrlParameters_whenBuildUrlWithURIBuilder_thenSuccess() throws URISyntaxException, MalformedURLException {
+        URIBuilder uriBuilder = new URIBuilder("http://baeldung.com/articles");
+        uriBuilder.setPort(9090);
+        uriBuilder.addParameter("topic", "java");
+        uriBuilder.addParameter("version", "8");
+        URL url = uriBuilder.build().toURL();
+        assertEquals("http://baeldung.com:9090/articles?topic=java&version=8", url.toString());
+    }
+
+    @Test
+    public void givenUrlParametersInMap_whenBuildUrlWithURIBuilder_thenSuccess() throws URISyntaxException, MalformedURLException {
+        Map<String, String> paramMap = ImmutableMap.of("topic", "java", "version", "8");
+        URIBuilder uriBuilder = new URIBuilder("http://baeldung.com/articles");
+        uriBuilder.setPort(9090);
+        uriBuilder.addParameters(paramMap.entrySet()
+          .stream()
+          .map(entry -> new BasicNameValuePair(entry.getKey(), entry.getValue()))
+          .collect(toList()));
+
+        URL url = uriBuilder.build().toURL();
+        assertEquals("http://baeldung.com:9090/articles?topic=java&version=8", url.toString());
+    }
+
+    @Test
+    public void givenUrlParameters_whenBuildUrlWithSpringUriComponentsBuilder_thenSuccess() throws MalformedURLException {
+        URL url = UriComponentsBuilder.newInstance()
+          .scheme("http")
+          .host("baeldung.com")
+          .port(9090)
+          .path("articles")
+          .queryParam("topic", "java")
+          .queryParam("version", "8")
+          .build()
+          .toUri()
+          .toURL();
+
+        assertEquals("http://baeldung.com:9090/articles?topic=java&version=8", url.toString());
+    }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-nio-2/pom.xml b/core-java-modules/core-java-nio-2/pom.xml
index eb56c2bf68..e35b70cfc7 100644
--- a/core-java-modules/core-java-nio-2/pom.xml
+++ b/core-java-modules/core-java-nio-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-nio-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-nio-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-nio-2/src/main/java/com/baeldung/selector/EchoServer.java b/core-java-modules/core-java-nio-2/src/main/java/com/baeldung/selector/EchoServer.java
index 9e9edcd0ba..c8b638dc04 100644
--- a/core-java-modules/core-java-nio-2/src/main/java/com/baeldung/selector/EchoServer.java
+++ b/core-java-modules/core-java-nio-2/src/main/java/com/baeldung/selector/EchoServer.java
@@ -45,8 +45,9 @@ public class EchoServer {
 
     private static void answerWithEcho(ByteBuffer buffer, SelectionKey key) throws IOException {
         SocketChannel client = (SocketChannel) key.channel();
-        client.read(buffer);
-        if (new String(buffer.array()).trim().equals(POISON_PILL)) {
+        int r = client.read(buffer);
+        if (r == -1 || new String(buffer.array()).trim()
+            .equals(POISON_PILL)) {
             client.close();
             System.out.println("Not accepting client messages anymore");
         } else {
diff --git a/core-java-modules/core-java-nio/pom.xml b/core-java-modules/core-java-nio/pom.xml
index 9e1c529a65..35fef82df5 100644
--- a/core-java-modules/core-java-nio/pom.xml
+++ b/core-java-modules/core-java-nio/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-nio</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-nio</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-nio/src/main/java/com/baeldung/lines/NumberOfLineFinder.java b/core-java-modules/core-java-nio/src/main/java/com/baeldung/lines/NumberOfLineFinder.java
index b355295dab..f5d5fb2b4f 100644
--- a/core-java-modules/core-java-nio/src/main/java/com/baeldung/lines/NumberOfLineFinder.java
+++ b/core-java-modules/core-java-nio/src/main/java/com/baeldung/lines/NumberOfLineFinder.java
@@ -37,7 +37,7 @@ public class NumberOfLineFinder {
         int lines = 0;
         try (LineNumberReader reader = new LineNumberReader(new FileReader(fileName))) {
             reader.skip(Integer.MAX_VALUE);
-            lines = reader.getLineNumber() + 1;
+            lines = reader.getLineNumber();
         } catch (IOException ioe) {
             ioe.printStackTrace();
         }
diff --git a/core-java-modules/core-java-nio/src/test/java/com/baeldung/creationdate/CreationDateResolverUnitTest.java b/core-java-modules/core-java-nio/src/test/java/com/baeldung/creationdate/CreationDateResolverUnitTest.java
index 5402852c74..5e7929859d 100644
--- a/core-java-modules/core-java-nio/src/test/java/com/baeldung/creationdate/CreationDateResolverUnitTest.java
+++ b/core-java-modules/core-java-nio/src/test/java/com/baeldung/creationdate/CreationDateResolverUnitTest.java
@@ -21,9 +21,11 @@ public class CreationDateResolverUnitTest {
 
         final Instant response = creationDateResolver.resolveCreationTimeWithBasicAttributes(path);
 
-        assertTrue(Instant
-          .now()
-          .isAfter(response));
+        Optional.of(response).ifPresent((value) -> {
+            assertTrue(Instant
+              .now()
+              .isAfter(value));
+        });
 
     }
 
diff --git a/core-java-modules/core-java-numbers-2/pom.xml b/core-java-modules/core-java-numbers-2/pom.xml
index ac3843607e..46e0fa47b4 100644
--- a/core-java-modules/core-java-numbers-2/pom.xml
+++ b/core-java-modules/core-java-numbers-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-numbers-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-numbers-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/formatNumber/FormatNumberUnitTest.java b/core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/formatNumber/FormatNumberUnitTest.java
index 4f0358c6a2..6d78426a56 100644
--- a/core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/formatNumber/FormatNumberUnitTest.java
+++ b/core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/formatNumber/FormatNumberUnitTest.java
@@ -75,8 +75,8 @@ public class FormatNumberUnitTest {
     public void givenCurrency_whenFormatNumberCurrencyWithChosenLocalisation_thenGetExpectedResult() {
         double value = 23_500;
         assertThat(currencyWithChosenLocalisation(value, new Locale("en", "US"))).isEqualTo("$23,500.00");
-        assertThat(currencyWithChosenLocalisation(value, new Locale("zh", "CN"))).isEqualTo("￥23,500.00");
-        assertThat(currencyWithChosenLocalisation(value, new Locale("pl", "PL"))).isEqualTo("23 500 zł");
+        assertThat(currencyWithChosenLocalisation(value, new Locale("zh", "CN"))).isEqualTo("¥23,500.00");
+        assertThat(currencyWithChosenLocalisation(value, new Locale("pl", "PL"))).isEqualTo("23 500,00 zł");
     }
 
 }
diff --git a/core-java-modules/core-java-numbers-6/README.md b/core-java-modules/core-java-numbers-6/README.md
new file mode 100644
index 0000000000..97e4e2ca28
--- /dev/null
+++ b/core-java-modules/core-java-numbers-6/README.md
@@ -0,0 +1,4 @@
+### Relevant Articles:
+- [Java Program to Calculate Pi](https://www.baeldung.com/java-monte-carlo-compute-pi)
+- [Convert Integer to Hexadecimal in Java](https://www.baeldung.com/java-convert-int-to-hex)
+- More articles: [[<-- prev]](../core-java-numbers-5)
diff --git a/core-java-modules/core-java-numbers-6/pom.xml b/core-java-modules/core-java-numbers-6/pom.xml
new file mode 100644
index 0000000000..531f1293d1
--- /dev/null
+++ b/core-java-modules/core-java-numbers-6/pom.xml
@@ -0,0 +1,43 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>core-java-numbers-6</artifactId>
+    <name>core-java-numbers-6</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>${commons-codec}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>core-java-numbers-6</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <properties>
+        <commons-codec>1.15</commons-codec>
+    </properties>
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-numbers-6/src/main/java/com/baeldung/integertohex/IntegerToHex.java b/core-java-modules/core-java-numbers-6/src/main/java/com/baeldung/integertohex/IntegerToHex.java
new file mode 100644
index 0000000000..9f75b9a145
--- /dev/null
+++ b/core-java-modules/core-java-numbers-6/src/main/java/com/baeldung/integertohex/IntegerToHex.java
@@ -0,0 +1,16 @@
+package com.baeldung.integertohex;
+
+class IntegerToHex {
+    static final String digits = "0123456789ABCDEF";
+    static String integerToHex(int input) {
+        if (input <= 0)
+            return "0";
+        StringBuilder hex = new StringBuilder();
+        while (input > 0) {
+            int digit = input % 16;
+            hex.insert(0, digits.charAt(digit));
+            input = input / 16;
+        }
+        return hex.toString();
+    }
+}
diff --git a/core-java-modules/core-java-numbers-6/src/test/java/com/baeldung/integertohex/IntegerToHexUnitTest.java b/core-java-modules/core-java-numbers-6/src/test/java/com/baeldung/integertohex/IntegerToHexUnitTest.java
new file mode 100644
index 0000000000..6073c2d347
--- /dev/null
+++ b/core-java-modules/core-java-numbers-6/src/test/java/com/baeldung/integertohex/IntegerToHexUnitTest.java
@@ -0,0 +1,75 @@
+package com.baeldung.integertohex;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.apache.commons.codec.binary.Hex;
+import org.junit.jupiter.api.Test;
+
+class IntegerToHexUnitTest {
+
+    @Test
+    void givenIntegerValue_whenUseRawMethod_thenWillGetHexValue() {
+        String result = IntegerToHex.integerToHex(1055);
+        assertEquals("41F", result);
+    }
+
+    @Test
+    void givenIntegerNegativeValue_whenUseRawMethod_thenZeroValue() {
+        String result = IntegerToHex.integerToHex(-1055);
+        assertEquals("0", result);
+    }
+
+    @Test
+    void givenIntegerPositiveValue_whenUseStringFormat_thenWillGetHexValue() {
+        String result = String.format("%02x", 255);
+        assertEquals("ff", result);
+    }
+
+    @Test
+    void givenIntegerPositiveValue_whenUseStringFormat_thenWillGetHexValueWithLeftZeros() {
+        String result = String.format("%04x", 255);
+        assertEquals("00ff", result);
+    }
+
+    @Test
+    void givenIntegerPositiveValue_whenUseStringFormat_thenWillGetHexValueWithLeftZerosAndUpperLetter() {
+        String result = String.format("%04X", 255);
+        assertEquals("00FF", result);
+    }
+
+    @Test
+    void givenIntegerValue_whenUseIntegerToHexString_thenWillGetHexValue() {
+        String result = Integer.toHexString(1000);
+        assertEquals("3e8", result);
+    }
+
+    @Test
+    void givenIntegerValue_whenUseLongToHexString_thenWillGetHexValue() {
+        String result = Long.toHexString(255L);
+        assertEquals("ff", result);
+    }
+
+    @Test
+    public void givenNegativeIntegerValue_whenUseIntegerToString_thenWillGetHexValue() {
+        String result = Integer.toString(-1458, 16);
+        assertEquals("-5b2", result);
+    }
+
+    @Test
+    public void givenIntegerValue_whenUseIntegerToString_thenWillGetHexValue() {
+        String result = Integer.toString(1458, 16);
+        assertEquals("5b2", result);
+    }
+
+    @Test
+    public void givenLongValue_whenUseLongToString_thenWillGetHexValue() {
+        String result = Long.toString(158, 16);
+        assertEquals("9e", result);
+    }
+
+    @Test
+    public void givenIntegerValue_whenUseApacheCommons_thenWillGetHexSignedValue() {
+        String result = Hex.encodeHexString(new byte[] { (byte) 254 });
+        assertEquals("fe", result);
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-numbers-6/src/test/java/com/baeldung/pi/PiProgramUnitTest.java b/core-java-modules/core-java-numbers-6/src/test/java/com/baeldung/pi/PiProgramUnitTest.java
new file mode 100644
index 0000000000..d47942a517
--- /dev/null
+++ b/core-java-modules/core-java-numbers-6/src/test/java/com/baeldung/pi/PiProgramUnitTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.pi;
+
+import static org.junit.Assert.*;
+
+import java.util.Random;
+import org.junit.Test;
+
+public class PiProgramUnitTest {
+
+    @Test
+    public void givenPiCalculator_whenCalculatePiWithOneMillionPoints_thenEstimatedPiIsWithinTolerance() {
+        int totalPoints = 1000000;
+        int insideCircle = 0;
+
+        Random random = new Random();
+
+        for (long i = 0; i < totalPoints; i++) {
+            double x = random.nextDouble() * 2 - 1;
+            double y = random.nextDouble() * 2 - 1;
+
+            if (x * x + y * y <= 1) {
+                insideCircle++;
+            }
+
+        }
+        double pi = 4.0 * insideCircle / totalPoints;
+
+        assertEquals(Math.PI, pi, 0.01);
+    }
+
+}
diff --git a/core-java-modules/core-java-numbers-conversions/README.md b/core-java-modules/core-java-numbers-conversions/README.md
new file mode 100644
index 0000000000..21810834bd
--- /dev/null
+++ b/core-java-modules/core-java-numbers-conversions/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [Convert a Number to a Letter in Java](https://www.baeldung.com/java-convert-number-to-letter)
diff --git a/core-java-modules/core-java-numbers-conversions/pom.xml b/core-java-modules/core-java-numbers-conversions/pom.xml
new file mode 100644
index 0000000000..55df86d5c7
--- /dev/null
+++ b/core-java-modules/core-java-numbers-conversions/pom.xml
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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-conversions.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>core-java-numbers-conversions</artifactId>
+    <name>core-java-numbers-conversions</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <build>
+        <finalName>core-java-numbers-conversions</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+</project>
diff --git a/core-java-modules/core-java-numbers-conversions/src/test/java/com/baeldung/numtoletter/ConvertNumberToLetterUnitTest.java b/core-java-modules/core-java-numbers-conversions/src/test/java/com/baeldung/numtoletter/ConvertNumberToLetterUnitTest.java
new file mode 100644
index 0000000000..5652969761
--- /dev/null
+++ b/core-java-modules/core-java-numbers-conversions/src/test/java/com/baeldung/numtoletter/ConvertNumberToLetterUnitTest.java
@@ -0,0 +1,52 @@
+package com.baeldung.numtoletter;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+
+public class ConvertNumberToLetterUnitTest {
+
+    static char numToLetterBySubstr(int i) {
+        String LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        if (i > 0 && i <= 25) {
+            return LETTERS.substring(i, i + 1).charAt(0);
+        } else {
+            return '?';
+        }
+    }
+
+    static char numToLetterByAsciiCode(int i) {
+        if (i > 0 && i <= 25) {
+            return (char) ('A' + i);
+        } else {
+            return '?';
+        }
+    }
+
+    @Test
+    void givenANumber_whenConvertToLetterUsingSubstring_shouldGetExpectedResult() {
+        char negativeInputResult = numToLetterBySubstr(-7);
+        assertEquals('?', negativeInputResult);
+
+        char tooLargeInputResult = numToLetterBySubstr(42);
+        assertEquals('?', tooLargeInputResult);
+
+        char result = numToLetterBySubstr(10);
+        assertEquals('K', result);
+    }
+
+    @Test
+    void givenANumber_whenConvertToLetterUsingAscii_shouldGetExpectedResult() {
+        char negativeInputResult = numToLetterByAsciiCode(-7);
+        assertEquals('?', negativeInputResult);
+
+        char tooLargeInputResult = numToLetterByAsciiCode(42);
+        assertEquals('?', tooLargeInputResult);
+
+        char charResult = numToLetterByAsciiCode(10);
+        assertEquals('K', charResult);
+
+        assertEquals("K", String.valueOf(charResult));
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-numbers/pom.xml b/core-java-modules/core-java-numbers/pom.xml
index 4b2cae8ee9..38def238e8 100644
--- a/core-java-modules/core-java-numbers/pom.xml
+++ b/core-java-modules/core-java-numbers/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-numbers</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-numbers</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-optional/pom.xml b/core-java-modules/core-java-optional/pom.xml
index 08441f6cee..eeefed867e 100644
--- a/core-java-modules/core-java-optional/pom.xml
+++ b/core-java-modules/core-java-optional/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-optional</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-optional</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-os/pom.xml b/core-java-modules/core-java-os/pom.xml
index ef29e435a5..d4ee34b8b7 100644
--- a/core-java-modules/core-java-os/pom.xml
+++ b/core-java-modules/core-java-os/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-os</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-os</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-perf-2/README.md b/core-java-modules/core-java-perf-2/README.md
new file mode 100644
index 0000000000..5616cce48b
--- /dev/null
+++ b/core-java-modules/core-java-perf-2/README.md
@@ -0,0 +1 @@
+## Relevant Articles
diff --git a/core-java-modules/core-java-perf-2/pom.xml b/core-java-modules/core-java-perf-2/pom.xml
new file mode 100644
index 0000000000..a9408ca385
--- /dev/null
+++ b/core-java-modules/core-java-perf-2/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>core-java-perf-2</artifactId>
+    <name>core-java-perf-2</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-perf-2/src/main/java/com/baeldung/highcpu/Application.java b/core-java-modules/core-java-perf-2/src/main/java/com/baeldung/highcpu/Application.java
new file mode 100644
index 0000000000..82162406b3
--- /dev/null
+++ b/core-java-modules/core-java-perf-2/src/main/java/com/baeldung/highcpu/Application.java
@@ -0,0 +1,20 @@
+package com.baeldung.highcpu;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.IntUnaryOperator;
+import java.util.stream.IntStream;
+
+public class Application {
+
+    static List<Integer> generateList() {
+        return IntStream.range(0, 10000000).parallel().map(IntUnaryOperator.identity()).collect(LinkedList::new, List::add, List::addAll);
+    }
+
+    public static void main(String[] args) {
+        List<Integer> list = generateList();
+        long start = System.nanoTime();
+        int value = list.get(9500000);
+        System.out.printf("Found value %d in %d nanos\n", value, (System.nanoTime() - start));
+    }
+}
diff --git a/core-java-modules/core-java-perf/README.md b/core-java-modules/core-java-perf/README.md
index c018ec9927..c400f1d196 100644
--- a/core-java-modules/core-java-perf/README.md
+++ b/core-java-modules/core-java-perf/README.md
@@ -13,3 +13,5 @@ This module contains articles about performance of Java applications
 - [Capturing a Java Thread Dump](https://www.baeldung.com/java-thread-dump)
 - [JMX Ports](https://www.baeldung.com/jmx-ports)
 - [Calling JMX MBean Method From a Shell Script](https://www.baeldung.com/jmx-mbean-shell-access)
+- [External Debugging With JMXTerm](https://www.baeldung.com/java-jmxterm-external-debugging)
+- [Create and Detect Memory Leaks in Java](https://www.baeldung.com/java-create-detect-memory-leaks)
diff --git a/core-java-modules/core-java-perf/pom.xml b/core-java-modules/core-java-perf/pom.xml
index f6f3ef795c..c21fc94ec1 100644
--- a/core-java-modules/core-java-perf/pom.xml
+++ b/core-java-modules/core-java-perf/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-perf</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-perf</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/AbstractPlayerMBean.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/AbstractPlayerMBean.java
new file mode 100644
index 0000000000..698d107c51
--- /dev/null
+++ b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/AbstractPlayerMBean.java
@@ -0,0 +1,16 @@
+package com.baeldung.jmxterm;
+
+import java.util.UUID;
+
+public abstract class AbstractPlayerMBean implements PlayerMBean{
+
+    private final UUID id;
+
+    protected AbstractPlayerMBean() {
+        this.id = UUID.randomUUID();
+    }
+
+    String getId() {
+        return getName() + id.toString();
+    }
+}
diff --git a/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/BroadcastingGuessGame.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/BroadcastingGuessGame.java
new file mode 100644
index 0000000000..921d87c4d7
--- /dev/null
+++ b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/BroadcastingGuessGame.java
@@ -0,0 +1,42 @@
+package com.baeldung.jmxterm;
+
+import javax.management.ListenerNotFoundException;
+import javax.management.MBeanNotificationInfo;
+import javax.management.Notification;
+import javax.management.NotificationBroadcaster;
+import javax.management.NotificationBroadcasterSupport;
+import javax.management.NotificationFilter;
+import javax.management.NotificationListener;
+
+public abstract class BroadcastingGuessGame implements NotificationBroadcaster, GuessGameMBean {
+    private final NotificationBroadcasterSupport broadcaster =
+        new NotificationBroadcasterSupport();
+
+    private long notificationSequence = 0;
+
+    private final MBeanNotificationInfo[] notificationInfo;
+
+    protected BroadcastingGuessGame() {
+        this.notificationInfo = new MBeanNotificationInfo[]{
+            new MBeanNotificationInfo(new String[]{"game"}, Notification.class.getName(), "Game notification")
+        };
+    }
+
+    protected void notifyAboutWinner(Player winner) {
+        String message = "Winner is " + winner.getName() + " with score " + winner.getScore();
+        Notification notification = new Notification("game.winner", this, notificationSequence++, message);
+        broadcaster.sendNotification(notification);
+    }
+
+    public void addNotificationListener(NotificationListener listener, NotificationFilter filter, Object handback) {
+        broadcaster.addNotificationListener(listener, filter, handback);
+    }
+
+    public void removeNotificationListener(NotificationListener listener) throws ListenerNotFoundException {
+        broadcaster.removeNotificationListener(listener);
+    }
+
+    public MBeanNotificationInfo[] getNotificationInfo() {
+        return notificationInfo;
+    }
+}
diff --git a/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/GameRunner.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/GameRunner.java
new file mode 100644
index 0000000000..3955d37504
--- /dev/null
+++ b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/GameRunner.java
@@ -0,0 +1,19 @@
+package com.baeldung.jmxterm;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class GameRunner {
+
+    public static void main(String[] args) {
+        MBeanGameServer mBeanGameServer = new MBeanGameServer();
+        Player bob = new Player("Bob");
+        Player alice = new Player("Alice");
+        Player john = new Player("John");
+        List<Player> players = Arrays.asList(bob, alice, john);
+        GuessGame guessGame = new GuessGame(players);
+        mBeanGameServer.registerGame(guessGame);
+        guessGame.start();
+    }
+
+}
diff --git a/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/GuessGame.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/GuessGame.java
new file mode 100644
index 0000000000..c9d680880f
--- /dev/null
+++ b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/GuessGame.java
@@ -0,0 +1,80 @@
+package com.baeldung.jmxterm;
+
+import static com.baeldung.jmxterm.RandomNumbergenerator.generateRandomNumber;
+
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class GuessGame extends BroadcastingGuessGame {
+
+
+    public static final int SECOND = 1000;
+    private static final Logger log = Logger.getLogger(GuessGame.class.getCanonicalName());
+    private final List<Player> players;
+    private volatile boolean isFinished = false;
+    private volatile boolean isPaused = false;
+
+
+    public GuessGame(List<Player> players) {
+        this.players = players;
+        log.setLevel(Level.WARNING);
+    }
+
+    public void start() {
+        int randomNumber = generateRandomNumber();
+        while (!isFinished) {
+            waitASecond();
+            while (!isPaused && !isFinished) {
+                log.info("Current random number is " + randomNumber);
+                waitASecond();
+                for (Player player : players) {
+                    int guess = player.guessNumber();
+                    if (guess == randomNumber) {
+                        log.info("Players " + player.getName() + " " + guess + " is correct");
+                        player.incrementScore();
+                        notifyAboutWinner(player);
+                        randomNumber = generateRandomNumber();
+                        break;
+                    }
+                    log.info("Player " + player.getName() + " guessed incorrectly with " + guess);
+                }
+                log.info("\n");
+            }
+            if (isPaused) {
+                log.info("Game is paused");
+            }
+            if (isFinished) {
+                log.info("Game is finished");
+            }
+        }
+    }
+
+    @Override
+    public void finishGame() {
+        isFinished = true;
+    }
+
+    @Override
+    public void pauseGame() {
+        isPaused = true;
+    }
+
+    @Override
+    public void unpauseGame() {
+        isPaused = false;
+    }
+
+    public List<Player> getPlayers() {
+        return players;
+    }
+
+    private void waitASecond() {
+        try {
+            Thread.sleep(SECOND);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/GuessGameMBean.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/GuessGameMBean.java
new file mode 100644
index 0000000000..fdf8149f71
--- /dev/null
+++ b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/GuessGameMBean.java
@@ -0,0 +1,8 @@
+package com.baeldung.jmxterm;
+
+public interface GuessGameMBean {
+
+    void finishGame();
+    void pauseGame();
+    void unpauseGame();
+}
diff --git a/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/MBeanGameServer.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/MBeanGameServer.java
new file mode 100644
index 0000000000..922a0baf76
--- /dev/null
+++ b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/MBeanGameServer.java
@@ -0,0 +1,37 @@
+package com.baeldung.jmxterm;
+
+import java.lang.management.ManagementFactory;
+import javax.management.InstanceAlreadyExistsException;
+import javax.management.MBeanRegistrationException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.NotCompliantMBeanException;
+import javax.management.ObjectName;
+
+public class MBeanGameServer {
+
+    public static final String ID_FORMAT = "com.baeldung.jmxterm:type=%s,id=%s";
+    private final MBeanServer server = ManagementFactory.getPlatformMBeanServer();
+
+    public void registerPlayer(AbstractPlayerMBean player) {
+        registerBean(player, "player", player.getId());
+    }
+
+    public void registerGame(GuessGame guessGame) {
+        registerBean(guessGame, "game", "singlegame");
+        guessGame.getPlayers().forEach(this::registerPlayer);
+    }
+
+    private void registerBean(Object bean, String type, String id) {
+        try {
+            ObjectName name = new ObjectName(String.format(ID_FORMAT, type, id));
+            server.registerMBean(bean, name);
+        } catch (InstanceAlreadyExistsException |
+                 MBeanRegistrationException |
+                 NotCompliantMBeanException |
+                 MalformedObjectNameException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/Player.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/Player.java
new file mode 100644
index 0000000000..b24e313902
--- /dev/null
+++ b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/Player.java
@@ -0,0 +1,33 @@
+package com.baeldung.jmxterm;
+
+import static com.baeldung.jmxterm.RandomNumbergenerator.*;
+
+public class Player extends AbstractPlayerMBean {
+    private final String name;
+    private int score = 0;
+
+    public Player(String name) {
+        super();
+        this.name = name;
+    }
+
+    @Override
+    public int guessNumber() {
+        return generateRandomNumber();
+    }
+
+    public void incrementScore() {
+        score++;
+    }
+
+    @Override
+    public int getScore() {
+        return score;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+}
diff --git a/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/PlayerMBean.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/PlayerMBean.java
new file mode 100644
index 0000000000..78b73ff578
--- /dev/null
+++ b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/PlayerMBean.java
@@ -0,0 +1,10 @@
+package com.baeldung.jmxterm;
+
+public interface PlayerMBean {
+
+    int guessNumber();
+
+    int getScore();
+
+    String getName();
+}
diff --git a/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/RandomNumbergenerator.java b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/RandomNumbergenerator.java
new file mode 100644
index 0000000000..1418f502c6
--- /dev/null
+++ b/core-java-modules/core-java-perf/src/main/java/com/baeldung/jmxterm/RandomNumbergenerator.java
@@ -0,0 +1,18 @@
+package com.baeldung.jmxterm;
+
+import java.util.concurrent.ThreadLocalRandom;
+
+public class RandomNumbergenerator {
+
+    private static final int MIN = 0;
+    private static final int MAX = 10;
+
+    private static final ThreadLocalRandom RANDOM = ThreadLocalRandom.current();
+
+    private RandomNumbergenerator() {
+    }
+    public static int generateRandomNumber() {
+        return RANDOM.nextInt(MIN, MAX + 1);
+    }
+
+}
diff --git a/core-java-modules/core-java-perf/src/test/java/com/baeldung/jmxterm/PlayerUnitTest.java b/core-java-modules/core-java-perf/src/test/java/com/baeldung/jmxterm/PlayerUnitTest.java
new file mode 100644
index 0000000000..a0f31b1995
--- /dev/null
+++ b/core-java-modules/core-java-perf/src/test/java/com/baeldung/jmxterm/PlayerUnitTest.java
@@ -0,0 +1,21 @@
+package com.baeldung.jmxterm;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+class PlayerUnitTest {
+
+    @Test
+    void givenNewPlayer_thenScoreIsZero() {
+        Player player = new Player("John");
+        assertEquals(0, player.getScore());
+    }
+
+    @Test
+    void givenNewPlayer_whenIncrementScore_thenScoreIsOne() {
+        Player player = new Player("John");
+        player.incrementScore();
+        assertEquals(1, player.getScore());
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-properties/README.md b/core-java-modules/core-java-properties/README.md
new file mode 100644
index 0000000000..73991634df
--- /dev/null
+++ b/core-java-modules/core-java-properties/README.md
@@ -0,0 +1,6 @@
+## Core Java Properties
+
+### Relevant Articles: 
+
+- [Getting Started with Java Properties](http://www.baeldung.com/java-properties)
+- [Merging java.util.Properties Objects](https://www.baeldung.com/java-merging-properties)
diff --git a/core-java-modules/core-java-properties/pom.xml b/core-java-modules/core-java-properties/pom.xml
new file mode 100644
index 0000000000..9beacabdd5
--- /dev/null
+++ b/core-java-modules/core-java-properties/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>core-java-properties</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-properties</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+    </dependencies>
+
+    <properties>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/util/PropertiesLoader.java b/core-java-modules/core-java-properties/src/main/java/com/baeldung/util/PropertiesLoader.java
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/util/PropertiesLoader.java
rename to core-java-modules/core-java-properties/src/main/java/com/baeldung/util/PropertiesLoader.java
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/java/properties/PropertiesUnitTest.java b/core-java-modules/core-java-properties/src/test/java/com/baeldung/java/properties/PropertiesUnitTest.java
similarity index 100%
rename from core-java-modules/core-java/src/test/java/com/baeldung/java/properties/PropertiesUnitTest.java
rename to core-java-modules/core-java-properties/src/test/java/com/baeldung/java/properties/PropertiesUnitTest.java
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/properties/MergePropertiesUnitTest.java b/core-java-modules/core-java-properties/src/test/java/com/baeldung/properties/MergePropertiesUnitTest.java
similarity index 100%
rename from core-java-modules/core-java/src/test/java/com/baeldung/properties/MergePropertiesUnitTest.java
rename to core-java-modules/core-java-properties/src/test/java/com/baeldung/properties/MergePropertiesUnitTest.java
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/util/PropertiesLoaderUnitTest.java b/core-java-modules/core-java-properties/src/test/java/com/baeldung/util/PropertiesLoaderUnitTest.java
similarity index 100%
rename from core-java-modules/core-java/src/test/java/com/baeldung/util/PropertiesLoaderUnitTest.java
rename to core-java-modules/core-java-properties/src/test/java/com/baeldung/util/PropertiesLoaderUnitTest.java
diff --git a/core-java-modules/core-java/src/test/resources/app.properties b/core-java-modules/core-java-properties/src/test/resources/app.properties
similarity index 100%
rename from core-java-modules/core-java/src/test/resources/app.properties
rename to core-java-modules/core-java-properties/src/test/resources/app.properties
diff --git a/core-java-modules/core-java/src/test/resources/catalog b/core-java-modules/core-java-properties/src/test/resources/catalog
similarity index 100%
rename from core-java-modules/core-java/src/test/resources/catalog
rename to core-java-modules/core-java-properties/src/test/resources/catalog
diff --git a/core-java-modules/core-java/src/test/resources/configuration.properties b/core-java-modules/core-java-properties/src/test/resources/configuration.properties
similarity index 100%
rename from core-java-modules/core-java/src/test/resources/configuration.properties
rename to core-java-modules/core-java-properties/src/test/resources/configuration.properties
diff --git a/core-java-modules/core-java/src/test/resources/default.properties b/core-java-modules/core-java-properties/src/test/resources/default.properties
similarity index 100%
rename from core-java-modules/core-java/src/test/resources/default.properties
rename to core-java-modules/core-java-properties/src/test/resources/default.properties
diff --git a/core-java-modules/core-java/src/test/resources/icons.xml b/core-java-modules/core-java-properties/src/test/resources/icons.xml
similarity index 100%
rename from core-java-modules/core-java/src/test/resources/icons.xml
rename to core-java-modules/core-java-properties/src/test/resources/icons.xml
diff --git a/core-java-modules/core-java-records/README.md b/core-java-modules/core-java-records/README.md
new file mode 100644
index 0000000000..2e7ad00cd3
--- /dev/null
+++ b/core-java-modules/core-java-records/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Overridding hashCode() And equals() For Records](https://www.baeldung.com/java-override-hashcode-equals-records)
diff --git a/core-java-modules/core-java-records/pom.xml b/core-java-modules/core-java-records/pom.xml
new file mode 100644
index 0000000000..ed9a36fc14
--- /dev/null
+++ b/core-java-modules/core-java-records/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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">
+    <parent>
+        <artifactId>core-java-modules</artifactId>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>core-java-records</artifactId>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>16</source>
+                    <target>16</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <maven.compiler.source>19</maven.compiler.source>
+        <maven.compiler.target>19</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-records/src/main/java/com/baeldung/equalshashcoderecords/Movie.java b/core-java-modules/core-java-records/src/main/java/com/baeldung/equalshashcoderecords/Movie.java
new file mode 100644
index 0000000000..e94638e8b5
--- /dev/null
+++ b/core-java-modules/core-java-records/src/main/java/com/baeldung/equalshashcoderecords/Movie.java
@@ -0,0 +1,26 @@
+package com.baeldung.equalshashcoderecords;
+
+import java.util.Objects;
+
+record Movie(String name, Integer yearOfRelease, String distributor) {
+
+@Override
+public boolean equals(Object other) {
+    if (this == other) {
+        return true;
+    }
+    if (other == null) {
+        return false;
+    }
+    Movie movie = (Movie) other;
+    if (movie.name.equals(this.name) && movie.yearOfRelease.equals(this.yearOfRelease)) {
+        return true;
+    }
+    return false;
+}
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, yearOfRelease);
+    }
+}
diff --git a/core-java-modules/core-java-records/src/main/java/com/baeldung/equalshashcoderecords/Person.java b/core-java-modules/core-java-records/src/main/java/com/baeldung/equalshashcoderecords/Person.java
new file mode 100644
index 0000000000..7bfd8ae741
--- /dev/null
+++ b/core-java-modules/core-java-records/src/main/java/com/baeldung/equalshashcoderecords/Person.java
@@ -0,0 +1,5 @@
+package com.baeldung.equalshashcoderecords;
+
+public record Person(String firstName, String lastName, String SSN, String dateOfBirth) {
+};
+
diff --git a/core-java-modules/core-java-records/src/test/java/com/baeldung/equalshashcoderecords/CustomRecordEqualsHashCode.java b/core-java-modules/core-java-records/src/test/java/com/baeldung/equalshashcoderecords/CustomRecordEqualsHashCode.java
new file mode 100644
index 0000000000..074886304f
--- /dev/null
+++ b/core-java-modules/core-java-records/src/test/java/com/baeldung/equalshashcoderecords/CustomRecordEqualsHashCode.java
@@ -0,0 +1,30 @@
+package com.baeldung.equalshashcoderecords;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+import org.junit.Test;
+
+public class CustomRecordEqualsHashCode {
+    @Test
+    public void givenTwoRecords_whenDefaultEquals_thenCompareEquality() {
+        Person robert = new Person("Robert", "Frost", "HDHDB223", "2000-01-02");
+        Person mike = new Person("Mike", "Adams", "ABJDJ2883", "2001-01-02");
+        assertNotEquals(robert, mike);
+    }
+
+    @Test
+    public void givenTwoRecords_hashCodesShouldBeSame() {
+        Person robert = new Person("Robert", "Frost", "HDHDB223", "2000-01-02");
+        Person robertCopy = new Person("Robert", "Frost", "HDHDB223", "2000-01-02");
+        assertEquals(robert.hashCode(), robertCopy.hashCode());
+    }
+
+    @Test
+    public void givenTwoRecords_whenCustomImplementation_thenCompareEquality() {
+        Movie movie1 = new Movie("The Batman", 2022, "WB");
+        Movie movie2 = new Movie("The Batman", 2022, "Dreamworks");
+        assertEquals(movie1, movie2);
+        assertEquals(movie1.hashCode(), movie2.hashCode());
+    }
+}
diff --git a/core-java-modules/core-java-reflection-2/pom.xml b/core-java-modules/core-java-reflection-2/pom.xml
index ee3eeee734..c7a4981533 100644
--- a/core-java-modules/core-java-reflection-2/pom.xml
+++ b/core-java-modules/core-java-reflection-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-reflection-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-reflection-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-reflection-private-constructor/README.md b/core-java-modules/core-java-reflection-private-constructor/README.md
new file mode 100644
index 0000000000..a3c9d00b0a
--- /dev/null
+++ b/core-java-modules/core-java-reflection-private-constructor/README.md
@@ -0,0 +1,10 @@
+### Relevant Articles:
+
+- [Reading the Value of ‘private’ Fields from a Different Class in Java](https://www.baeldung.com/java-reflection-read-private-field-value)
+- [Set Field Value With Reflection](https://www.baeldung.com/java-set-private-field-value)
+- [Checking If a Method is Static Using Reflection in Java](https://www.baeldung.com/java-check-method-is-static)
+- [Checking if a Java Class is ‘abstract’ Using Reflection](https://www.baeldung.com/java-reflection-is-class-abstract)
+- [Invoking a Private Method in Java](https://www.baeldung.com/java-call-private-method)
+- [Finding All Classes in a Java Package](https://www.baeldung.com/java-find-all-classes-in-package)
+- [Invoke a Static Method Using Java Reflection API](https://www.baeldung.com/java-invoke-static-method-reflection)
+- [What Is the JDK com.sun.proxy.$Proxy Class?](https://www.baeldung.com/jdk-com-sun-proxy)
diff --git a/core-java-modules/core-java-reflection-private-constructor/pom.xml b/core-java-modules/core-java-reflection-private-constructor/pom.xml
new file mode 100644
index 0000000000..aee7815e23
--- /dev/null
+++ b/core-java-modules/core-java-reflection-private-constructor/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>core-java-reflection-private-constructor</artifactId>
+    <name>core-java-reflection-private-constructor</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>${reflections.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>core-java-reflection-private-constructor</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${source.version}</source>
+                    <target>${target.version}</target>
+                    <compilerArgument>-parameters</compilerArgument>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <reflections.version>0.9.12</reflections.version>
+        <source.version>1.8</source.version>
+        <target.version>1.8</target.version>
+        <spring.version>5.3.4</spring.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-reflection-private-constructor/src/main/java/com/baeldung/reflection/PrivateConstructorClass.java b/core-java-modules/core-java-reflection-private-constructor/src/main/java/com/baeldung/reflection/PrivateConstructorClass.java
new file mode 100644
index 0000000000..24e7d435c7
--- /dev/null
+++ b/core-java-modules/core-java-reflection-private-constructor/src/main/java/com/baeldung/reflection/PrivateConstructorClass.java
@@ -0,0 +1,8 @@
+package com.baeldung.reflection;
+
+public class PrivateConstructorClass {
+
+    private PrivateConstructorClass() {
+        System.out.println("Used the private constructor!");
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-reflection-private-constructor/src/test/java/com/baeldung/reflection/PrivateConstructorUnitTest.java b/core-java-modules/core-java-reflection-private-constructor/src/test/java/com/baeldung/reflection/PrivateConstructorUnitTest.java
new file mode 100644
index 0000000000..cd1f48d720
--- /dev/null
+++ b/core-java-modules/core-java-reflection-private-constructor/src/test/java/com/baeldung/reflection/PrivateConstructorUnitTest.java
@@ -0,0 +1,17 @@
+package com.baeldung.reflection;
+
+import java.lang.reflect.Constructor;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class PrivateConstructorUnitTest {
+
+    @Test
+    public void whenConstructorIsPrivate_thenInstanceSuccess() throws Exception {
+        Constructor<PrivateConstructorClass> pcc = PrivateConstructorClass.class.getDeclaredConstructor();
+        pcc.setAccessible(true);
+        PrivateConstructorClass privateConstructorInstance = pcc.newInstance();
+        Assertions.assertTrue(privateConstructorInstance instanceof PrivateConstructorClass);
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-reflection/README.md b/core-java-modules/core-java-reflection/README.md
index f68362611e..b823f43606 100644
--- a/core-java-modules/core-java-reflection/README.md
+++ b/core-java-modules/core-java-reflection/README.md
@@ -8,3 +8,4 @@
 - [What Causes java.lang.reflect.InvocationTargetException?](https://www.baeldung.com/java-lang-reflect-invocationtargetexception)
 - [How to Get a Name of a Method Being Executed?](http://www.baeldung.com/java-name-of-executing-method)
 - [Getting Class Type From a String in Java](https://www.baeldung.com/java-get-class-object-from-string)
+- [Determine if a Class Implements an Interface in Java](https://www.baeldung.com/java-check-class-implements-interface)
diff --git a/core-java-modules/core-java-reflection/pom.xml b/core-java-modules/core-java-reflection/pom.xml
index 1706bf3c45..a836ee4a22 100644
--- a/core-java-modules/core-java-reflection/pom.xml
+++ b/core-java-modules/core-java-reflection/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-reflection</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-reflection</name>
     <packaging>jar</packaging>
 
@@ -14,6 +13,19 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>${reflections.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+    </dependencies>
+
     <build>
         <finalName>core-java-reflection</finalName>
         <resources>
@@ -39,6 +51,8 @@
     <properties>
         <source.version>1.8</source.version>
         <target.version>1.8</target.version>
+        <reflections.version>0.10.2</reflections.version>
+        <commons-lang3.version>3.12.0</commons-lang3.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-lang-5/src/main/java/com/baeldung/checkinterface/ChildClass1.java b/core-java-modules/core-java-reflection/src/main/java/com/baeldung/checkinterface/ChildClass1.java
similarity index 100%
rename from core-java-modules/core-java-lang-5/src/main/java/com/baeldung/checkinterface/ChildClass1.java
rename to core-java-modules/core-java-reflection/src/main/java/com/baeldung/checkinterface/ChildClass1.java
diff --git a/core-java-modules/core-java-lang-5/src/main/java/com/baeldung/checkinterface/ChildClass2.java b/core-java-modules/core-java-reflection/src/main/java/com/baeldung/checkinterface/ChildClass2.java
similarity index 100%
rename from core-java-modules/core-java-lang-5/src/main/java/com/baeldung/checkinterface/ChildClass2.java
rename to core-java-modules/core-java-reflection/src/main/java/com/baeldung/checkinterface/ChildClass2.java
diff --git a/core-java-modules/core-java-lang-5/src/main/java/com/baeldung/checkinterface/ChildInterface1.java b/core-java-modules/core-java-reflection/src/main/java/com/baeldung/checkinterface/ChildInterface1.java
similarity index 100%
rename from core-java-modules/core-java-lang-5/src/main/java/com/baeldung/checkinterface/ChildInterface1.java
rename to core-java-modules/core-java-reflection/src/main/java/com/baeldung/checkinterface/ChildInterface1.java
diff --git a/core-java-modules/core-java-lang-5/src/main/java/com/baeldung/checkinterface/ChildInterface2.java b/core-java-modules/core-java-reflection/src/main/java/com/baeldung/checkinterface/ChildInterface2.java
similarity index 100%
rename from core-java-modules/core-java-lang-5/src/main/java/com/baeldung/checkinterface/ChildInterface2.java
rename to core-java-modules/core-java-reflection/src/main/java/com/baeldung/checkinterface/ChildInterface2.java
diff --git a/core-java-modules/core-java-lang-5/src/main/java/com/baeldung/checkinterface/MasterClass.java b/core-java-modules/core-java-reflection/src/main/java/com/baeldung/checkinterface/MasterClass.java
similarity index 100%
rename from core-java-modules/core-java-lang-5/src/main/java/com/baeldung/checkinterface/MasterClass.java
rename to core-java-modules/core-java-reflection/src/main/java/com/baeldung/checkinterface/MasterClass.java
diff --git a/core-java-modules/core-java-lang-5/src/main/java/com/baeldung/checkinterface/MasterInterface.java b/core-java-modules/core-java-reflection/src/main/java/com/baeldung/checkinterface/MasterInterface.java
similarity index 100%
rename from core-java-modules/core-java-lang-5/src/main/java/com/baeldung/checkinterface/MasterInterface.java
rename to core-java-modules/core-java-reflection/src/main/java/com/baeldung/checkinterface/MasterInterface.java
diff --git a/core-java-modules/core-java-lang-5/src/test/java/com/baeldung/checkinterface/CheckInterfaceUnitTest.java b/core-java-modules/core-java-reflection/src/test/java/com/baeldung/checkinterface/CheckInterfaceUnitTest.java
similarity index 97%
rename from core-java-modules/core-java-lang-5/src/test/java/com/baeldung/checkinterface/CheckInterfaceUnitTest.java
rename to core-java-modules/core-java-reflection/src/test/java/com/baeldung/checkinterface/CheckInterfaceUnitTest.java
index dcbbb7eb05..3a72cdf0db 100644
--- a/core-java-modules/core-java-lang-5/src/test/java/com/baeldung/checkinterface/CheckInterfaceUnitTest.java
+++ b/core-java-modules/core-java-reflection/src/test/java/com/baeldung/checkinterface/CheckInterfaceUnitTest.java
@@ -1,154 +1,154 @@
-package com.baeldung.checkinterface;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.commons.lang3.ClassUtils;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.reflections.ReflectionUtils;
-import org.reflections.Reflections;
-
-public class CheckInterfaceUnitTest {
-    
-    protected static Reflections reflections;
-    
-    @BeforeAll
-    public static void initializeReflectionsLibrary() {
-        
-        reflections = new Reflections("com.baeldung.checkinterface");
-    }
-
-    @Test
-    public void whenUsingReflectionGetInterfaces_thenDirectlyImplementedInterfaceIsFound() {
-        
-        ChildClass2 childClass2 = new ChildClass2();        
-        List<Class<?>> interfaces = Arrays.asList(childClass2.getClass().getInterfaces());
-        
-        assertEquals(1, interfaces.size());
-        assertTrue(interfaces.contains(ChildInterface2.class));
-    }
-    
-    @Test
-    public void whenUsingReflectionGetInterfaces_thenParentInterfaceIsNotFound() {
-        
-        ChildClass2 childClass2 = new ChildClass2();        
-        List<Class<?>> interfaces = Arrays.asList(childClass2.getClass().getInterfaces());
-        
-        assertFalse(interfaces.contains(MasterInterface.class));
-    }
-    
-    @Test
-    public void whenUsingReflectionGetInterfacesRecursively_thenParentInterfaceIsFound() {
-        
-        Set<Class<?>> interfaces = getAllExtendedOrImplementedInterfacesRecursively(ChildClass2.class);
-        
-        assertTrue(interfaces.contains(ChildInterface2.class));
-        assertTrue(interfaces.contains(MasterInterface.class));
-    }
-    
-    @Test
-    public void whenUsingReflectionIsAssignableFrom_thenDirectlyImplementedInterfaceIsFound() {
-        
-        ChildClass2 childClass2 = new ChildClass2();        
-        
-        assertTrue(ChildInterface2.class.isAssignableFrom(childClass2.getClass()));
-    }
-    
-    @Test
-    public void whenUsingReflectionIsAssignableFrom_thenParentInterfaceIsFound() {
-        
-        ChildClass2 childClass2 = new ChildClass2();        
-        
-        assertTrue(MasterInterface.class.isAssignableFrom(childClass2.getClass()));
-    }
-    
-    @Test
-    public void whenUsingReflectionIsInstance_thenDirectlyImplementedInterfaceIsFound() {
-        
-        ChildClass2 childClass2 = new ChildClass2();        
-        
-        assertTrue(ChildInterface2.class.isInstance(childClass2));
-    }
-    
-    @Test
-    public void whenUsingReflectionIsInstance_thenParentInterfaceIsFound() {
-        
-        ChildClass2 childClass2 = new ChildClass2();        
-        
-        assertTrue(MasterInterface.class.isInstance(childClass2));
-    }
-    
-    @Test
-    public void whenUsingReflectionInstanceOf_thenDirectlyImplementedInterfaceIsFound() {
-        
-        ChildClass2 childClass2 = new ChildClass2();        
-        
-        assertTrue(childClass2 instanceof ChildInterface2);
-    }
-    
-    @Test
-    public void whenUsingReflectionInstanceOf_thenParentInterfaceIsFound() {
-        
-        ChildClass2 childClass2 = new ChildClass2();        
-        
-        assertTrue(childClass2 instanceof MasterInterface);
-    }
-    
-    @Test
-    public void whenUsingCommons_thenDirectlyImplementedInterfaceIsFound() {
-        
-        ChildClass2 childClass2 = new ChildClass2();        
-        List<Class<?>> interfaces = ClassUtils.getAllInterfaces(childClass2.getClass());
-        
-        assertTrue(interfaces.contains(ChildInterface2.class));
-    }
-    
-    @Test
-    public void whenUsingCommons_thenParentInterfaceIsFound() {
-        
-        ChildClass2 childClass2 = new ChildClass2();        
-        List<Class<?>> interfaces = ClassUtils.getAllInterfaces(childClass2.getClass());
-        
-        assertTrue(interfaces.contains(MasterInterface.class));
-    }
-    
-    @Test
-    public void whenUsingReflections_thenDirectlyImplementedInterfaceIsFound() {
-        
-        ChildClass2 childClass2 = new ChildClass2();        
-        Set<Class<?>> interfaces = reflections.get(ReflectionUtils.Interfaces.of(childClass2.getClass()));
-        
-        assertTrue(interfaces.contains(ChildInterface2.class));
-    }
-    
-    @Test
-    public void whenUsingReflections_thenParentInterfaceIsFound() {
-        
-        ChildClass2 childClass2 = new ChildClass2();        
-        Set<Class<?>> interfaces = reflections.get(ReflectionUtils.Interfaces.of(childClass2.getClass()));
-        
-        assertTrue(interfaces.contains(MasterInterface.class));
-    }
-    
-    static Set<Class<?>> getAllExtendedOrImplementedInterfacesRecursively(Class<?> clazz) { 
-        
-        Set<Class<?>> res = new HashSet<Class<?>>(); 
-        Class<?>[] interfaces = clazz.getInterfaces(); 
-        
-        if (interfaces.length > 0) { 
-            res.addAll(Arrays.asList(interfaces)); 
-            for (Class<?> interfaze : interfaces) { 
-                res.addAll(getAllExtendedOrImplementedInterfacesRecursively(interfaze)); 
-                } 
-            } 
-        
-        return res; 
-       }
-}
+package com.baeldung.checkinterface;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.lang3.ClassUtils;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.reflections.ReflectionUtils;
+import org.reflections.Reflections;
+
+public class CheckInterfaceUnitTest {
+    
+    protected static Reflections reflections;
+    
+    @BeforeAll
+    public static void initializeReflectionsLibrary() {
+        
+        reflections = new Reflections("com.baeldung.checkinterface");
+    }
+
+    @Test
+    public void whenUsingReflectionGetInterfaces_thenDirectlyImplementedInterfaceIsFound() {
+        
+        ChildClass2 childClass2 = new ChildClass2();        
+        List<Class<?>> interfaces = Arrays.asList(childClass2.getClass().getInterfaces());
+        
+        assertEquals(1, interfaces.size());
+        assertTrue(interfaces.contains(ChildInterface2.class));
+    }
+    
+    @Test
+    public void whenUsingReflectionGetInterfaces_thenParentInterfaceIsNotFound() {
+        
+        ChildClass2 childClass2 = new ChildClass2();        
+        List<Class<?>> interfaces = Arrays.asList(childClass2.getClass().getInterfaces());
+        
+        assertFalse(interfaces.contains(MasterInterface.class));
+    }
+    
+    @Test
+    public void whenUsingReflectionGetInterfacesRecursively_thenParentInterfaceIsFound() {
+        
+        Set<Class<?>> interfaces = getAllExtendedOrImplementedInterfacesRecursively(ChildClass2.class);
+        
+        assertTrue(interfaces.contains(ChildInterface2.class));
+        assertTrue(interfaces.contains(MasterInterface.class));
+    }
+    
+    @Test
+    public void whenUsingReflectionIsAssignableFrom_thenDirectlyImplementedInterfaceIsFound() {
+        
+        ChildClass2 childClass2 = new ChildClass2();        
+        
+        assertTrue(ChildInterface2.class.isAssignableFrom(childClass2.getClass()));
+    }
+    
+    @Test
+    public void whenUsingReflectionIsAssignableFrom_thenParentInterfaceIsFound() {
+        
+        ChildClass2 childClass2 = new ChildClass2();        
+        
+        assertTrue(MasterInterface.class.isAssignableFrom(childClass2.getClass()));
+    }
+    
+    @Test
+    public void whenUsingReflectionIsInstance_thenDirectlyImplementedInterfaceIsFound() {
+        
+        ChildClass2 childClass2 = new ChildClass2();        
+        
+        assertTrue(ChildInterface2.class.isInstance(childClass2));
+    }
+    
+    @Test
+    public void whenUsingReflectionIsInstance_thenParentInterfaceIsFound() {
+        
+        ChildClass2 childClass2 = new ChildClass2();        
+        
+        assertTrue(MasterInterface.class.isInstance(childClass2));
+    }
+    
+    @Test
+    public void whenUsingReflectionInstanceOf_thenDirectlyImplementedInterfaceIsFound() {
+        
+        ChildClass2 childClass2 = new ChildClass2();        
+        
+        assertTrue(childClass2 instanceof ChildInterface2);
+    }
+    
+    @Test
+    public void whenUsingReflectionInstanceOf_thenParentInterfaceIsFound() {
+        
+        ChildClass2 childClass2 = new ChildClass2();        
+        
+        assertTrue(childClass2 instanceof MasterInterface);
+    }
+    
+    @Test
+    public void whenUsingCommons_thenDirectlyImplementedInterfaceIsFound() {
+        
+        ChildClass2 childClass2 = new ChildClass2();        
+        List<Class<?>> interfaces = ClassUtils.getAllInterfaces(childClass2.getClass());
+        
+        assertTrue(interfaces.contains(ChildInterface2.class));
+    }
+    
+    @Test
+    public void whenUsingCommons_thenParentInterfaceIsFound() {
+        
+        ChildClass2 childClass2 = new ChildClass2();        
+        List<Class<?>> interfaces = ClassUtils.getAllInterfaces(childClass2.getClass());
+        
+        assertTrue(interfaces.contains(MasterInterface.class));
+    }
+    
+    @Test
+    public void whenUsingReflections_thenDirectlyImplementedInterfaceIsFound() {
+        
+        ChildClass2 childClass2 = new ChildClass2();        
+        Set<Class<?>> interfaces = reflections.get(ReflectionUtils.Interfaces.of(childClass2.getClass()));
+        
+        assertTrue(interfaces.contains(ChildInterface2.class));
+    }
+    
+    @Test
+    public void whenUsingReflections_thenParentInterfaceIsFound() {
+        
+        ChildClass2 childClass2 = new ChildClass2();        
+        Set<Class<?>> interfaces = reflections.get(ReflectionUtils.Interfaces.of(childClass2.getClass()));
+        
+        assertTrue(interfaces.contains(MasterInterface.class));
+    }
+    
+    static Set<Class<?>> getAllExtendedOrImplementedInterfacesRecursively(Class<?> clazz) { 
+        
+        Set<Class<?>> res = new HashSet<Class<?>>(); 
+        Class<?>[] interfaces = clazz.getInterfaces(); 
+        
+        if (interfaces.length > 0) { 
+            res.addAll(Arrays.asList(interfaces)); 
+            for (Class<?> interfaze : interfaces) { 
+                res.addAll(getAllExtendedOrImplementedInterfacesRecursively(interfaze)); 
+                } 
+            } 
+        
+        return res; 
+       }
+}
diff --git a/core-java-modules/core-java-regex-2/README.md b/core-java-modules/core-java-regex-2/README.md
index 453e2cc419..f733d7770a 100644
--- a/core-java-modules/core-java-regex-2/README.md
+++ b/core-java-modules/core-java-regex-2/README.md
@@ -5,4 +5,5 @@
 - [Converting Camel Case and Title Case to Words in Java](https://www.baeldung.com/java-camel-case-title-case-to-words)
 - [How to Use Regular Expressions to Replace Tokens in Strings in Java](https://www.baeldung.com/java-regex-token-replacement)
 - [Creating a Java Array from Regular Expression Matches](https://www.baeldung.com/java-array-regex-matches)
+- [Getting the Text That Follows After the Regex Match in Java](https://www.baeldung.com/java-regex-text-after-match)
 - More articles: [[<-- prev]](/core-java-modules/core-java-regex)
diff --git a/core-java-modules/core-java-regex-2/pom.xml b/core-java-modules/core-java-regex-2/pom.xml
index ae9385e63c..ddfba35cb2 100644
--- a/core-java-modules/core-java-regex-2/pom.xml
+++ b/core-java-modules/core-java-regex-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-regex-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-regex-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-regex-2/src/test/java/com/baeldung/regex/aftermatch/GetTextAfterTheRegexMatchUnitTest.java b/core-java-modules/core-java-regex-2/src/test/java/com/baeldung/regex/aftermatch/GetTextAfterTheRegexMatchUnitTest.java
new file mode 100644
index 0000000000..04650a0c02
--- /dev/null
+++ b/core-java-modules/core-java-regex-2/src/test/java/com/baeldung/regex/aftermatch/GetTextAfterTheRegexMatchUnitTest.java
@@ -0,0 +1,83 @@
+package com.baeldung.regex.aftermatch;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class GetTextAfterTheRegexMatchUnitTest {
+    private static final String INPUT1 = "Some text, targetValue=Regex is cool";
+    private static final String INPUT2 = "Some text. targetValue=Java is cool. some other text";
+
+    @Test
+    void whenUsingSplit_thenGetExpectedString() {
+        String result1 = INPUT1.split("targetValue=")[1];
+        assertEquals("Regex is cool", result1);
+
+        String afterFirstSplit = INPUT2.split("targetValue=")[1];
+        assertEquals("Java is cool. some other text", afterFirstSplit);
+        String result2 = afterFirstSplit.split("[.]")[0];
+        assertEquals("Java is cool", result2);
+
+        // if use the dot as the regex for splitting, the result array is empty
+        String[] splitByDot = INPUT2.split("targetValue=")[1].split(".");
+        assertEquals(0, splitByDot.length);
+    }
+
+    @Test
+    void whenUsingReplaceAll_thenGetExpectedString() {
+        String result1 = INPUT1.replaceAll(".*targetValue=", "");
+        assertEquals("Regex is cool", result1);
+
+        String afterFirstReplace = INPUT2.replaceAll(".*targetValue=", "");
+        assertEquals("Java is cool. some other text", afterFirstReplace);
+        String result2 = afterFirstReplace.replaceAll("[.].*", "");
+        assertEquals("Java is cool", result2);
+
+    }
+
+    @Test
+    void whenUsingRegexGrouping_thenGetExpectedString() {
+        Pattern p1 = Pattern.compile("targetValue=(.*)");
+        Matcher m1 = p1.matcher(INPUT1);
+        assertTrue(m1.find());
+        String result1 = m1.group(1);
+        assertEquals("Regex is cool", result1);
+
+        Pattern p2 = Pattern.compile("targetValue=([^.]*)");
+        Matcher m2 = p2.matcher(INPUT2);
+        assertTrue(m2.find());
+        String result2 = m2.group(1);
+        assertEquals("Java is cool", result2);
+
+        Pattern p3 = Pattern.compile("targetValue=(.*?)[.]");
+        Matcher m3 = p3.matcher(INPUT2);
+        assertTrue(m3.find());
+        String result3 = m3.group(1);
+        assertEquals("Java is cool", result3);
+    }
+
+    @Test
+    void whenUsingLookaround_thenGetExpectedString() {
+        Pattern p1 = Pattern.compile("(?<=targetValue=).*");
+        Matcher m1 = p1.matcher(INPUT1);
+        assertTrue(m1.find());
+        String result1 = m1.group();
+        assertEquals("Regex is cool", result1);
+
+        Pattern p2 = Pattern.compile("(?<=targetValue=)[^.]*");
+        Matcher m2 = p2.matcher(INPUT2);
+        assertTrue(m2.find());
+        String result2 = m2.group();
+        assertEquals("Java is cool", result2);
+
+        Pattern p3 = Pattern.compile("(?<=targetValue=).*(?=[.])");
+        Matcher m3 = p3.matcher(INPUT2);
+        assertTrue(m3.find());
+        String result3 = m3.group();
+        assertEquals("Java is cool", result3);
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-regex-2/src/test/java/com/baeldung/regex/z_regexp/ZRegularExpressionUnitTest.java b/core-java-modules/core-java-regex-2/src/test/java/com/baeldung/regex/z_regexp/ZRegularExpressionUnitTest.java
new file mode 100644
index 0000000000..90bbbb6540
--- /dev/null
+++ b/core-java-modules/core-java-regex-2/src/test/java/com/baeldung/regex/z_regexp/ZRegularExpressionUnitTest.java
@@ -0,0 +1,35 @@
+package com.baeldung.regex.z_regexp;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class ZRegularExpressionUnitTest {
+    @Test
+    public void givenCreditCardNumber_thenReturnIfMatched() {
+        String creditCardNumber = "1234567890123456";
+        String pattern = "\\d{16}\\z";
+        Assertions.assertTrue(creditCardNumber.matches(pattern));
+    }
+
+    @Test
+    public void givenLogOutput_thenReturnIfMatched() {
+        String logLine = "2022-05-01 14:30:00,123 INFO Some log message";
+        String pattern = ".*message\\z";
+        Assertions.assertTrue(logLine.matches(pattern));
+    }
+
+    @Test
+    public void givenEmailMessage_thenReturnIfMatched() {
+        String myMessage = "Hello HR, I hope i can write to Baeldung\n";
+        String pattern = ".*Baeldung\\s*\\Z";
+        Assertions.assertTrue(myMessage.matches(pattern));
+    }
+
+    @Test
+    public void givenFileExtension_thenReturnIfMatched() {
+        String fileName = "image.jpeg";
+        String pattern = ".*\\.jpeg\\Z";
+        Assertions.assertTrue(fileName.matches(pattern));
+    }
+
+}
diff --git a/core-java-modules/core-java-regex/pom.xml b/core-java-modules/core-java-regex/pom.xml
index 93f3ae3cdb..00b8107c57 100644
--- a/core-java-modules/core-java-regex/pom.xml
+++ b/core-java-modules/core-java-regex/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-regex</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-regex</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-security-2/pom.xml b/core-java-modules/core-java-security-2/pom.xml
index 7a354ee9e2..0fc121c070 100644
--- a/core-java-modules/core-java-security-2/pom.xml
+++ b/core-java-modules/core-java-security-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-security-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-security-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-security-3/pom.xml b/core-java-modules/core-java-security-3/pom.xml
index 3cd546e697..fef8b53289 100644
--- a/core-java-modules/core-java-security-3/pom.xml
+++ b/core-java-modules/core-java-security-3/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-security-3</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-security-3</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java/src/main/resources/META-INF/BenchmarkList b/core-java-modules/core-java-security-algorithms/classpath
similarity index 100%
rename from core-java-modules/core-java/src/main/resources/META-INF/BenchmarkList
rename to core-java-modules/core-java-security-algorithms/classpath
diff --git a/core-java-modules/core-java-security-algorithms/pom.xml b/core-java-modules/core-java-security-algorithms/pom.xml
index 967ddc103e..0dde9f861a 100644
--- a/core-java-modules/core-java-security-algorithms/pom.xml
+++ b/core-java-modules/core-java-security-algorithms/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-security-algorithms</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-security-algorithms</name>
     <packaging>jar</packaging>
 
@@ -25,7 +24,6 @@
             <artifactId>bcprov-jdk15on</artifactId>
             <version>${bouncycastle.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
diff --git a/core-java-modules/core-java-security/pom.xml b/core-java-modules/core-java-security/pom.xml
index b36de5ac4c..921017b080 100644
--- a/core-java-modules/core-java-security/pom.xml
+++ b/core-java-modules/core-java-security/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-security</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-security</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-serialization/pom.xml b/core-java-modules/core-java-serialization/pom.xml
index c82ae9d1d6..04144fb27f 100644
--- a/core-java-modules/core-java-serialization/pom.xml
+++ b/core-java-modules/core-java-serialization/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-serialization</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-serialization</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-streams-2/pom.xml b/core-java-modules/core-java-streams-2/pom.xml
index c8fa83c55a..9725497b04 100644
--- a/core-java-modules/core-java-streams-2/pom.xml
+++ b/core-java-modules/core-java-streams-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-streams-2</artifactId>
-    <version>1.0</version>
     <name>core-java-streams-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-streams-3/pom.xml b/core-java-modules/core-java-streams-3/pom.xml
index 3074a647ff..9c657119b5 100644
--- a/core-java-modules/core-java-streams-3/pom.xml
+++ b/core-java-modules/core-java-streams-3/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-streams-3</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-streams-3</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/java8/Java8MapAndFlatMap.java b/core-java-modules/core-java-streams-3/src/test/java/com/baeldung/streams/flatmap/map/Java8MapAndFlatMapUnitTest.java
similarity index 94%
rename from core-java-modules/core-java/src/test/java/com/baeldung/java8/Java8MapAndFlatMap.java
rename to core-java-modules/core-java-streams-3/src/test/java/com/baeldung/streams/flatmap/map/Java8MapAndFlatMapUnitTest.java
index a0bd1cf093..1b09ea25c6 100644
--- a/core-java-modules/core-java/src/test/java/com/baeldung/java8/Java8MapAndFlatMap.java
+++ b/core-java-modules/core-java-streams-3/src/test/java/com/baeldung/streams/flatmap/map/Java8MapAndFlatMapUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.java8;
+package com.baeldung.streams.flatmap.map;
 
 import org.junit.Test;
 
@@ -12,7 +12,7 @@ import java.util.stream.Stream;
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 
-public class Java8MapAndFlatMap {
+public class Java8MapAndFlatMapUnitTest {
 
     @Test
     public void givenStream_whenCalledMap_thenProduceList() {
diff --git a/core-java-modules/core-java-streams-4/README.md b/core-java-modules/core-java-streams-4/README.md
index 67b16ac153..c6717ec5fe 100644
--- a/core-java-modules/core-java-streams-4/README.md
+++ b/core-java-modules/core-java-streams-4/README.md
@@ -9,3 +9,4 @@
 - [Stream to Iterable in Java](https://www.baeldung.com/java-stream-to-iterable)
 - [Understanding the Difference Between Stream.of() and IntStream.range()](https://www.baeldung.com/java-stream-of-and-intstream-range)
 - [Check if Object Is an Array in Java](https://www.baeldung.com/java-check-if-object-is-an-array)
+- [Mapping an Array of Integers to Strings Using Java Streams](https://www.baeldung.com/java-stream-integer-array-to-strings)
diff --git a/core-java-modules/core-java-streams-4/pom.xml b/core-java-modules/core-java-streams-4/pom.xml
index 46c0f3f7e1..fe791ebd42 100644
--- a/core-java-modules/core-java-streams-4/pom.xml
+++ b/core-java-modules/core-java-streams-4/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-streams-4</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-streams-4</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-streams-5/README.md b/core-java-modules/core-java-streams-5/README.md
new file mode 100644
index 0000000000..4f367799f2
--- /dev/null
+++ b/core-java-modules/core-java-streams-5/README.md
@@ -0,0 +1 @@
+- [Difference Between parallelStream() and stream().parallel() in Java](https://www.baeldung.com/java-parallelstream-vs-stream-parallel)
diff --git a/core-java-modules/core-java-streams-5/pom.xml b/core-java-modules/core-java-streams-5/pom.xml
new file mode 100644
index 0000000000..d1f8af6461
--- /dev/null
+++ b/core-java-modules/core-java-streams-5/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>core-java-streams-5</artifactId>
+    <name>core-java-streams-5</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit</groupId>
+            <artifactId>junit-bom</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.23.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>core-java-streams-4</finalName>
+        <resources>
+            <resource>
+                <directory>../core-java-streams-4/src/main</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <compilerArgument>-parameters</compilerArgument>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <!-- testing -->
+        <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
+        <maven.compiler.source>12</maven.compiler.source>
+        <maven.compiler.target>12</maven.compiler.target>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-streams-5/src/main/java/com/baeldung/streams/parallelstream/Book.java b/core-java-modules/core-java-streams-5/src/main/java/com/baeldung/streams/parallelstream/Book.java
new file mode 100644
index 0000000000..d52a31aac9
--- /dev/null
+++ b/core-java-modules/core-java-streams-5/src/main/java/com/baeldung/streams/parallelstream/Book.java
@@ -0,0 +1,37 @@
+package com.baeldung.streams.parallelstream;
+
+public class Book {
+    private String name;
+    private String author;
+    private int yearPublished;
+
+    public Book(String name, String author, int yearPublished) {
+        this.name = name;
+        this.author = author;
+        this.yearPublished = yearPublished;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public int getYearPublished() {
+        return yearPublished;
+    }
+
+    public void setYearPublished(int yearPublished) {
+        this.yearPublished = yearPublished;
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-streams-5/src/main/java/com/baeldung/streams/parallelstream/BookSpliterator.java b/core-java-modules/core-java-streams-5/src/main/java/com/baeldung/streams/parallelstream/BookSpliterator.java
new file mode 100644
index 0000000000..7460e1372b
--- /dev/null
+++ b/core-java-modules/core-java-streams-5/src/main/java/com/baeldung/streams/parallelstream/BookSpliterator.java
@@ -0,0 +1,40 @@
+package com.baeldung.streams.parallelstream;
+
+import java.util.Spliterator;
+import java.util.function.Consumer;
+
+public class BookSpliterator<T> implements Spliterator<T> {
+    private final Object[] books;
+    private int startIndex;
+    public BookSpliterator(Object[] books, int startIndex) {
+        this.books = books;
+        this.startIndex = startIndex;
+    }
+
+    @Override
+    public Spliterator<T> trySplit() {
+        // Always Assuming that the source is too small to split, returning null
+        return null;
+    }
+
+    // Other overridden methods such as tryAdvance(), estimateSize() etc
+
+    @Override
+    public boolean tryAdvance(Consumer<? super T> action) {
+        if (startIndex < books.length) {
+            startIndex += 2;
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public long estimateSize() {
+        return books.length - startIndex;
+    }
+
+    @Override
+    public int characteristics() {
+        return CONCURRENT;
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-streams-5/src/main/java/com/baeldung/streams/parallelstream/MyBookContainer.java b/core-java-modules/core-java-streams-5/src/main/java/com/baeldung/streams/parallelstream/MyBookContainer.java
new file mode 100644
index 0000000000..d7e3adc5f1
--- /dev/null
+++ b/core-java-modules/core-java-streams-5/src/main/java/com/baeldung/streams/parallelstream/MyBookContainer.java
@@ -0,0 +1,93 @@
+package com.baeldung.streams.parallelstream;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Spliterator;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+public class MyBookContainer<T> implements Collection<T> {
+    private static final long serialVersionUID = 1L;
+    private T[] elements;
+
+    public MyBookContainer(T[] elements) {
+        this.elements = elements;
+    }
+
+    @Override
+    public Spliterator<T> spliterator() {
+        return new BookSpliterator(elements, 0);
+    }
+
+    @Override
+    public Stream<T> parallelStream() {
+        return StreamSupport.stream(spliterator(), false);
+    }
+
+    // standard overridden methods of Collection Interface
+
+    @Override
+    public int size() {
+        return elements.length;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return elements.length == 0;
+    }
+
+    @Override
+    public boolean contains(Object o) {
+        return false;
+    }
+
+    @Override
+    public Iterator<T> iterator() {
+        return null;
+    }
+
+    @Override
+    public Object[] toArray() {
+        return new Object[0];
+    }
+
+    @Override
+    public <T1> T1[] toArray(T1[] a) {
+        return null;
+    }
+
+    @Override
+    public boolean add(T t) {
+        return false;
+    }
+
+    @Override
+    public boolean remove(Object o) {
+        return false;
+    }
+
+    @Override
+    public boolean containsAll(Collection<?> c) {
+        return false;
+    }
+
+    @Override
+    public boolean addAll(Collection<? extends T> c) {
+        return false;
+    }
+
+    @Override
+    public boolean removeAll(Collection<?> c) {
+        return false;
+    }
+
+    @Override
+    public boolean retainAll(Collection<?> c) {
+        return false;
+    }
+
+    @Override
+    public void clear() {
+
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-streams-5/src/main/java/com/baeldung/streams/parallelstream/ParallelStreamApplication.java b/core-java-modules/core-java-streams-5/src/main/java/com/baeldung/streams/parallelstream/ParallelStreamApplication.java
new file mode 100644
index 0000000000..4297bdd3ed
--- /dev/null
+++ b/core-java-modules/core-java-streams-5/src/main/java/com/baeldung/streams/parallelstream/ParallelStreamApplication.java
@@ -0,0 +1,41 @@
+package com.baeldung.streams.parallelstream;
+
+import java.util.Collection;
+import java.util.concurrent.atomic.AtomicLong;
+
+public class ParallelStreamApplication {
+
+    public long usingCollectionsParallel(Collection<Book> listOfbooks, int year) {
+        AtomicLong countOfBooks = new AtomicLong();
+        listOfbooks.parallelStream()
+          .forEach(book -> {
+              if (book.getYearPublished() == year) {
+                  countOfBooks.getAndIncrement();
+              }
+          });
+        return countOfBooks.get();
+    }
+
+    public long usingStreamParallel(Collection<Book> listOfBooks, int year) {
+        AtomicLong countOfBooks = new AtomicLong();
+        listOfBooks.stream()
+          .parallel()
+          .forEach(book -> {
+              if (book.getYearPublished() == year) {
+                  countOfBooks.getAndIncrement();
+              }
+          });
+        return countOfBooks.get();
+    }
+
+    public long usingWithCustomSpliterator(MyBookContainer<Book> listOfBooks, int year) {
+        AtomicLong countOfBooks = new AtomicLong();
+        listOfBooks.parallelStream()
+          .forEach(book -> {
+              if (book.getYearPublished() == year) {
+                  countOfBooks.getAndIncrement();
+              }
+          });
+        return countOfBooks.get();
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-streams-5/src/test/java/com/baeldung/parallelstream/ParallelStreamUnitTest.java b/core-java-modules/core-java-streams-5/src/test/java/com/baeldung/parallelstream/ParallelStreamUnitTest.java
new file mode 100644
index 0000000000..af8172a10d
--- /dev/null
+++ b/core-java-modules/core-java-streams-5/src/test/java/com/baeldung/parallelstream/ParallelStreamUnitTest.java
@@ -0,0 +1,46 @@
+package com.baeldung.parallelstream;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.baeldung.streams.parallelstream.Book;
+import com.baeldung.streams.parallelstream.MyBookContainer;
+import com.baeldung.streams.parallelstream.ParallelStreamApplication;
+
+public class ParallelStreamUnitTest {
+
+    @Test
+    public void givenCollectionWhenCollectionsParallelIsUsedThenReturnCount() {
+        ParallelStreamApplication parallelStreamApplication = new ParallelStreamApplication();
+        Assert.assertEquals(parallelStreamApplication.usingCollectionsParallel(generateListOfBooks(), 1974), 2);
+    }
+
+    @Test
+    public void givenCollectionWhenStreamParallelIsUsedThenReturnCount() {
+        ParallelStreamApplication parallelStreamApplication = new ParallelStreamApplication();
+        Assert.assertEquals(parallelStreamApplication.usingStreamParallel(generateListOfBooks(), 1974), 2);
+    }
+
+    @Test
+    public void givenBookContainerWhenParallelStreamIsUsedThenReturnIncorrectCount() {
+        ParallelStreamApplication parallelStreamApplication = new ParallelStreamApplication();
+        Assert.assertNotEquals(parallelStreamApplication.usingWithCustomSpliterator(getBookContainer(), 1974), 2);
+    }
+
+    private List<Book> generateListOfBooks() {
+        Book book1 = new Book("The Blue Umbrella", "Ruskin Bond", 1974);
+        Book book2 = new Book("Carrie", "Stephen King", 1974);
+        Book book3 = new Book("The Psychology of money", "Morgan Housel", 2020);
+        List<Book> books = List.of(book1, book2, book3);
+        return books;
+    }
+
+    private MyBookContainer<Book> getBookContainer() {
+        MyBookContainer<Book> listOfBooks = new MyBookContainer<>(new Book[] { new Book("The Blue Umbrella", "Ruskin Bond", 1974),
+          new Book("Carrie", "Stephen King", 1974),
+          new Book("The Psychology of money", "Morgan Housel", 2020)});
+        return listOfBooks;
+    }
+}
diff --git a/core-java-modules/core-java-streams-collect/README.md b/core-java-modules/core-java-streams-collect/README.md
new file mode 100644
index 0000000000..b6659a8ef7
--- /dev/null
+++ b/core-java-modules/core-java-streams-collect/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles:
+- [Can Stream.collect() Return the null Value?](https://www.baeldung.com/stream-collect-returning-null)
diff --git a/core-java-modules/core-java-streams-collect/pom.xml b/core-java-modules/core-java-streams-collect/pom.xml
new file mode 100644
index 0000000000..e81598017c
--- /dev/null
+++ b/core-java-modules/core-java-streams-collect/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>core-java-streams-4</artifactId>
+    <name>core-java-streams-collect</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit</groupId>
+            <artifactId>junit-bom</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <assertj.version>3.23.1</assertj.version>
+    </properties>
+
+</project>
diff --git a/core-java-modules/core-java-streams-collect/src/test/java/com/baeldung/collect/nullable/CanCollectReturnNullUnitTest.java b/core-java-modules/core-java-streams-collect/src/test/java/com/baeldung/collect/nullable/CanCollectReturnNullUnitTest.java
new file mode 100644
index 0000000000..cf02f1d5ea
--- /dev/null
+++ b/core-java-modules/core-java-streams-collect/src/test/java/com/baeldung/collect/nullable/CanCollectReturnNullUnitTest.java
@@ -0,0 +1,92 @@
+package com.baeldung.collect.nullable;
+
+import static java.util.stream.Collectors.collectingAndThen;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toMap;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collector;
+
+import org.junit.jupiter.api.Test;
+
+public class CanCollectReturnNullUnitTest {
+    private final List<String> LANGUAGES = Arrays.asList("Kotlin", null, null, "Java", "Python", "Rust");
+
+    @Test
+    void givenAStreamWithNullElements_whenCollect_shouldReturnNotNull() {
+        List<String> result = LANGUAGES.stream()
+          .filter(Objects::isNull)
+          .collect(toList());
+        assertNotNull(result);
+        assertEquals(Arrays.asList(null, null), result);
+    }
+
+    @Test
+    void givenAStreamWithNullElements_whenCollectEmptyStream_shouldReturnNotNull() {
+        List<String> result = LANGUAGES.stream()
+          .filter(s -> s != null && s.length() == 1)
+          .collect(toList());
+        assertNotNull(result);
+        assertTrue(result.isEmpty());
+
+        Map<Character, String> result2 = LANGUAGES.stream()
+          .filter(s -> s != null && s.length() == 1)
+          .collect(toMap(s -> s.charAt(0), Function.identity()));
+        assertNotNull(result2);
+        assertTrue(result2.isEmpty());
+
+        Map<Character, List<String>> result3 = LANGUAGES.stream()
+          .filter(s -> s != null && s.length() == 1)
+          .collect(groupingBy(s -> s.charAt(0)));
+        assertNotNull(result3);
+        assertTrue(result3.isEmpty());
+    }
+
+    @Test
+    void givenAStream_whenCollectByEmptyToNullCollector_shouldReturnExpectedResults() {
+        Collector<String, ArrayList<String>, ArrayList<String>> emptyListToNullCollector = Collector.of(ArrayList::new, ArrayList::add, (a, b) -> {
+            a.addAll(b);
+            return a;
+        }, a -> a.isEmpty() ? null : a);
+
+        List<String> notNullResult = LANGUAGES.stream()
+          .filter(Objects::isNull)
+          .collect(emptyListToNullCollector);
+        assertNotNull(notNullResult);
+        assertEquals(Arrays.asList(null, null), notNullResult);
+
+        List<String> nullResult = LANGUAGES.stream()
+          .filter(s -> s != null && s.length() == 1)
+          .collect(emptyListToNullCollector);
+        assertNull(nullResult);
+    }
+
+    @Test
+    void givenAStream_whenCollectByCollectingAndThen_shouldReturnExpectedResults() {
+        List<String> notNullResult = LANGUAGES.stream()
+          .filter(Objects::nonNull)
+          .collect(collectingAndThen(toList(), Collections::unmodifiableList));
+        assertNotNull(notNullResult);
+        assertEquals(Arrays.asList("Kotlin", "Java", "Python", "Rust"), notNullResult);
+
+        //the result list becomes immutable
+        assertThrows(UnsupportedOperationException.class, () -> notNullResult.add("Oops"));
+
+        List<String> nullResult = LANGUAGES.stream()
+          .filter(s -> s != null && s.length() == 1)
+          .collect(collectingAndThen(toList(), strings -> strings.isEmpty() ? null : strings));
+        assertNull(nullResult);
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-streams-maps/README.md b/core-java-modules/core-java-streams-maps/README.md
new file mode 100644
index 0000000000..f9f7dffad9
--- /dev/null
+++ b/core-java-modules/core-java-streams-maps/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles:
+- [Handle Duplicate Keys When Producing Map Using Java Stream](https://www.baeldung.com/java-duplicate-keys-when-producing-map-using-stream)
diff --git a/core-java-modules/core-java-streams-maps/pom.xml b/core-java-modules/core-java-streams-maps/pom.xml
new file mode 100644
index 0000000000..66e1fedd87
--- /dev/null
+++ b/core-java-modules/core-java-streams-maps/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>core-java-streams-maps</artifactId>
+    <name>core-java-streams-maps</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit</groupId>
+            <artifactId>junit-bom</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.23.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>core-java-streams-maps</finalName>
+        <resources>
+            <resource>
+                <directory>src/main</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <compilerArgument>-parameters</compilerArgument>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <!-- testing -->
+        <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+</project>
diff --git a/core-java-modules/core-java-streams-maps/src/test/java/com/baeldung/streams/tomap/StreamToMapDuplicatedKeysHandlingUnitTest.java b/core-java-modules/core-java-streams-maps/src/test/java/com/baeldung/streams/tomap/StreamToMapDuplicatedKeysHandlingUnitTest.java
new file mode 100644
index 0000000000..7da8a16062
--- /dev/null
+++ b/core-java-modules/core-java-streams-maps/src/test/java/com/baeldung/streams/tomap/StreamToMapDuplicatedKeysHandlingUnitTest.java
@@ -0,0 +1,97 @@
+package com.baeldung.streams.tomap;
+
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toMap;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+import org.junit.jupiter.api.Test;
+
+class City {
+    private String name;
+    private String locatedIn;
+
+    public City(String name, String locatedIn) {
+        this.name = name;
+        this.locatedIn = locatedIn;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getLocatedIn() {
+        return locatedIn;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof City))
+            return false;
+
+        City city = (City) o;
+
+        if (!name.equals(city.name))
+            return false;
+        return locatedIn.equals(city.locatedIn);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = name.hashCode();
+        result = 31 * result + locatedIn.hashCode();
+        return result;
+    }
+}
+
+public class StreamToMapDuplicatedKeysHandlingUnitTest {
+    // @formatter:off
+    private final List<City> CITY_INPUT = Arrays.asList(
+      new City("New York City", "USA"),
+      new City("Shanghai", "China"),
+      new City("Hamburg", "Germany"),
+      new City("Paris", "France"),
+      new City("Paris", "Texas, USA"));
+    // @formatter:on
+
+    @Test
+    void givenCityList_whenUsingGroupingBy_shouldContainExpectedCity() {
+        Map<String, List<City>> resultMap = CITY_INPUT.stream()
+          .collect(groupingBy(City::getName));
+        assertEquals(4, resultMap.size());
+        // @formatter:off
+        assertEquals(Arrays.asList(
+          new City("Paris", "France"),
+          new City("Paris", "Texas, USA")), resultMap.get("Paris"));
+        // @formatter:on
+
+    }
+
+    @Test
+    void givenCityList_whenContainingDuplicatedNamesUsingToMap_shouldContainExpectedCity() {
+        Map<String, City> resultMap1 = CITY_INPUT.stream()
+          .collect(toMap(City::getName, Function.identity(), (first, second) -> first));
+        assertEquals(4, resultMap1.size());
+        assertEquals(new City("Paris", "France"), resultMap1.get("Paris"));
+
+        Map<String, City> resultMap2 = CITY_INPUT.stream()
+          .collect(toMap(City::getName, Function.identity(), (first, second) -> second));
+        assertEquals(4, resultMap2.size());
+        assertEquals(new City("Paris", "Texas, USA"), resultMap2.get("Paris"));
+
+        Map<String, City> resultMap3 = CITY_INPUT.stream()
+          .collect(toMap(City::getName, Function.identity(), (first, second) -> {
+              String locations = first.getLocatedIn() + " and " + second.getLocatedIn();
+              return new City(first.getName(), locations);
+          }));
+        assertEquals(4, resultMap2.size());
+        assertEquals(new City("Paris", "France and Texas, USA"), resultMap3.get("Paris"));
+    }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-streams/pom.xml b/core-java-modules/core-java-streams/pom.xml
index a6bb827e77..b0794829c2 100644
--- a/core-java-modules/core-java-streams/pom.xml
+++ b/core-java-modules/core-java-streams/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-streams</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-streams</name>
     <packaging>jar</packaging>
 
@@ -15,7 +14,6 @@
     </parent>
 
     <dependencies>
-        <!-- https://mvnrepository.com/artifact/org.openjdk.jmh/jmh-core -->
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
diff --git a/core-java-modules/core-java-string-algorithms-2/pom.xml b/core-java-modules/core-java-string-algorithms-2/pom.xml
index 5af187abc2..3fdb022a4b 100644
--- a/core-java-modules/core-java-string-algorithms-2/pom.xml
+++ b/core-java-modules/core-java-string-algorithms-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-string-algorithms-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-string-algorithms-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-string-algorithms-3/README.md b/core-java-modules/core-java-string-algorithms-3/README.md
index d2863be8e5..c9e7e7d7d4 100644
--- a/core-java-modules/core-java-string-algorithms-3/README.md
+++ b/core-java-modules/core-java-string-algorithms-3/README.md
@@ -10,3 +10,4 @@ This module contains articles about string-related algorithms.
 - [Check if the First Letter of a String is Uppercase](https://www.baeldung.com/java-check-first-letter-uppercase)
 - [Find the First Non Repeating Character in a String in Java](https://www.baeldung.com/java-find-the-first-non-repeating-character)
 - [Find the First Embedded Occurrence of an Integer in a Java String](https://www.baeldung.com/java-string-find-embedded-integer)
+- [Find the Most Frequent Characters in a String](https://www.baeldung.com/java-string-find-most-frequent-characters)
diff --git a/core-java-modules/core-java-string-algorithms-3/pom.xml b/core-java-modules/core-java-string-algorithms-3/pom.xml
index 147ea22375..7d4adeba92 100644
--- a/core-java-modules/core-java-string-algorithms-3/pom.xml
+++ b/core-java-modules/core-java-string-algorithms-3/pom.xml
@@ -3,7 +3,6 @@
     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>core-java-string-algorithms-3</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-string-algorithms-3</name>
     <packaging>jar</packaging>
 
@@ -40,8 +39,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
                     <compilerArgument>-parameters</compilerArgument>
                 </configuration>
             </plugin>
diff --git a/core-java-modules/core-java-string-algorithms-3/src/main/java/com/baeldung/charfreq/CharacterWithHighestFrequency.java b/core-java-modules/core-java-string-algorithms-3/src/main/java/com/baeldung/charfreq/CharacterWithHighestFrequency.java
new file mode 100644
index 0000000000..938ad1edf3
--- /dev/null
+++ b/core-java-modules/core-java-string-algorithms-3/src/main/java/com/baeldung/charfreq/CharacterWithHighestFrequency.java
@@ -0,0 +1,58 @@
+package com.baeldung.charfreq;
+
+import static java.util.Map.Entry.comparingByValue;
+import static java.util.stream.Collectors.counting;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toSet;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public class CharacterWithHighestFrequency {
+    public static Character byStream(String input) {
+        return input.chars()
+          .mapToObj(x -> (char) x)
+          .collect(groupingBy(x -> x, counting()))
+          .entrySet()
+          .stream()
+          .max(comparingByValue())
+          .get()
+          .getKey();
+    }
+
+    public static Set<Character> byMap(String input) {
+        Map<Character, Integer> map = new HashMap<>();
+        for (char c : input.toCharArray()) {
+            map.compute(c, (character, count) -> count == null ? 1 : ++count);
+        }
+        int maxCount = map.values()
+          .stream()
+          .mapToInt(Integer::intValue)
+          .max()
+          .getAsInt();
+
+        return map.keySet()
+          .stream()
+          .filter(c -> map.get(c) == maxCount)
+          .collect(toSet());
+    }
+
+    public static Set<Character> byBucket(String input) {
+        int[] buckets = new int[128];
+
+        int maxCount = 0;
+        for (char c : input.toCharArray()) {
+            buckets[c]++;
+            maxCount = Math.max(buckets[c], maxCount);
+        }
+
+        int finalMaxCount = maxCount;
+        return IntStream.range(0, 128)
+          .filter(c -> buckets[c] == finalMaxCount)
+          .mapToObj(i -> (char) i)
+          .collect(Collectors.toSet());
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-string-algorithms-3/src/test/java/com/baeldung/charfreq/CharacterWithHighestFrequencyUnitTest.java b/core-java-modules/core-java-string-algorithms-3/src/test/java/com/baeldung/charfreq/CharacterWithHighestFrequencyUnitTest.java
new file mode 100644
index 0000000000..978752f3d4
--- /dev/null
+++ b/core-java-modules/core-java-string-algorithms-3/src/test/java/com/baeldung/charfreq/CharacterWithHighestFrequencyUnitTest.java
@@ -0,0 +1,43 @@
+package com.baeldung.charfreq;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Collections;
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+
+import com.google.common.collect.ImmutableSet;
+
+class CharacterWithHighestFrequencyUnitTest {
+    private static final String INPUT1 = "aaaaaaaaaa(10) bbbbbbb ccccc dddd eee ff";
+    private static final Set<Character> EXPECTED1 = Collections.singleton('a');
+
+    private static final String INPUT2 = "YYYYYYY(7) bbbbb -------(7) dddd eee kkkkkkk(7) ff";
+    private static final Set<Character> EXPECTED2 = ImmutableSet.of('Y', '-', 'k');
+
+    @Test
+    void whenGettingSingleCharWithHighestFrequencyByStream_shouldSuccess() {
+        char result1 = CharacterWithHighestFrequency.byStream(INPUT1);
+        assertEquals('a', result1);
+    }
+
+    @Test
+    void whenGettingCharWithHighestFrequencyByMap_shouldSuccess() {
+        Set<Character> result1 = CharacterWithHighestFrequency.byMap(INPUT1);
+        assertEquals(EXPECTED1, result1);
+
+        Set<Character> result2 = CharacterWithHighestFrequency.byMap(INPUT2);
+        assertEquals(EXPECTED2, result2);
+
+    }
+
+    @Test
+    void whenGettingCharWithHighestFrequencyByBucket_shouldSuccess() {
+        Set<Character> result1 = CharacterWithHighestFrequency.byBucket(INPUT1);
+        assertEquals(EXPECTED1, result1);
+
+        Set<Character> result2 = CharacterWithHighestFrequency.byBucket(INPUT2);
+        assertEquals(EXPECTED2, result2);
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-string-algorithms/pom.xml b/core-java-modules/core-java-string-algorithms/pom.xml
index 84f3b61f84..10d28feb2f 100644
--- a/core-java-modules/core-java-string-algorithms/pom.xml
+++ b/core-java-modules/core-java-string-algorithms/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-string-algorithms</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-string-algorithms</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-string-algorithms/src/main/java/com/baeldung/reverse/ReverseStringExamples.java b/core-java-modules/core-java-string-algorithms/src/main/java/com/baeldung/reverse/ReverseStringExamples.java
index 5236f14ccd..07663ab7d1 100644
--- a/core-java-modules/core-java-string-algorithms/src/main/java/com/baeldung/reverse/ReverseStringExamples.java
+++ b/core-java-modules/core-java-string-algorithms/src/main/java/com/baeldung/reverse/ReverseStringExamples.java
@@ -1,5 +1,9 @@
 package com.baeldung.reverse;
 
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
 import org.apache.commons.lang3.StringUtils;
 
 public class ReverseStringExamples {
@@ -46,11 +50,43 @@ public class ReverseStringExamples {
         }
 
         return output.toString()
-            .trim();
+          .trim();
     }
 
     public static String reverseTheOrderOfWordsUsingApacheCommons(String sentence) {
         return StringUtils.reverseDelimited(sentence, ' ');
     }
 
+    public static String reverseUsingIntStreamRangeMethod(String str) {
+        if (str == null) {
+            return null;
+        }
+
+        char[] charArray = str.toCharArray();
+        return IntStream.range(0, str.length())
+          .mapToObj(i -> charArray[str.length() - i - 1])
+          .collect(StringBuilder::new, StringBuilder::append, StringBuilder::append)
+          .toString();
+    }
+
+    public static String reverseUsingStreamOfMethod(String str) {
+        if (str == null) {
+            return null;
+        }
+
+        return Stream.of(str)
+          .map(string -> new StringBuilder(string).reverse())
+          .collect(Collectors.joining());
+    }
+
+    public static String reverseUsingCharsMethod(String str) {
+        if (str == null) {
+            return null;
+        }
+
+        return str.chars()
+          .mapToObj(c -> (char) c)
+          .reduce("", (a, b) -> b + a, (a2, b2) -> b2 + a2);
+    }
+
 }
diff --git a/core-java-modules/core-java-string-algorithms/src/test/java/com/baeldung/reverse/ReverseStringExamplesUnitTest.java b/core-java-modules/core-java-string-algorithms/src/test/java/com/baeldung/reverse/ReverseStringExamplesUnitTest.java
index c122163174..b3685a49da 100644
--- a/core-java-modules/core-java-string-algorithms/src/test/java/com/baeldung/reverse/ReverseStringExamplesUnitTest.java
+++ b/core-java-modules/core-java-string-algorithms/src/test/java/com/baeldung/reverse/ReverseStringExamplesUnitTest.java
@@ -1,10 +1,11 @@
 package com.baeldung.reverse;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-
 public class ReverseStringExamplesUnitTest {
 
     private static final String STRING_INPUT = "cat";
@@ -19,7 +20,7 @@ public class ReverseStringExamplesUnitTest {
         String reversedEmpty = ReverseStringExamples.reverse(StringUtils.EMPTY);
 
         assertEquals(STRING_INPUT_REVERSED, reversed);
-        assertEquals(null, reversedNull);
+        assertNull(reversedNull);
         assertEquals(StringUtils.EMPTY, reversedEmpty);
     }
 
@@ -30,7 +31,7 @@ public class ReverseStringExamplesUnitTest {
         String reversedEmpty = ReverseStringExamples.reverseUsingStringBuilder(StringUtils.EMPTY);
 
         assertEquals(STRING_INPUT_REVERSED, reversed);
-        assertEquals(null, reversedNull);
+        assertNull(reversedNull);
         assertEquals(StringUtils.EMPTY, reversedEmpty);
     }
 
@@ -41,7 +42,7 @@ public class ReverseStringExamplesUnitTest {
         String reversedEmpty = ReverseStringExamples.reverseUsingApacheCommons(StringUtils.EMPTY);
 
         assertEquals(STRING_INPUT_REVERSED, reversed);
-        assertEquals(null, reversedNull);
+        assertNull(reversedNull);
         assertEquals(StringUtils.EMPTY, reversedEmpty);
     }
 
@@ -52,7 +53,7 @@ public class ReverseStringExamplesUnitTest {
         String reversedEmpty = ReverseStringExamples.reverseTheOrderOfWords(StringUtils.EMPTY);
 
         assertEquals(REVERSED_WORDS_SENTENCE, reversed);
-        assertEquals(null, reversedNull);
+        assertNull(reversedNull);
         assertEquals(StringUtils.EMPTY, reversedEmpty);
     }
 
@@ -63,7 +64,40 @@ public class ReverseStringExamplesUnitTest {
         String reversedEmpty = ReverseStringExamples.reverseTheOrderOfWordsUsingApacheCommons(StringUtils.EMPTY);
 
         assertEquals(REVERSED_WORDS_SENTENCE, reversed);
-        assertEquals(null, reversedNull);
+        assertNull(reversedNull);
+        assertEquals(StringUtils.EMPTY, reversedEmpty);
+    }
+
+    @Test
+    public void whenReverseStringUsingIntStreamRangeMethod_ThenCorrectStringIsReturned() {
+        String reversed = ReverseStringExamples.reverseUsingIntStreamRangeMethod(STRING_INPUT);
+        String reversedNull = ReverseStringExamples.reverseUsingIntStreamRangeMethod(null);
+        String reversedEmpty = ReverseStringExamples.reverseUsingIntStreamRangeMethod(StringUtils.EMPTY);
+
+        assertEquals(STRING_INPUT_REVERSED, reversed);
+        assertNull(reversedNull);
+        assertEquals(StringUtils.EMPTY, reversedEmpty);
+    }
+
+    @Test
+    public void whenReverseStringUsingCharsMethod_ThenCorrectStringIsReturned() {
+        String reversed = ReverseStringExamples.reverseUsingCharsMethod(STRING_INPUT);
+        String reversedNull = ReverseStringExamples.reverseUsingCharsMethod(null);
+        String reversedEmpty = ReverseStringExamples.reverseUsingCharsMethod(StringUtils.EMPTY);
+
+        assertEquals(STRING_INPUT_REVERSED, reversed);
+        assertNull(reversedNull);
+        assertEquals(StringUtils.EMPTY, reversedEmpty);
+    }
+
+    @Test
+    public void whenReverseStringUsingStreamOfMethod_ThenCorrectStringIsReturned() {
+        String reversed = ReverseStringExamples.reverseUsingStreamOfMethod(STRING_INPUT);
+        String reversedNull = ReverseStringExamples.reverseUsingStreamOfMethod(null);
+        String reversedEmpty = ReverseStringExamples.reverseUsingStreamOfMethod(StringUtils.EMPTY);
+
+        assertEquals(STRING_INPUT_REVERSED, reversed);
+        assertNull(reversedNull);
         assertEquals(StringUtils.EMPTY, reversedEmpty);
     }
 
diff --git a/core-java-modules/core-java-string-apis-2/pom.xml b/core-java-modules/core-java-string-apis-2/pom.xml
index ba983d7593..db97b85748 100644
--- a/core-java-modules/core-java-string-apis-2/pom.xml
+++ b/core-java-modules/core-java-string-apis-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-string-apis-2</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>core-java-string-apis-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-string-apis-2/src/test/java/com/baeldung/nullandempty/NullAndEmptyStringUnitTest.java b/core-java-modules/core-java-string-apis-2/src/test/java/com/baeldung/nullandempty/NullAndEmptyStringUnitTest.java
new file mode 100644
index 0000000000..332a16fd84
--- /dev/null
+++ b/core-java-modules/core-java-string-apis-2/src/test/java/com/baeldung/nullandempty/NullAndEmptyStringUnitTest.java
@@ -0,0 +1,27 @@
+package com.baeldung.nullandempty;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import org.junit.jupiter.api.Test;
+
+public class NullAndEmptyStringUnitTest {
+
+    @Test
+    void givenANullAndEmptyString_whenUsingStringMethods_thenShouldGetExpectedResult() {
+        String nullString = null;
+        String emptyString = "";
+        assertTrue(emptyString.equals(""));
+        assertThrows(NullPointerException.class, () -> nullString.length());
+    }
+
+    @Test
+    void givenANullAndEmptyString_whenCheckingEquality_thenShouldGetExpectedResult() {
+        String nullString = null;
+        String emptyString = "";
+        assertFalse(emptyString.equals(nullString));
+        assertFalse(emptyString == nullString);
+    }
+
+}
diff --git a/core-java-modules/core-java-string-apis/pom.xml b/core-java-modules/core-java-string-apis/pom.xml
index 6a382c3c57..5d7737228c 100644
--- a/core-java-modules/core-java-string-apis/pom.xml
+++ b/core-java-modules/core-java-string-apis/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-string-apis</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-string-apis</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-string-conversions-2/pom.xml b/core-java-modules/core-java-string-conversions-2/pom.xml
index e424ef3083..90463271b8 100644
--- a/core-java-modules/core-java-string-conversions-2/pom.xml
+++ b/core-java-modules/core-java-string-conversions-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-string-conversions-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-string-conversions-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-string-conversions/pom.xml b/core-java-modules/core-java-string-conversions/pom.xml
index f10ae401b3..b87431cd0b 100644
--- a/core-java-modules/core-java-string-conversions/pom.xml
+++ b/core-java-modules/core-java-string-conversions/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-string-conversions</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-string-conversions</name>
     <packaging>jar</packaging>
 
@@ -44,6 +43,7 @@
 
     <properties>
         <icu4j.version>61.1</icu4j.version>
+        <argLine>-Djava.locale.providers=COMPAT</argLine>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-string-conversions/src/main/java/com/baeldung/stringtoint/StringToIntConverter.java b/core-java-modules/core-java-string-conversions/src/main/java/com/baeldung/stringtoint/StringToIntConverter.java
new file mode 100644
index 0000000000..03d77c2aea
--- /dev/null
+++ b/core-java-modules/core-java-string-conversions/src/main/java/com/baeldung/stringtoint/StringToIntConverter.java
@@ -0,0 +1,52 @@
+package com.baeldung.stringtoint;
+
+import java.util.Optional;
+import org.apache.commons.lang3.math.NumberUtils;
+
+public class StringToIntConverter {
+    
+    private StringToIntConverter() {
+    }
+
+    public static Integer convertStringToIntUsingIntegerParseInt(String input){
+        try {
+            return Integer.parseInt(input);
+        } catch (NumberFormatException e) {
+            // log or handle the error
+            return Integer.MIN_VALUE;
+        }
+    }
+
+    public static Integer convertStringToIntUsingIntegerValueOf(String input){
+        try {
+            return Integer.valueOf(input);
+        } catch (NumberFormatException e) {
+            // log or handle the error
+            return Integer.MIN_VALUE;
+        }
+    }
+
+    public static Integer convertStringToIntUsingIntegerDecode(String input){
+        try {
+            return Integer.decode(input);
+        } catch (Exception e) {
+            // log or handle the error
+            return Integer.MIN_VALUE;
+        }
+    }
+
+    public static Integer convertStringToIntUsingOptional(String input){
+        Optional<Integer> parsedInt;
+        try {
+            parsedInt = Optional.of(Integer.parseInt(input));
+        } catch (Exception e) {
+            // log or handle the error
+            parsedInt = Optional.empty();
+        }
+        return parsedInt.orElse(Integer.MIN_VALUE);
+    }
+
+    public static int convertStringToIntUsingNumberUtils(String input){
+        return NumberUtils.toInt(input, Integer.MIN_VALUE);
+    }
+}
diff --git a/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/datetostring/DateToStringFormatterUnitTest.java b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/datetostring/DateToStringFormatterUnitTest.java
index 221900fb0e..c4fb84713c 100644
--- a/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/datetostring/DateToStringFormatterUnitTest.java
+++ b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/datetostring/DateToStringFormatterUnitTest.java
@@ -1,7 +1,6 @@
 package com.baeldung.datetostring;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -14,7 +13,8 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class DateToStringFormatterUnitTest {
 
diff --git a/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/stringtoint/StringToIntConverterUnitTest.java b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/stringtoint/StringToIntConverterUnitTest.java
new file mode 100644
index 0000000000..2bfb4db161
--- /dev/null
+++ b/core-java-modules/core-java-string-conversions/src/test/java/com/baeldung/stringtoint/StringToIntConverterUnitTest.java
@@ -0,0 +1,53 @@
+package com.baeldung.stringtoint;
+
+import java.util.Arrays;
+import java.util.List;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class StringToIntConverterUnitTest {
+
+    @Test
+    void whenConvertingIntToString_thenInvalidCasesReturnIntegerMinValue() {
+        List<TestData> testData = Arrays.asList(
+                new TestData("", Integer.MIN_VALUE),
+                new TestData(null, Integer.MIN_VALUE),
+                new TestData("23,56", Integer.MIN_VALUE),
+                new TestData("2147483648", Integer.MIN_VALUE),
+                new TestData("-2147483649", Integer.MIN_VALUE),
+                new TestData("hello", Integer.MIN_VALUE)
+        );
+        testData.forEach(data -> {
+                Assertions.assertEquals(data.expectedOutput, StringToIntConverter.convertStringToIntUsingIntegerParseInt(data.input));
+                Assertions.assertEquals(data.expectedOutput, StringToIntConverter.convertStringToIntUsingIntegerValueOf(data.input));
+                Assertions.assertEquals(data.expectedOutput, StringToIntConverter.convertStringToIntUsingOptional(data.input));
+                Assertions.assertEquals(data.expectedOutput, StringToIntConverter.convertStringToIntUsingIntegerDecode(data.input));
+                Assertions.assertEquals(data.expectedOutput, StringToIntConverter.convertStringToIntUsingNumberUtils(data.input));
+        });
+    }
+
+    @Test
+    void whenConvertingIntToString_thenValidCasesReturnUnboxedInt() {
+        List<TestData> testData = Arrays.asList(
+                new TestData("23", 23),
+                new TestData("-23", -23)
+        );
+        testData.forEach(data -> {
+                Assertions.assertEquals(data.expectedOutput, StringToIntConverter.convertStringToIntUsingIntegerParseInt(data.input));
+                Assertions.assertEquals(data.expectedOutput, StringToIntConverter.convertStringToIntUsingIntegerValueOf(data.input));
+                Assertions.assertEquals(data.expectedOutput, StringToIntConverter.convertStringToIntUsingOptional(data.input));
+                Assertions.assertEquals(data.expectedOutput, StringToIntConverter.convertStringToIntUsingNumberUtils(data.input));
+                Assertions.assertEquals(data.expectedOutput, StringToIntConverter.convertStringToIntUsingIntegerDecode(data.input));
+        });
+    }
+
+    public static class TestData{
+        String input;
+        Integer expectedOutput;
+
+        TestData(String input, Integer expectedOutput){
+            this.input = input;
+            this.expectedOutput = expectedOutput;
+        }
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-string-operations-2/pom.xml b/core-java-modules/core-java-string-operations-2/pom.xml
index 92bfa6b2d8..c6debc4f71 100644
--- a/core-java-modules/core-java-string-operations-2/pom.xml
+++ b/core-java-modules/core-java-string-operations-2/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-string-operations-2</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-string-operations-2</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-string-operations-2/src/main/java/com/baeldung/encoding/CharacterEncodingExamples.java b/core-java-modules/core-java-string-operations-2/src/main/java/com/baeldung/encoding/CharacterEncodingExamples.java
index 1ed5f9e62a..11cda28ffe 100644
--- a/core-java-modules/core-java-string-operations-2/src/main/java/com/baeldung/encoding/CharacterEncodingExamples.java
+++ b/core-java-modules/core-java-string-operations-2/src/main/java/com/baeldung/encoding/CharacterEncodingExamples.java
@@ -40,6 +40,6 @@ public class CharacterEncodingExamples {
         charsetDecoder.onMalformedInput(codingErrorAction);
         return new BufferedReader(
           new InputStreamReader(
-            new ByteArrayInputStream(input.getBytes()), charsetDecoder)).readLine();
+            new ByteArrayInputStream(input.getBytes(charset)), charsetDecoder)).readLine();
     }
 }
diff --git a/core-java-modules/core-java-string-operations-2/src/test/java/com/baeldung/encoding/CharacterEncodingExamplesUnitTest.java b/core-java-modules/core-java-string-operations-2/src/test/java/com/baeldung/encoding/CharacterEncodingExamplesUnitTest.java
index 273839de1f..752f2e1e19 100644
--- a/core-java-modules/core-java-string-operations-2/src/test/java/com/baeldung/encoding/CharacterEncodingExamplesUnitTest.java
+++ b/core-java-modules/core-java-string-operations-2/src/test/java/com/baeldung/encoding/CharacterEncodingExamplesUnitTest.java
@@ -75,7 +75,7 @@ public class CharacterEncodingExamplesUnitTest {
 
     @Test
     public void givenUTF8String_whenDecodeByUS_ASCII_thenIgnoreMalformedInputSequence() throws IOException {
-        Assertions.assertEquals("The faade pattern is a software design pattern.", CharacterEncodingExamples.decodeText("The façade pattern is a software design pattern.", StandardCharsets.US_ASCII, CodingErrorAction.IGNORE));
+        Assertions.assertEquals("The fa?ade pattern is a software design pattern.", CharacterEncodingExamples.decodeText("The façade pattern is a software design pattern.", StandardCharsets.US_ASCII, CodingErrorAction.IGNORE));
     }
 
     //@Test
@@ -89,7 +89,8 @@ public class CharacterEncodingExamplesUnitTest {
             CodingErrorAction.REPLACE));
     }
 
-    @Test
+    //@Test
+    // run this manually as it's dependent on platform encoding
     public void givenUTF8String_whenDecodeByUS_ASCII_thenReportMalformedInputSequence() {
         Assertions.assertThrows(
           MalformedInputException.class,
diff --git a/core-java-modules/core-java-string-operations-3/pom.xml b/core-java-modules/core-java-string-operations-3/pom.xml
index 19b3d57ffd..39167271fa 100644
--- a/core-java-modules/core-java-string-operations-3/pom.xml
+++ b/core-java-modules/core-java-string-operations-3/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-string-operations-3</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-string-operations-3</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-string-operations-4/pom.xml b/core-java-modules/core-java-string-operations-4/pom.xml
index 0f1e377d18..cc755cf470 100644
--- a/core-java-modules/core-java-string-operations-4/pom.xml
+++ b/core-java-modules/core-java-string-operations-4/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-string-operations-4</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-string-operations-4</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-string-operations-5/README.md b/core-java-modules/core-java-string-operations-5/README.md
index 94fb7e855e..3a09c8a585 100644
--- a/core-java-modules/core-java-string-operations-5/README.md
+++ b/core-java-modules/core-java-string-operations-5/README.md
@@ -8,3 +8,7 @@
 - [Convert String to String Array](https://www.baeldung.com/java-convert-string-to-string-array)
 - [String Interpolation in Java](https://www.baeldung.com/java-string-interpolation)
 - [Guide to Splitting a String by Whitespace in Java](https://www.baeldung.com/java-splitting-a-string-by-whitespace)
+- [Check if the First Letter of a String Is a Number](https://www.baeldung.com/java-check-if-string-starts-with-number)
+- [Print “” Quotes Around a String in Java](https://www.baeldung.com/java-string-print-quotes)
+- [Remove Punctuation From a String in Java](https://www.baeldung.com/java-remove-punctuation-from-string)
+- [Find the Longest Word in a Given String in Java](https://www.baeldung.com/java-longest-word-string)
diff --git a/core-java-modules/core-java-string-operations-5/pom.xml b/core-java-modules/core-java-string-operations-5/pom.xml
index efb32c73b9..2a2a353984 100644
--- a/core-java-modules/core-java-string-operations-5/pom.xml
+++ b/core-java-modules/core-java-string-operations-5/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-string-operations-5</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-string-operations-5</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-string-operations-5/src/main/java/com/baeldung/firstchardigit/FirstCharDigit.java b/core-java-modules/core-java-string-operations-5/src/main/java/com/baeldung/firstchardigit/FirstCharDigit.java
new file mode 100644
index 0000000000..a43127af1a
--- /dev/null
+++ b/core-java-modules/core-java-string-operations-5/src/main/java/com/baeldung/firstchardigit/FirstCharDigit.java
@@ -0,0 +1,62 @@
+package com.baeldung.firstchardigit;
+
+import java.util.regex.Pattern;
+
+import com.google.common.base.CharMatcher;
+
+public class FirstCharDigit {
+
+    public static boolean checkUsingCharAtMethod(String str) {
+        if (str == null || str.length() == 0) {
+            return false;
+        }
+
+        char c = str.charAt(0);
+        return c >= '0' && c <= '9';
+    }
+
+    public static boolean checkUsingIsDigitMethod(String str) {
+        if (str == null || str.length() == 0) {
+            return false;
+        }
+
+        return Character.isDigit(str.charAt(0));
+    }
+
+    public static boolean checkUsingPatternClass(String str) {
+        if (str == null || str.length() == 0) {
+            return false;
+        }
+
+        return Pattern.compile("^[0-9].*")
+          .matcher(str)
+          .matches();
+    }
+
+    public static boolean checkUsingMatchesMethod(String str) {
+        if (str == null || str.length() == 0) {
+            return false;
+        }
+
+        return str.matches("^[0-9].*");
+    }
+
+    public static boolean checkUsingCharMatcherInRangeMethod(String str) {
+        if (str == null || str.length() == 0) {
+            return false;
+        }
+
+        return CharMatcher.inRange('0', '9')
+          .matches(str.charAt(0));
+    }
+
+    public static boolean checkUsingCharMatcherForPredicateMethod(String str) {
+        if (str == null || str.length() == 0) {
+            return false;
+        }
+
+        return CharMatcher.forPredicate(Character::isDigit)
+          .matches(str.charAt(0));
+    }
+
+}
diff --git a/core-java-modules/core-java-string-operations-5/src/main/java/com/baeldung/longestword/LongestWordFinder.java b/core-java-modules/core-java-string-operations-5/src/main/java/com/baeldung/longestword/LongestWordFinder.java
new file mode 100644
index 0000000000..770984ac29
--- /dev/null
+++ b/core-java-modules/core-java-string-operations-5/src/main/java/com/baeldung/longestword/LongestWordFinder.java
@@ -0,0 +1,36 @@
+package com.baeldung.longestword;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+public class LongestWordFinder {
+
+    public Optional<String> findLongestWord(String sentence) {
+        return Optional.ofNullable(sentence)
+          .filter(string -> !string.trim()
+            .isEmpty())
+          .map(string -> string.split("\\s"))
+          .map(Arrays::asList)
+          .map(list -> Collections.max(list, Comparator.comparingInt(String::length)));
+    }
+
+    public List<String> findLongestWords(String sentence) {
+        if (sentence == null || sentence.trim()
+          .isEmpty()) {
+            return Collections.emptyList();
+        }
+        String[] words = sentence.split("\\s");
+        int maxWordLength = Arrays.stream(words)
+          .mapToInt(String::length)
+          .max()
+          .orElseThrow();
+        return Arrays.stream(words)
+          .filter(word -> word.length() == maxWordLength)
+          .collect(Collectors.toList());
+    }
+
+}
diff --git a/core-java-modules/core-java-string-operations-5/src/test/java/com/baeldung/delpunctuation/RemovePunctuationUnitTest.java b/core-java-modules/core-java-string-operations-5/src/test/java/com/baeldung/delpunctuation/RemovePunctuationUnitTest.java
new file mode 100644
index 0000000000..751ae0f4bc
--- /dev/null
+++ b/core-java-modules/core-java-string-operations-5/src/test/java/com/baeldung/delpunctuation/RemovePunctuationUnitTest.java
@@ -0,0 +1,43 @@
+package com.baeldung.delpunctuation;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class RemovePunctuationUnitTest {
+    private static final String INPUT = "Its 1 W o r d (!@#$%^&*{}[];':\")<>,.";
+    private static final String EXPECTED = "Its 1 W o r d ";
+
+    private static final String UNICODE_INPUT = "3 March März 三月 březen маршировать (!@#$%^&*{}[];':\")<>,.";
+    private static final String UNICODE_EXPECTED = "3 March März 三月 březen маршировать ";
+
+    @Test
+    void whenUsingCharClassRange_thenGetExceptedResult() {
+        String result = INPUT.replaceAll("[^\\sa-zA-Z0-9]", "");
+        assertEquals(EXPECTED, result);
+    }
+
+    @Test
+    void whenUsingPunctuationCharClass_thenGetExceptedResult() {
+        String result = INPUT.replaceAll("\\p{Punct}", "");
+        assertEquals(EXPECTED, result);
+    }
+
+    @Test
+    void whenInputContainsUnicodeChars_thenGetExceptedResult() {
+        String result1 = UNICODE_INPUT.replaceAll("[^\\sa-zA-Z0-9]", "");
+        assertNotEquals(UNICODE_EXPECTED, result1);
+
+        String actualResult1 = "3 March Mrz  bezen  ";
+        assertEquals(actualResult1, result1);
+
+
+        String result2 = UNICODE_INPUT.replaceAll("\\p{Punct}", "");
+        assertEquals(UNICODE_EXPECTED, result2);
+
+        String result3 = UNICODE_INPUT.replaceAll("[^\\s\\p{L}0-9]", "");
+        assertEquals(UNICODE_EXPECTED, result3);
+    }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-string-operations-5/src/test/java/com/baeldung/firstchardigit/FirstCharDigitUnitTest.java b/core-java-modules/core-java-string-operations-5/src/test/java/com/baeldung/firstchardigit/FirstCharDigitUnitTest.java
new file mode 100644
index 0000000000..0095ebcaf3
--- /dev/null
+++ b/core-java-modules/core-java-string-operations-5/src/test/java/com/baeldung/firstchardigit/FirstCharDigitUnitTest.java
@@ -0,0 +1,58 @@
+package com.baeldung.firstchardigit;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+class FirstCharDigitUnitTest {
+
+    @Test
+    void givenString_whenUsingCharAtMethod_thenSuccess() {
+        assertTrue(FirstCharDigit.checkUsingCharAtMethod("12 years"));
+        assertFalse(FirstCharDigit.checkUsingCharAtMethod("years"));
+        assertFalse(FirstCharDigit.checkUsingCharAtMethod(""));
+        assertFalse(FirstCharDigit.checkUsingCharAtMethod(null));
+    }
+
+    @Test
+    void givenString_whenUsingIsDigitMethod_thenSuccess() {
+        assertTrue(FirstCharDigit.checkUsingIsDigitMethod("10 cm"));
+        assertFalse(FirstCharDigit.checkUsingIsDigitMethod("cm"));
+        assertFalse(FirstCharDigit.checkUsingIsDigitMethod(""));
+        assertFalse(FirstCharDigit.checkUsingIsDigitMethod(null));
+    }
+
+    @Test
+    void givenString_whenUsingPatternClass_thenSuccess() {
+        assertTrue(FirstCharDigit.checkUsingPatternClass("1 kg"));
+        assertFalse(FirstCharDigit.checkUsingPatternClass("kg"));
+        assertFalse(FirstCharDigit.checkUsingPatternClass(""));
+        assertFalse(FirstCharDigit.checkUsingPatternClass(null));
+    }
+
+    @Test
+    void givenString_whenUsingMatchesMethod_thenSuccess() {
+        assertTrue(FirstCharDigit.checkUsingMatchesMethod("123"));
+        assertFalse(FirstCharDigit.checkUsingMatchesMethod("ABC"));
+        assertFalse(FirstCharDigit.checkUsingMatchesMethod(""));
+        assertFalse(FirstCharDigit.checkUsingMatchesMethod(null));
+    }
+
+    @Test
+    void givenString_whenUsingCharMatcherInRangeMethod_thenSuccess() {
+        assertTrue(FirstCharDigit.checkUsingCharMatcherInRangeMethod("2023"));
+        assertFalse(FirstCharDigit.checkUsingCharMatcherInRangeMethod("abc"));
+        assertFalse(FirstCharDigit.checkUsingCharMatcherInRangeMethod(""));
+        assertFalse(FirstCharDigit.checkUsingCharMatcherInRangeMethod(null));
+    }
+
+    @Test
+    void givenString_whenUsingCharMatcherForPredicateMethod_thenSuccess() {
+        assertTrue(FirstCharDigit.checkUsingCharMatcherForPredicateMethod("100"));
+        assertFalse(FirstCharDigit.checkUsingCharMatcherForPredicateMethod("abdo"));
+        assertFalse(FirstCharDigit.checkUsingCharMatcherForPredicateMethod(""));
+        assertFalse(FirstCharDigit.checkUsingCharMatcherForPredicateMethod(null));
+    }
+
+}
diff --git a/core-java-modules/core-java-string-operations-5/src/test/java/com/baeldung/longestword/LongestWordFinderUnitTest.java b/core-java-modules/core-java-string-operations-5/src/test/java/com/baeldung/longestword/LongestWordFinderUnitTest.java
new file mode 100644
index 0000000000..9d5f82d493
--- /dev/null
+++ b/core-java-modules/core-java-string-operations-5/src/test/java/com/baeldung/longestword/LongestWordFinderUnitTest.java
@@ -0,0 +1,62 @@
+package com.baeldung.longestword;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+class LongestWordFinderUnitTest {
+
+    LongestWordFinder longestWordFinder = new LongestWordFinder();
+
+    @Test
+    void givenNull_whenFindLongestWord_thenEmpty() {
+        assertThat(longestWordFinder.findLongestWord(null)).isEmpty();
+    }
+
+    @Test
+    void givenEmptyString_whenFindLongestWord_thenEmpty() {
+        assertThat(longestWordFinder.findLongestWord("")).isEmpty();
+    }
+
+    @Test
+    void givenStringWithOnlySpaces_whenFindLongestWord_thenEmpty() {
+        assertThat(longestWordFinder.findLongestWord("   ")).isEmpty();
+    }
+
+    @Test
+    void givenAPhraseWithALongestWord_whenFindLongestWord_thenLongestWordOfThePhrase() {
+        assertThat(longestWordFinder.findLongestWord("This is a phrase with words")).hasValue("phrase");
+    }
+
+    @Test
+    void givenAPhraseWithVariousWordsOfMaxLength_whenFindLongestWord_thenAnyOfTheLongestsWordsOfThePhrase() {
+        assertThat(longestWordFinder.findLongestWord("Baeldung is another word of size eight in this sentence")
+          .get()).isIn("Baeldung", "sentence");
+    }
+
+    @Test
+    void givenNull_whenFindLongestWords_thenEmpty() {
+        assertThat(longestWordFinder.findLongestWords(null)).isEmpty();
+    }
+
+    @Test
+    void givenEmptyString_whenFindLongestWords_thenEmpty() {
+        assertThat(longestWordFinder.findLongestWords("")).isEmpty();
+    }
+
+    @Test
+    void givenStringWithOnlySpaces_whenFindLongestWords_thenEmpty() {
+        assertThat(longestWordFinder.findLongestWords("   ")).isEmpty();
+    }
+
+    @Test
+    void givenAPhraseWithALongestWord_whenFindLongestWords_thenLongestWordOfThePhrase() {
+        assertThat(longestWordFinder.findLongestWords("This is a phrase with words")).containsExactly("phrase");
+    }
+
+    @Test
+    void givenAPhraseWithVariousWordsOfMaxLength_whenFindLongestWords_thenAllLongestsWords() {
+        assertThat(longestWordFinder.findLongestWords("Baeldung is another word of size eight in this sentence")).containsExactly("Baeldung", "sentence");
+    }
+
+}
diff --git a/core-java-modules/core-java-string-operations-5/src/test/java/com/baeldung/stringwithquotes/PrintQuotesAroundAStringUnitTest.java b/core-java-modules/core-java-string-operations-5/src/test/java/com/baeldung/stringwithquotes/PrintQuotesAroundAStringUnitTest.java
new file mode 100644
index 0000000000..fd4ade1ef3
--- /dev/null
+++ b/core-java-modules/core-java-string-operations-5/src/test/java/com/baeldung/stringwithquotes/PrintQuotesAroundAStringUnitTest.java
@@ -0,0 +1,60 @@
+package com.baeldung.stringwithquotes;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class PrintQuotesAroundAStringUnitTest {
+    private final ByteArrayOutputStream outContent = new ByteArrayOutputStream();
+    private final PrintStream originalOut = System.out;
+
+    @BeforeEach
+    void replaceOut() {
+        System.setOut(new PrintStream(outContent));
+    }
+
+    @AfterEach
+    void restoreOut() {
+        System.setOut(originalOut);
+    }
+
+    @Test
+    void whenWrappingAStringWithEscapedQuote_thenGetExpectedResult() {
+        String theySay = "All Java programmers are cute!";
+        String quoted = "\"" + theySay + "\"";
+
+        System.out.println(quoted);
+
+        //assertion
+        String expected = "\"All Java programmers are cute!\"\n";
+        assertEquals(expected, outContent.toString());
+    }
+
+    @Test
+    void whenCallingReplaceAll_thenGetExpectedResult() {
+        String theySay = "Can you write Java code?";
+        String quoted = theySay.replaceAll("^|$", "\"");
+
+        System.out.println(quoted);
+
+        //assertion
+        String expected = "\"Can you write Java code?\"\n";
+        assertEquals(expected, outContent.toString());
+    }
+
+    @Test
+    void whenWrappingAStringWithQuoteChar_thenGetExpectedResult() {
+        String weSay = "Yes, we can write beautiful Java codes!";
+        String quoted = '"' + weSay + '"';
+        System.out.println(quoted);
+
+        //assertion
+        String expected = "\"Yes, we can write beautiful Java codes!\"\n";
+        assertEquals(expected, outContent.toString());
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-string-operations/pom.xml b/core-java-modules/core-java-string-operations/pom.xml
index 20e4df3ba3..577736a324 100644
--- a/core-java-modules/core-java-string-operations/pom.xml
+++ b/core-java-modules/core-java-string-operations/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-string-operations</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-string-operations</name>
     <packaging>jar</packaging>
 
@@ -15,6 +14,11 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.4.0-b180725.0427</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
diff --git a/core-java-modules/core-java-strings/README.md b/core-java-modules/core-java-strings/README.md
index 835e9ec582..84cf31e8bd 100644
--- a/core-java-modules/core-java-strings/README.md
+++ b/core-java-modules/core-java-strings/README.md
@@ -13,3 +13,4 @@ This module contains articles about strings in Java.
 - [Java Multi-line String](https://www.baeldung.com/java-multiline-string)
 - [Guide to Java String Pool](https://www.baeldung.com/java-string-pool)
 - [Fixing “constant string too long” Build Error](https://www.baeldung.com/java-constant-string-too-long-error)
+- [Reuse StringBuilder for Efficiency](https://www.baeldung.com/java-reuse-stringbuilder-for-efficiency)
diff --git a/core-java-modules/core-java-strings/pom.xml b/core-java-modules/core-java-strings/pom.xml
index 2cc35dad5f..e3cdb3c666 100644
--- a/core-java-modules/core-java-strings/pom.xml
+++ b/core-java-modules/core-java-strings/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-strings</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-strings</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-strings/src/main/java/com/baeldung/stringbuilder/ReuseStringBuilderPerformance.java b/core-java-modules/core-java-strings/src/main/java/com/baeldung/stringbuilder/ReuseStringBuilderPerformance.java
new file mode 100644
index 0000000000..b403f859bc
--- /dev/null
+++ b/core-java-modules/core-java-strings/src/main/java/com/baeldung/stringbuilder/ReuseStringBuilderPerformance.java
@@ -0,0 +1,55 @@
+package com.baeldung.stringbuilder;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.SingleShotTime)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@Measurement(batchSize = 100000, iterations = 10)
+@Warmup(batchSize = 100000, iterations = 10)
+@State(Scope.Thread)
+public class ReuseStringBuilderPerformance {
+
+    @Benchmark
+    public void benchmarkStringBuilder() {
+        for (int i = 0; i < 100; i++) {
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append("baeldung");
+            stringBuilder.toString();
+        }
+    }
+
+    @Benchmark
+    public void benchmarkStringBuilderReuseWithSetLength() {
+        StringBuilder stringBuilder = new StringBuilder();
+        for (int i = 0; i < 100; i++) {
+            stringBuilder.append("baeldung");
+            stringBuilder.toString();
+            stringBuilder.setLength(0);
+        }
+    }
+
+    @Benchmark()
+    public void benchmarkStringBuilderReuseWithDelete() {
+        StringBuilder stringBuilder = new StringBuilder();
+        for (int i = 0; i < 100; i++) {
+            stringBuilder.append("baeldung");
+            stringBuilder.toString();
+            stringBuilder.delete(0, stringBuilder.length());
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        Options options = new OptionsBuilder()
+                .include(ReuseStringBuilderPerformance.class.getSimpleName()).threads(1)
+                .forks(1).shouldFailOnError(true)
+                .shouldDoGC(true)
+                .jvmArgs("-server").build();
+        new Runner(options).run();
+    }
+
+}
diff --git a/core-java-modules/core-java-sun/pom.xml b/core-java-modules/core-java-sun/pom.xml
index e959932235..c9427f66a3 100644
--- a/core-java-modules/core-java-sun/pom.xml
+++ b/core-java-modules/core-java-sun/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-sun</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-sun</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-time-measurements/pom.xml b/core-java-modules/core-java-time-measurements/pom.xml
index ac5fb3a5e6..7b2bc31ebb 100644
--- a/core-java-modules/core-java-time-measurements/pom.xml
+++ b/core-java-modules/core-java-time-measurements/pom.xml
@@ -3,9 +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>
-    <groupId>com.baeldung.exception.numberformat</groupId>
     <artifactId>core-java-time-measurements</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>core-java-time-measurements</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-uuid/README.md b/core-java-modules/core-java-uuid/README.md
index 0a77c36acd..bd7bd9d9da 100644
--- a/core-java-modules/core-java-uuid/README.md
+++ b/core-java-modules/core-java-uuid/README.md
@@ -4,3 +4,5 @@
 - [Generating Alphanumeric UUID String in Java](https://www.baeldung.com/java-generate-alphanumeric-uuid)
 - [Guide to UUID in Java](http://www.baeldung.com/java-uuid)
 - [Validate UUID String in Java](https://www.baeldung.com/java-validate-uuid-string)
+- [Generate the Same UUID From a String in Java](https://www.baeldung.com/java-generate-same-uuid-from-string)
+- [Generating Time Based UUIDs](https://www.baeldung.com/java-generating-time-based-uuids)
diff --git a/core-java-modules/core-java-uuid/pom.xml b/core-java-modules/core-java-uuid/pom.xml
index 442a266dab..c0e93c1d32 100644
--- a/core-java-modules/core-java-uuid/pom.xml
+++ b/core-java-modules/core-java-uuid/pom.xml
@@ -4,7 +4,6 @@
     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>core-java-uuid</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>core-java-uuid</name>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-uuid/src/test/java/com/baeldung/uuid/UUIDFromStringUnitTest.java b/core-java-modules/core-java-uuid/src/test/java/com/baeldung/uuid/UUIDFromStringUnitTest.java
new file mode 100644
index 0000000000..381d8715d5
--- /dev/null
+++ b/core-java-modules/core-java-uuid/src/test/java/com/baeldung/uuid/UUIDFromStringUnitTest.java
@@ -0,0 +1,62 @@
+package com.baeldung.uuid;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class UUIDFromStringUnitTest {
+    @Test
+    void whenStringInUUIDFormat_thenFromStringWorks() {
+        String inputStr = "bbcc4621-d88f-4a94-ae2f-b38072bf5087";
+        
+        UUID uuid = UUID.fromString(inputStr);
+        UUID uuid2 = UUID.fromString(inputStr);
+        UUID uuid3 = UUID.fromString(inputStr);
+
+        assertEquals(inputStr, uuid.toString());
+
+        assertEquals(uuid, uuid2);
+        assertEquals(uuid, uuid3);
+
+    }
+
+    @Test
+    void whenStringNotInUUIDFormat_thenFromStringRaisesException() {
+        String inputStr = "I am not a standard UUID representation.";
+        assertThrows(IllegalArgumentException.class, () -> UUID.fromString(inputStr));
+    }
+
+    @Test
+    void whenStringInFreeFormat_thenNameUUIDFromBytesWorks() {
+        String inputStr = "I am not a standard UUID representation.";
+
+        UUID uuid = UUID.nameUUIDFromBytes(inputStr.getBytes());
+        UUID uuid2 = UUID.nameUUIDFromBytes(inputStr.getBytes());
+        UUID uuid3 = UUID.nameUUIDFromBytes(inputStr.getBytes());
+
+        assertTrue(uuid != null);
+
+        assertEquals(uuid, uuid2);
+        assertEquals(uuid, uuid3);
+
+        assertEquals(3, uuid.version());
+    }
+
+    @Test
+    void whenStringInFreeFormat_thenGenerateVer5UUIDWorks() {
+        String inputStr = "I am not a standard UUID representation.";
+
+        UUID uuid = UUIDGenerator.generateType5UUID(inputStr);
+        UUID uuid2 = UUIDGenerator.generateType5UUID(inputStr);
+        UUID uuid3 = UUIDGenerator.generateType5UUID(inputStr);
+
+        assertEquals(5, uuid.version());
+
+        assertTrue(uuid != null);
+
+        assertEquals(uuid, uuid2);
+        assertEquals(uuid, uuid3);
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java/.gitignore b/core-java-modules/core-java/.gitignore
deleted file mode 100644
index 374c8bf907..0000000000
--- a/core-java-modules/core-java/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-*.class
-
-0.*
-
-#folders#
-/target
-/neoDb*
-/data
-/src/main/webapp/WEB-INF/classes
-*/META-INF/*
-.resourceCache
-
-# Packaged files #
-*.jar
-*.war
-*.ear
-
-# Files generated by integration tests
-backup-pom.xml
-/bin/
-/temp
-
-#IntelliJ specific
-.idea/
-*.iml
\ No newline at end of file
diff --git a/core-java-modules/core-java/README.md b/core-java-modules/core-java/README.md
deleted file mode 100644
index 6d9bbe03c2..0000000000
--- a/core-java-modules/core-java/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-## Core Java Cookbooks and Examples
-
-### Relevant Articles: 
-
-- [Getting Started with Java Properties](http://www.baeldung.com/java-properties)
-- [Java Money and the Currency API](http://www.baeldung.com/java-money-and-currency)
-- [Compiling Java *.class Files with javac](http://www.baeldung.com/javac)
-- [Introduction to Javadoc](http://www.baeldung.com/javadoc)
-- [A Guide to the ResourceBundle](http://www.baeldung.com/java-resourcebundle)
-- [Merging java.util.Properties Objects](https://www.baeldung.com/java-merging-properties)
-- [Illegal Character Compilation Error](https://www.baeldung.com/java-illegal-character-error)
-- [Lambda Expression vs. Anonymous Inner Class](https://www.baeldung.com/java-lambdas-vs-anonymous-class)
-- [Difference Between Class.forName() and Class.forName().newInstance()](https://www.baeldung.com/java-class-forname-vs-class-forname-newinstance)
diff --git a/core-java-modules/core-java/customers.xml b/core-java-modules/core-java/customers.xml
deleted file mode 100644
index b52dc27633..0000000000
--- a/core-java-modules/core-java/customers.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-<webRowSet xmlns="http://java.sun.com/xml/ns/jdbc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/jdbc http://java.sun.com/xml/ns/jdbc/webrowset.xsd">
-  <properties>
-    <command>SELECT * FROM customers</command>
-    <concurrency>1008</concurrency>
-    <datasource><null/></datasource>
-    <escape-processing>true</escape-processing>
-    <fetch-direction>1000</fetch-direction>
-    <fetch-size>0</fetch-size>
-    <isolation-level>2</isolation-level>
-    <key-columns>
-    </key-columns>
-    <map>
-    </map>
-    <max-field-size>0</max-field-size>
-    <max-rows>0</max-rows>
-    <query-timeout>0</query-timeout>
-    <read-only>true</read-only>
-    <rowset-type>ResultSet.TYPE_SCROLL_INSENSITIVE</rowset-type>
-    <show-deleted>false</show-deleted>
-    <table-name>customers</table-name>
-    <url>jdbc:h2:mem:testdb</url>
-    <sync-provider>
-      <sync-provider-name>com.sun.rowset.providers.RIOptimisticProvider</sync-provider-name>
-      <sync-provider-vendor>Oracle Corporation</sync-provider-vendor>
-      <sync-provider-version>1.0</sync-provider-version>
-      <sync-provider-grade>2</sync-provider-grade>
-      <data-source-lock>1</data-source-lock>
-    </sync-provider>
-  </properties>
-  <metadata>
-    <column-count>2</column-count>
-    <column-definition>
-      <column-index>1</column-index>
-      <auto-increment>false</auto-increment>
-      <case-sensitive>true</case-sensitive>
-      <currency>false</currency>
-      <nullable>0</nullable>
-      <signed>true</signed>
-      <searchable>true</searchable>
-      <column-display-size>11</column-display-size>
-      <column-label>ID</column-label>
-      <column-name>ID</column-name>
-      <schema-name>PUBLIC</schema-name>
-      <column-precision>10</column-precision>
-      <column-scale>0</column-scale>
-      <table-name>CUSTOMERS</table-name>
-      <catalog-name>TESTDB</catalog-name>
-      <column-type>4</column-type>
-      <column-type-name>INTEGER</column-type-name>
-    </column-definition>
-    <column-definition>
-      <column-index>2</column-index>
-      <auto-increment>false</auto-increment>
-      <case-sensitive>true</case-sensitive>
-      <currency>false</currency>
-      <nullable>0</nullable>
-      <signed>true</signed>
-      <searchable>true</searchable>
-      <column-display-size>50</column-display-size>
-      <column-label>NAME</column-label>
-      <column-name>NAME</column-name>
-      <schema-name>PUBLIC</schema-name>
-      <column-precision>50</column-precision>
-      <column-scale>0</column-scale>
-      <table-name>CUSTOMERS</table-name>
-      <catalog-name>TESTDB</catalog-name>
-      <column-type>12</column-type>
-      <column-type-name>VARCHAR</column-type-name>
-    </column-definition>
-  </metadata>
-  <data>
-    <currentRow>
-      <columnValue>1</columnValue>
-      <columnValue>Customer1</columnValue>
-    </currentRow>
-    <currentRow>
-      <columnValue>2</columnValue>
-      <columnValue>Customer2</columnValue>
-    </currentRow>
-    <currentRow>
-      <columnValue>3</columnValue>
-      <columnValue>Customer3</columnValue>
-    </currentRow>
-    <currentRow>
-      <columnValue>4</columnValue>
-      <columnValue>Customer4</columnValue>
-    </currentRow>
-    <currentRow>
-      <columnValue>5</columnValue>
-      <columnValue>Customer5</columnValue>
-    </currentRow>
-  </data>
-</webRowSet>
diff --git a/core-java-modules/core-java/externalizable.txt b/core-java-modules/core-java/externalizable.txt
deleted file mode 100644
index ddd3e143a8..0000000000
Binary files a/core-java-modules/core-java/externalizable.txt and /dev/null differ
diff --git a/core-java-modules/core-java/pom.xml b/core-java-modules/core-java/pom.xml
deleted file mode 100644
index 87abe6c007..0000000000
--- a/core-java-modules/core-java/pom.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>core-java</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <name>core-java</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.baeldung.core-java-modules</groupId>
-        <artifactId>core-java-modules</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.unix4j</groupId>
-            <artifactId>unix4j-command</artifactId>
-            <version>${unix4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.grep4j</groupId>
-            <artifactId>grep4j</artifactId>
-            <version>${grep4j.version}</version>
-        </dependency>
-        <!-- web -->
-        <!-- marshalling -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <!-- logging -->
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
-        <dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.javamoney</groupId>
-            <artifactId>moneta</artifactId>
-            <version>${javamoney.moneta.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.gdata</groupId>
-            <artifactId>core</artifactId>
-            <version>${gdata.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>core-java</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/libs</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <configuration>
-                    <executable>java</executable>
-                    <mainClass>com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed</mainClass>
-                    <arguments>
-                        <argument>-Xmx300m</argument>
-                        <argument>-XX:+UseParallelGC</argument>
-                        <argument>-classpath</argument>
-                        <classpath />
-                        <argument>com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed</argument>
-                    </arguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${maven-javadoc-plugin.version}</version>
-                <configuration>
-                    <source>${source.version}</source>
-                    <target>${target.version}</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>integration</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <excludes>
-                                        <exclude>**/*ManualTest.java</exclude>
-                                    </excludes>
-                                    <includes>
-                                        <include>**/*IntegrationTest.java</include>
-                                        <include>**/*IntTest.java</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <test.mime>json</test.mime>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>run-benchmarks</id>
-                                <!-- <phase>integration-test</phase> -->
-                                <phase>none</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <classpathScope>test</classpathScope>
-                                    <executable>java</executable>
-                                    <arguments>
-                                        <argument>-classpath</argument>
-                                        <classpath />
-                                        <argument>org.openjdk.jmh.Main</argument>
-                                        <argument>.*</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <properties>
-        <!-- util -->
-        <unix4j.version>0.4</unix4j.version>
-        <grep4j.version>1.8.7</grep4j.version>
-        <!-- maven plugins -->
-        <javamoney.moneta.version>1.1</javamoney.moneta.version>
-        <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
-        <source.version>1.8</source.version>
-        <target.version>1.8</target.version>
-        <spring.core.version>4.3.20.RELEASE</spring.core.version>
-        <gdata.version>1.47.1</gdata.version>
-    </properties>
-
-</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/executable/ExecutableMavenJar.java b/core-java-modules/core-java/src/main/java/com/baeldung/executable/ExecutableMavenJar.java
deleted file mode 100644
index 6c79e89717..0000000000
--- a/core-java-modules/core-java/src/main/java/com/baeldung/executable/ExecutableMavenJar.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.baeldung.executable;
-
-import javax.swing.JOptionPane;
-
-public class ExecutableMavenJar {
-
-    public static void main(String[] args) {
-        JOptionPane.showMessageDialog(null, "It worked!", "Executable Jar with Maven", 1);
-    }
-
-}
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/filesystem/jndi/LookupFSJNDI.java b/core-java-modules/core-java/src/main/java/com/baeldung/filesystem/jndi/LookupFSJNDI.java
deleted file mode 100644
index 7e6bb5d3b2..0000000000
--- a/core-java-modules/core-java/src/main/java/com/baeldung/filesystem/jndi/LookupFSJNDI.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.baeldung.filesystem.jndi;
-
-import java.io.File;
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-public class LookupFSJNDI {
-    private InitialContext ctx = null;
-
-    public LookupFSJNDI() throws NamingException {
-        super();
-        init();
-    }
-
-    private void init() throws NamingException {
-        Hashtable<String, String> env = new Hashtable<String, String>();
-
-        env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.fscontext.RefFSContextFactory");
-        // URI to namespace (actual directory)
-        env.put(Context.PROVIDER_URL, "file:./src/test/resources");
-
-        ctx = new InitialContext(env);
-    }
-
-    public InitialContext getCtx() {
-        return ctx;
-    }
-
-    public File getFile(String fileName) {
-        File file;
-        try {
-            file = (File) getCtx().lookup(fileName);
-        } catch (NamingException e) {
-            file = null;
-        }
-        return file;
-    }
-
-}
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/jsonposturlconnection/PostJSONWithHttpURLConnection.java b/core-java-modules/core-java/src/main/java/com/baeldung/jsonposturlconnection/PostJSONWithHttpURLConnection.java
deleted file mode 100644
index b2469ac984..0000000000
--- a/core-java-modules/core-java/src/main/java/com/baeldung/jsonposturlconnection/PostJSONWithHttpURLConnection.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.baeldung.jsonposturlconnection;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-public class PostJSONWithHttpURLConnection {
-	
-	public static void main (String []args) throws IOException{
-		//Change the URL with any other publicly accessible POST resource, which accepts JSON request body
-		URL url = new URL ("https://reqres.in/api/users");
-		
-		HttpURLConnection con = (HttpURLConnection)url.openConnection();
-		con.setRequestMethod("POST");
-		
-		con.setRequestProperty("Content-Type", "application/json; utf-8");
-		con.setRequestProperty("Accept", "application/json");
-		
-		con.setDoOutput(true);
-		
-		//JSON String need to be constructed for the specific resource. 
-		//We may construct complex JSON using any third-party JSON libraries such as jackson or org.json
-		String jsonInputString = "{\"name\": \"Upendra\", \"job\": \"Programmer\"}";
-		
-		try(OutputStream os = con.getOutputStream()){
-			byte[] input = jsonInputString.getBytes("utf-8");
-			os.write(input, 0, input.length);			
-		}
-
-		int code = con.getResponseCode();
-		System.out.println(code);
-		
-		try(BufferedReader br = new BufferedReader(new InputStreamReader(con.getInputStream(), "utf-8"))){
-			StringBuilder response = new StringBuilder();
-			String responseLine = null;
-			while ((responseLine = br.readLine()) != null) {
-				response.append(responseLine.trim());
-			}
-			System.out.println(response.toString());
-		}
-	}
-
-}
diff --git a/core-java-modules/core-java/src/main/java/log4j.properties b/core-java-modules/core-java/src/main/java/log4j.properties
deleted file mode 100644
index 5fe42d854c..0000000000
--- a/core-java-modules/core-java/src/main/java/log4j.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=DEBUG, A1
-
-# A1 is set to be a ConsoleAppender.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
diff --git a/core-java-modules/core-java/src/main/resources/META-INF/MANIFEST.MF b/core-java-modules/core-java/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 988de3193d..0000000000
--- a/core-java-modules/core-java/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,5 +0,0 @@
-Agent-Class: com.baeldung.instrumentation.agent.MyInstrumentationAgent
-Can-Redefine-Classes: true
-Can-Retransform-Classes: true
-Premain-Class: com.baeldung.instrumentation.agent.MyInstrumentationAgent
-Main-Class: com.baeldung.instrumentation.application.Launcher
diff --git a/core-java-modules/core-java/src/main/resources/META-INF/persistence.xml b/core-java-modules/core-java/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index 3966afdcda..0000000000
--- a/core-java-modules/core-java/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
-        http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd" version="2.1">
-
-    <!-- JDO tutorial "unit" -->
-    <persistence-unit name="Tutorial">
-        <exclude-unlisted-classes/>
-		<properties>
-			<property name="javax.jdo.PersistenceManagerFactoryClass" value="org.datanucleus.api.jdo.JDOPersistenceManagerFactory"/>		
-		    <property name="javax.jdo.option.ConnectionURL" value="jdbc:h2:mem:mypersistence"/>
-		    <property name="javax.jdo.option.ConnectionDriverName" value="org.h2.Driver"/>
-		    <property name="javax.jdo.option.ConnectionUserName" value="sa"/>
-		    <property name="javax.jdo.option.ConnectionPassword" value=""/>
-		    <property name="datanucleus.schema.autoCreateAll" value="true"/>
-		</properties>
-    </persistence-unit>
-</persistence>
-
diff --git a/core-java-modules/core-java/src/main/resources/countries.properties b/core-java-modules/core-java/src/main/resources/countries.properties
deleted file mode 100644
index 50b5e85653..0000000000
--- a/core-java-modules/core-java/src/main/resources/countries.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-UK
-US
-Germany
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/main/resources/datasource.properties b/core-java-modules/core-java/src/main/resources/datasource.properties
deleted file mode 100644
index 61df0d45f7..0000000000
--- a/core-java-modules/core-java/src/main/resources/datasource.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-dataSourceClassName=//TBD
-dataSource.user=//TBD
-dataSource.password=//TBD
-dataSource.databaseName=//TBD
-dataSource.portNumber=//TBD
-dataSource.serverName=//TBD
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/main/resources/log4j.properties b/core-java-modules/core-java/src/main/resources/log4j.properties
deleted file mode 100644
index 621cf01735..0000000000
--- a/core-java-modules/core-java/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-log4j.rootLogger=DEBUG, A1
-
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/main/resources/log4j2.xml b/core-java-modules/core-java/src/main/resources/log4j2.xml
deleted file mode 100644
index a824bef9b0..0000000000
--- a/core-java-modules/core-java/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level - %msg%n"/>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Root level="debug">
-            <AppenderRef ref="Console"/>
-        </Root>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/main/resources/log4jstructuraldp.properties b/core-java-modules/core-java/src/main/resources/log4jstructuraldp.properties
deleted file mode 100644
index 5bc2bfe4b9..0000000000
--- a/core-java-modules/core-java/src/main/resources/log4jstructuraldp.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# Root logger 
-log4j.rootLogger=INFO, file, stdout
-
-# Write to console
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/main/resources/product.png b/core-java-modules/core-java/src/main/resources/product.png
deleted file mode 100644
index 4edd01c0a1..0000000000
Binary files a/core-java-modules/core-java/src/main/resources/product.png and /dev/null differ
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/arrays/ArraysJoinAndSplitJUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/arrays/ArraysJoinAndSplitJUnitTest.java
deleted file mode 100644
index b31a829f34..0000000000
--- a/core-java-modules/core-java/src/test/java/com/baeldung/arrays/ArraysJoinAndSplitJUnitTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.baeldung.arrays;
-
-import java.util.Arrays;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class ArraysJoinAndSplitJUnitTest {
-
-    private final String[] sauces = { "Marinara", "Olive Oil" };
-    private final String[] cheeses = { "Mozzarella", "Feta", "Parmesan" };
-    private final String[] vegetables = { "Olives", "Spinach", "Green Peppers" };
-
-    private final String[] customers = { "Jay", "Harry", "Ronnie", "Gary", "Ross" };
-
-    @Test
-    public void givenThreeStringArrays_whenJoiningIntoOneStringArray_shouldSucceed() {
-        String[] toppings = new String[sauces.length + cheeses.length + vegetables.length];
-
-        System.arraycopy(sauces, 0, toppings, 0, sauces.length);
-        int AddedSoFar = sauces.length;
-
-        System.arraycopy(cheeses, 0, toppings, AddedSoFar, cheeses.length);
-        AddedSoFar += cheeses.length;
-
-        System.arraycopy(vegetables, 0, toppings, AddedSoFar, vegetables.length);
-
-        Assert.assertArrayEquals(toppings, new String[] { "Marinara", "Olive Oil", "Mozzarella", "Feta", "Parmesan", "Olives", "Spinach", "Green Peppers" });
-    }
-
-    @Test
-    public void givenOneStringArray_whenSplittingInHalfTwoStringArrays_shouldSucceed() {
-        int ordersHalved = (customers.length / 2) + (customers.length % 2);
-
-        String[] driverOne = Arrays.copyOf(customers, ordersHalved);
-        String[] driverTwo = Arrays.copyOfRange(customers, ordersHalved, customers.length);
-
-        Assert.assertArrayEquals(driverOne, new String[] { "Jay", "Harry", "Ronnie" });
-        Assert.assertArrayEquals(driverTwo, new String[] { "Gary", "Ross" });
-    }
-}
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/stringisnumeric.zip b/core-java-modules/core-java/src/test/java/com/baeldung/stringisnumeric.zip
deleted file mode 100644
index b8a7b9b35a..0000000000
Binary files a/core-java-modules/core-java/src/test/java/com/baeldung/stringisnumeric.zip and /dev/null differ
diff --git a/core-java-modules/core-java/src/test/resources/newFile3.txt b/core-java-modules/core-java/src/test/resources/newFile3.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/core-java-modules/core-java/src/test/resources/original.txt b/core-java-modules/core-java/src/test/resources/original.txt
deleted file mode 100644
index 8511f56bef..0000000000
--- a/core-java-modules/core-java/src/test/resources/original.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-#Copy a File with Java (www.Baeldung.com)
-Copying Files with Java is Fun!
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/test/resources/sourceFile.txt b/core-java-modules/core-java/src/test/resources/sourceFile.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/core-java-modules/core-java/src/test/resources/test.find b/core-java-modules/core-java/src/test/resources/test.find
deleted file mode 100644
index 0cb7d51df1..0000000000
--- a/core-java-modules/core-java/src/test/resources/test.find
+++ /dev/null
@@ -1 +0,0 @@
-Test of JNDI on file.
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/test/resources/test_read.in b/core-java-modules/core-java/src/test/resources/test_read.in
deleted file mode 100644
index 70c379b63f..0000000000
--- a/core-java-modules/core-java/src/test/resources/test_read.in
+++ /dev/null
@@ -1 +0,0 @@
-Hello world
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/test/resources/test_read1.in b/core-java-modules/core-java/src/test/resources/test_read1.in
deleted file mode 100644
index 1e46242993..0000000000
--- a/core-java-modules/core-java/src/test/resources/test_read1.in
+++ /dev/null
@@ -1 +0,0 @@
-Hello world 1
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/test/resources/test_read2.in b/core-java-modules/core-java/src/test/resources/test_read2.in
deleted file mode 100644
index fe47dc003b..0000000000
--- a/core-java-modules/core-java/src/test/resources/test_read2.in
+++ /dev/null
@@ -1 +0,0 @@
-2,3 4
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/test/resources/test_read3.in b/core-java-modules/core-java/src/test/resources/test_read3.in
deleted file mode 100644
index db9f25a672..0000000000
--- a/core-java-modules/core-java/src/test/resources/test_read3.in
+++ /dev/null
@@ -1 +0,0 @@
-Hello 1
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/test/resources/test_read4.in b/core-java-modules/core-java/src/test/resources/test_read4.in
deleted file mode 100644
index 5727d54bfc..0000000000
Binary files a/core-java-modules/core-java/src/test/resources/test_read4.in and /dev/null differ
diff --git a/core-java-modules/core-java/src/test/resources/test_read7.in b/core-java-modules/core-java/src/test/resources/test_read7.in
deleted file mode 100644
index 28d4d45d43..0000000000
--- a/core-java-modules/core-java/src/test/resources/test_read7.in
+++ /dev/null
@@ -1 +0,0 @@
-青空
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/test/resources/test_read8.in b/core-java-modules/core-java/src/test/resources/test_read8.in
deleted file mode 100644
index 10fc1aac8a..0000000000
--- a/core-java-modules/core-java/src/test/resources/test_read8.in
+++ /dev/null
@@ -1,2 +0,0 @@
-Hello world 
- Test line 
diff --git a/core-java-modules/core-java/src/test/resources/test_read_d.in b/core-java-modules/core-java/src/test/resources/test_read_d.in
deleted file mode 100644
index 82bbb4071f..0000000000
--- a/core-java-modules/core-java/src/test/resources/test_read_d.in
+++ /dev/null
@@ -1 +0,0 @@
-John,Adam-Tom
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/test/resources/test_read_multiple.in b/core-java-modules/core-java/src/test/resources/test_read_multiple.in
deleted file mode 100644
index 7d64000a76..0000000000
--- a/core-java-modules/core-java/src/test/resources/test_read_multiple.in
+++ /dev/null
@@ -1,2 +0,0 @@
-Hello world
-Hi, John
\ No newline at end of file
diff --git a/core-java-modules/core-java/yofile.txt b/core-java-modules/core-java/yofile.txt
deleted file mode 100644
index ad56bf35f7..0000000000
Binary files a/core-java-modules/core-java/yofile.txt and /dev/null differ
diff --git a/core-java-modules/core-java/yofile2.txt b/core-java-modules/core-java/yofile2.txt
deleted file mode 100644
index 8393b6e98b..0000000000
Binary files a/core-java-modules/core-java/yofile2.txt and /dev/null differ
diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index a96489ec6f..66456d2045 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -16,9 +16,20 @@
     </parent>
 
     <modules>
-        <module>core-java</module>
-        <module>core-java-8</module>
-        <module>core-java-8-2</module>
+        <!--Won't be upgraded to JDK 17 -->
+        <!--<module>core-java-8</module> -->
+        <!--<module>core-java-8-2</module> -->
+        <!--<module>core-java-8-datetime</module> -->
+        <!--<module>core-java-8-datetime-2</module> -->
+        <!--<module>core-java-collections-conversions-2</module> -->
+        <!--<module>core-java-lang</module> -->
+        <!--<module>core-java-lang-math-3</module> -->
+        <!--<module>core-java-nio-2</module> -->
+        <!--<module>core-java-security</module> -->
+        <!--<module>core-java-serialization</module> -->
+        <!--<module>core-java-streams-2</module> -->
+        <!--<module>core-java-sun</module> -->
+
         <module>core-java-annotations</module>
         <module>core-java-arrays-sorting</module>
         <module>core-java-arrays-guides</module>
@@ -26,6 +37,7 @@
         <module>core-java-arrays-convert</module>
         <module>core-java-arrays-operations-basic</module>
         <module>core-java-arrays-operations-advanced</module>
+        <module>core-java-booleans</module>
         <module>core-java-char</module>
         <module>core-java-collections</module>
         <module>core-java-collections-2</module>
@@ -33,7 +45,6 @@
         <module>core-java-collections-4</module>
         <module>core-java-collections-5</module>
         <module>core-java-collections-conversions</module>
-        <module>core-java-collections-conversions-2</module>
         <module>core-java-collections-set-2</module>
         <module>core-java-collections-list</module>
         <module>core-java-collections-list-2</module>
@@ -41,6 +52,7 @@
         <module>core-java-collections-maps</module>
         <module>core-java-collections-maps-2</module>
         <module>core-java-collections-maps-3</module>
+        <module>core-java-compiler</module>
         <module>core-java-concurrency-2</module>
         <module>core-java-concurrency-advanced</module>
         <module>core-java-concurrency-advanced-2</module>
@@ -52,11 +64,10 @@
         <module>core-java-concurrency-collections</module>
         <module>core-java-concurrency-collections-2</module>
         <module>core-java-console</module>
-        <module>core-java-8-datetime-2</module>
         <module>core-java-datetime-string-2</module>
         <module>core-java-date-operations-2</module>
         <module>core-java-date-operations-3</module>
-        <module>core-java-8-datetime</module>
+        <module>core-java-documentation</module>
         <module>core-java-exceptions</module>
         <module>core-java-exceptions-2</module>
         <module>core-java-exceptions-3</module>
@@ -77,18 +88,16 @@
         <module>core-java-jvm-2</module>
         <module>core-java-jvm-3</module>
         <module>core-java-lambdas</module>
-        <module>core-java-lang</module>
         <module>core-java-lang-2</module>
         <module>core-java-lang-3</module>
         <module>core-java-lang-4</module>
         <module>core-java-lang-5</module>
         <module>core-java-lang-math</module>
         <module>core-java-lang-math-2</module>
-        <module>core-java-lang-math-3</module>
         <module>core-java-lang-oop-constructors</module>
         <module>core-java-lang-oop-patterns</module>
         <module>core-java-lang-oop-generics</module>
-        <module>core-java-lang-oop-modifiers</module>
+<!--        <module>core-java-lang-oop-modifiers</module>-->
         <module>core-java-lang-oop-types</module>
         <module>core-java-lang-oop-types-2</module>
         <module>core-java-lang-oop-inheritance</module>
@@ -98,27 +107,26 @@
         <module>core-java-lang-operators-2</module>
         <module>core-java-lang-syntax</module>
         <module>core-java-lang-syntax-2</module>
+        <module>core-java-locale</module>
         <module>core-java-networking</module>
         <module>core-java-networking-2</module>
         <module>core-java-networking-4</module>
         <module>core-java-nio</module>
-        <module>core-java-nio-2</module>
         <module>core-java-numbers</module>
         <module>core-java-numbers-2</module>
         <module>core-java-numbers-3</module>
         <module>core-java-numbers-4</module>
         <module>core-java-numbers-5</module>
+        <module>core-java-numbers-6</module>
         <module>core-java-optional</module>
         <module>core-java-perf</module>
+        <module>core-java-properties</module>
         <module>core-java-reflection</module>
         <module>core-java-reflection-2</module>
-        <module>core-java-security</module>
         <module>core-java-security-2</module>
         <module>core-java-security-3</module>
-        <module>core-java-serialization</module>
         <module>core-java-security-algorithms</module>
         <module>core-java-streams</module>
-        <module>core-java-streams-2</module>
         <module>core-java-streams-3</module>
         <module>core-java-string-algorithms</module>
         <module>core-java-string-algorithms-2</module>
@@ -128,12 +136,12 @@
         <module>core-java-string-conversions-2</module>
         <module>core-java-string-operations</module>
         <module>core-java-string-operations-2</module>
-        <module>core-java-sun</module>
         <module>core-java-regex</module>
         <module>core-java-regex-2</module>
         <module>core-java-uuid</module>
         <module>pre-jpms</module>
         <module>core-java-collections-maps-6</module>
+        <module>core-java-records</module>
     </modules>
 
     <dependencyManagement>
diff --git a/core-java-modules/pre-jpms/pom.xml b/core-java-modules/pre-jpms/pom.xml
index cd4bd0faa3..67bc913767 100644
--- a/core-java-modules/pre-jpms/pom.xml
+++ b/core-java-modules/pre-jpms/pom.xml
@@ -4,7 +4,6 @@
     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>pre-jpms</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>pre-jpms</name>
     <packaging>jar</packaging>
 
@@ -15,6 +14,11 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.4.0-b180725.0427</version>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -32,6 +36,9 @@
                 <configuration>
                     <source>${source.version}</source>
                     <target>${target.version}</target>
+                    <compilerArgs>
+                        <arg>--add-exports=java.base/com.sun.crypto.provider=ALL-UNNAMED</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
             <plugin>
@@ -72,8 +79,8 @@
     <properties>
         <dependency.plugin.version>3.1.1</dependency.plugin.version>
         <compiler.plugin.version>3.8.0</compiler.plugin.version>
-        <source.version>1.8</source.version>
-        <target.version>1.8</target.version>
+        <source.version>11</source.version>
+        <target.version>11</target.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/pre-jpms/src/main/java/com/baeldung/prejpms/App.java b/core-java-modules/pre-jpms/src/main/java/com/baeldung/prejpms/App.java
index 1afaae30e4..a69e0555c6 100644
--- a/core-java-modules/pre-jpms/src/main/java/com/baeldung/prejpms/App.java
+++ b/core-java-modules/pre-jpms/src/main/java/com/baeldung/prejpms/App.java
@@ -1,19 +1,18 @@
 package com.baeldung.prejpms;
 
 import java.io.StringWriter;
+import java.lang.StackWalker.Option;
+import java.lang.StackWalker.StackFrame;
+import com.sun.crypto.provider.SunJCE;
+import java.util.Base64;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.crypto.provider.SunJCE;
-
-import sun.misc.BASE64Encoder;
-import sun.reflect.Reflection;
-
 public class App {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
@@ -37,14 +36,14 @@ public class App {
     private static void getCallStackClassNames() {
         try {
             StringBuffer sbStack = new StringBuffer();
-            int i = 0;
-            Class<?> caller = Reflection.getCallerClass(i++);
-            do {
-                sbStack.append(i + ".")
-                    .append(caller.getName())
-                    .append("\n");
-                caller = Reflection.getCallerClass(i++);
-            } while (caller != null);
+            AtomicInteger i = new AtomicInteger(0);
+            StackWalker.getInstance((Option.RETAIN_CLASS_REFERENCE))
+              .walk(s -> s.map(StackFrame::getDeclaringClass)
+                .map(e -> {
+                    i.getAndIncrement();
+                    return e.getName();
+                }))
+              .forEach(name -> sbStack.append(String.format("%d. %s \n", i.get(), name)));
             LOGGER.info("2. Call Stack:\n{}", sbStack);
         } catch (Throwable e) {
             LOGGER.error(e.toString());
@@ -54,7 +53,7 @@ public class App {
     private static void getXmlFromObject(Book book) {
         try {
             Marshaller marshallerObj = JAXBContext.newInstance(Book.class)
-                .createMarshaller();
+              .createMarshaller();
             marshallerObj.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
 
             StringWriter sw = new StringWriter();
@@ -68,7 +67,8 @@ public class App {
 
     private static void getBase64EncodedString(String inputString) {
         try {
-            String encodedString = new BASE64Encoder().encode(inputString.getBytes());
+            String encodedString = new String(Base64.getEncoder()
+              .encode(inputString.getBytes()));
             LOGGER.info("4. Base Encoded String: {}", encodedString);
         } catch (Throwable e) {
             LOGGER.error(e.toString());
diff --git a/couchbase/pom.xml b/couchbase/pom.xml
index e87975a53c..823b33ee29 100644
--- a/couchbase/pom.xml
+++ b/couchbase/pom.xml
@@ -4,7 +4,6 @@
     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>couchbase</artifactId>
-    <version>0.1-SNAPSHOT</version>
     <name>couchbase</name>
     <packaging>jar</packaging>
     <description>Couchbase Tutorials</description>
@@ -64,11 +63,16 @@
             <version>${commons-lang3.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
     </dependencies>
 
     <properties>
-        <couchbase.client.version>2.5.0</couchbase.client.version>
-        <spring-framework.version>4.3.5.RELEASE</spring-framework.version>
+        <couchbase.client.version>2.7.2</couchbase.client.version>
+        <spring-framework.version>5.3.25</spring-framework.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/custom-pmd/pom.xml b/custom-pmd/pom.xml
index 38a5e30404..8097d4fefa 100644
--- a/custom-pmd/pom.xml
+++ b/custom-pmd/pom.xml
@@ -8,7 +8,6 @@
     <version>0.0.1</version>
     <name>custom-pmd</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>
diff --git a/data-structures/pom.xml b/data-structures/pom.xml
index cba602878f..aeadfcefc3 100644
--- a/data-structures/pom.xml
+++ b/data-structures/pom.xml
@@ -4,7 +4,6 @@
     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>data-structures</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>data-structures</name>
 
     <parent>
@@ -13,13 +12,6 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <repositories>
-        <repository>
-            <id>github.release.repo</id>
-            <url>https://raw.github.com/bulldog2011/bulldog-repo/master/repo/releases/</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>com.leansoft</groupId>
@@ -39,6 +31,13 @@
         </pluginManagement>
     </build>
 
+    <repositories>
+        <repository>
+            <id>github.release.repo</id>
+            <url>https://raw.github.com/bulldog2011/bulldog-repo/master/repo/releases/</url>
+        </repository>
+    </repositories>
+
     <properties>
         <bigqueue.version>0.7.0</bigqueue.version>
     </properties>
diff --git a/ddd/pom.xml b/ddd/pom.xml
index 6128bb1cd9..443b2b5148 100644
--- a/ddd/pom.xml
+++ b/ddd/pom.xml
@@ -3,7 +3,6 @@
     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>
-    <groupId>com.baeldung.ddd</groupId>
     <artifactId>ddd</artifactId>
     <name>ddd</name>
     <packaging>jar</packaging>
diff --git a/deeplearning4j/pom.xml b/deeplearning4j/pom.xml
index 01bac93214..875d8cdf85 100644
--- a/deeplearning4j/pom.xml
+++ b/deeplearning4j/pom.xml
@@ -3,9 +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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung.deeplearning4j</groupId>
     <artifactId>deeplearning4j</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>deeplearning4j</name>
     <packaging>jar</packaging>
 
diff --git a/dependeny-exclusion/dummy-surefire-junit47/pom.xml b/dependeny-exclusion/dummy-surefire-junit47/pom.xml
deleted file mode 100644
index 5859ddbe72..0000000000
--- a/dependeny-exclusion/dummy-surefire-junit47/pom.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         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>
-    <groupId>org.apache.maven.surefire</groupId>
-    <artifactId>surefire-junit47</artifactId>
-    <version>dummy</version>
-</project>
diff --git a/di-modules/cdi/pom.xml b/di-modules/cdi/pom.xml
index bdba3429db..fd920c8ce1 100644
--- a/di-modules/cdi/pom.xml
+++ b/di-modules/cdi/pom.xml
@@ -42,10 +42,24 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <cdi-api.version>2.0.SP1</cdi-api.version>
-        <weld-se-core.version>3.0.5.Final</weld-se-core.version>
-        <aspectjweaver.version>1.9.2</aspectjweaver.version>
+        <weld-se-core.version>3.1.6.Final</weld-se-core.version>
+        <aspectjweaver.version>1.9.19</aspectjweaver.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/di-modules/guice/pom.xml b/di-modules/guice/pom.xml
index a28dbe5297..d0d2876fc8 100644
--- a/di-modules/guice/pom.xml
+++ b/di-modules/guice/pom.xml
@@ -3,7 +3,6 @@
     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>
-    <groupId>com.baeldung.examples.guice</groupId>
     <artifactId>guice</artifactId>
     <name>guice</name>
     <packaging>jar</packaging>
diff --git a/disruptor/pom.xml b/disruptor/pom.xml
index c2f9cf34b0..75e783e935 100644
--- a/disruptor/pom.xml
+++ b/disruptor/pom.xml
@@ -4,7 +4,6 @@
     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>disruptor</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>disruptor</name>
     <packaging>jar</packaging>
 
diff --git a/docker-modules/docker-caching/multi-module-caching/core/pom.xml b/docker-modules/docker-caching/multi-module-caching/core-module/pom.xml
similarity index 95%
rename from docker-modules/docker-caching/multi-module-caching/core/pom.xml
rename to docker-modules/docker-caching/multi-module-caching/core-module/pom.xml
index bcfc4b5783..159d76830b 100644
--- a/docker-modules/docker-caching/multi-module-caching/core/pom.xml
+++ b/docker-modules/docker-caching/multi-module-caching/core-module/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>core</artifactId>
+    <artifactId>core-module</artifactId>
 
     <parent>
         <artifactId>multi-module-caching</artifactId>
diff --git a/docker-modules/docker-caching/multi-module-caching/core/src/main/java/com/baeldung/maven_caching/CoreClass.java b/docker-modules/docker-caching/multi-module-caching/core-module/src/main/java/com/baeldung/maven_caching/CoreClass.java
similarity index 100%
rename from docker-modules/docker-caching/multi-module-caching/core/src/main/java/com/baeldung/maven_caching/CoreClass.java
rename to docker-modules/docker-caching/multi-module-caching/core-module/src/main/java/com/baeldung/maven_caching/CoreClass.java
diff --git a/docker-modules/docker-caching/multi-module-caching/pom.xml b/docker-modules/docker-caching/multi-module-caching/pom.xml
index 94a370453c..b64cf1a8b8 100644
--- a/docker-modules/docker-caching/multi-module-caching/pom.xml
+++ b/docker-modules/docker-caching/multi-module-caching/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         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">
+    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>
     <groupId>com.baeldung</groupId>
     <artifactId>multi-module-caching</artifactId>
@@ -10,8 +10,8 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>runner</module>
-        <module>core</module>
+        <module>runner-module</module>
+        <module>core-module</module>
     </modules>
 
     <dependencyManagement>
diff --git a/docker-modules/docker-caching/multi-module-caching/runner/pom.xml b/docker-modules/docker-caching/multi-module-caching/runner-module/pom.xml
similarity index 95%
rename from docker-modules/docker-caching/multi-module-caching/runner/pom.xml
rename to docker-modules/docker-caching/multi-module-caching/runner-module/pom.xml
index e3f234bac0..e608706864 100644
--- a/docker-modules/docker-caching/multi-module-caching/runner/pom.xml
+++ b/docker-modules/docker-caching/multi-module-caching/runner-module/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>runner</artifactId>
+    <artifactId>runner-module</artifactId>
 
     <parent>
         <artifactId>multi-module-caching</artifactId>
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>com.baeldung</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>core-module</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
diff --git a/docker-modules/docker-caching/multi-module-caching/runner/src/main/java/com/baeldung/maven_caching/MavenCachingApplication.java b/docker-modules/docker-caching/multi-module-caching/runner-module/src/main/java/com/baeldung/maven_caching/MavenCachingApplication.java
similarity index 100%
rename from docker-modules/docker-caching/multi-module-caching/runner/src/main/java/com/baeldung/maven_caching/MavenCachingApplication.java
rename to docker-modules/docker-caching/multi-module-caching/runner-module/src/main/java/com/baeldung/maven_caching/MavenCachingApplication.java
diff --git a/docker-modules/docker-caching/single-module-caching/pom.xml b/docker-modules/docker-caching/single-module-caching/pom.xml
index 4a4e53f1d3..a388c7563f 100644
--- a/docker-modules/docker-caching/single-module-caching/pom.xml
+++ b/docker-modules/docker-caching/single-module-caching/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         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">
+    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>
     <groupId>com.baeldung</groupId>
     <artifactId>single-module-caching</artifactId>
diff --git a/docker-modules/docker-compose-2/pom.xml b/docker-modules/docker-compose-2/pom.xml
index 851742309d..3a94ee3901 100644
--- a/docker-modules/docker-compose-2/pom.xml
+++ b/docker-modules/docker-compose-2/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         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">
+    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>docker-compose-2</artifactId>
     <description>Demo project for Spring Boot and Docker - Module docker-compose-2</description>
diff --git a/docker-modules/docker-containers/pom.xml b/docker-modules/docker-containers/pom.xml
index 42c2d403e4..79bf0aee72 100644
--- a/docker-modules/docker-containers/pom.xml
+++ b/docker-modules/docker-containers/pom.xml
@@ -5,7 +5,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.docker</groupId>
     <artifactId>docker-containers</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <description>Demo project for Spring Boot</description>
 
     <parent>
diff --git a/docker-modules/pom.xml b/docker-modules/pom.xml
index 1a87fa5d1c..b4c5240718 100644
--- a/docker-modules/pom.xml
+++ b/docker-modules/pom.xml
@@ -3,9 +3,7 @@
     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>
-    <groupId>com.baeldung</groupId>
     <artifactId>docker-modules</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
     <name>docker-modules</name>
     <packaging>pom</packaging>
 
diff --git a/dozer/pom.xml b/dozer/pom.xml
index 840763445c..66f4ee8227 100644
--- a/dozer/pom.xml
+++ b/dozer/pom.xml
@@ -4,7 +4,6 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dozer</artifactId>
-    <version>1.0</version>
     <name>dozer</name>
 
     <parent>
diff --git a/drools/pom.xml b/drools/pom.xml
index daaf1fa8a7..12aaf1318a 100644
--- a/drools/pom.xml
+++ b/drools/pom.xml
@@ -8,9 +8,8 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-spring-4</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-spring-4</relativePath>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -57,10 +56,10 @@
     </dependencies>
 
     <properties>
-        <http-component-version>4.4.6</http-component-version>
-        <drools-version>7.4.1.Final</drools-version>
-        <apache-poi-version>3.13</apache-poi-version>
-        <opta-planner-version>7.10.0.Final</opta-planner-version>
+        <http-component-version>4.4.16</http-component-version>
+        <drools-version>8.32.0.Final</drools-version>
+        <apache-poi-version>5.2.3</apache-poi-version>
+        <opta-planner-version>8.32.0.Final</opta-planner-version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/drools/src/main/java/com/baeldung/drools/backward_chaining/BackwardChaining.java b/drools/src/main/java/com/baeldung/drools/backward_chaining/BackwardChaining.java
index 6f15ee510b..3baabbeb0f 100644
--- a/drools/src/main/java/com/baeldung/drools/backward_chaining/BackwardChaining.java
+++ b/drools/src/main/java/com/baeldung/drools/backward_chaining/BackwardChaining.java
@@ -11,7 +11,6 @@ public class BackwardChaining {
         Result result = new BackwardChaining().backwardChaining();
         System.out.println(result.getValue());
         result.getFacts()
-            .stream()
             .forEach(System.out::println);
     }
 
diff --git a/drools/src/main/java/com/baeldung/drools/config/DroolsBeanFactory.java b/drools/src/main/java/com/baeldung/drools/config/DroolsBeanFactory.java
index cf5d56f246..fd2090aecb 100644
--- a/drools/src/main/java/com/baeldung/drools/config/DroolsBeanFactory.java
+++ b/drools/src/main/java/com/baeldung/drools/config/DroolsBeanFactory.java
@@ -10,26 +10,25 @@ import org.kie.internal.builder.DecisionTableConfiguration;
 import org.kie.internal.builder.DecisionTableInputType;
 import org.kie.internal.builder.KnowledgeBuilderFactory;
 import org.kie.internal.io.ResourceFactory;
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
 public class DroolsBeanFactory {
 
     private static final String RULES_PATH = "com/baeldung/drools/rules/";
-    private KieServices kieServices=KieServices.Factory.get();
+    private KieServices kieServices = KieServices.Factory.get();
 
-    private  KieFileSystem getKieFileSystem() throws IOException{
+    private  KieFileSystem getKieFileSystem() {
         KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
-        List<String> rules=Arrays.asList("BackwardChaining.drl","SuggestApplicant.drl","Product_rules.xls");
-        for(String rule:rules){
+        List<String> rules = Arrays.asList("BackwardChaining.drl", "SuggestApplicant.drl", "Product_rules.drl.xls");
+        for(String rule:rules) {
             kieFileSystem.write(ResourceFactory.newClassPathResource(rule));
         }
         return kieFileSystem;
 
     }
 
-    public KieContainer getKieContainer() throws IOException {
+    public KieContainer getKieContainer() {
         getKieRepository();
 
         KieBuilder kb = kieServices.newKieBuilder(getKieFileSystem());
@@ -44,21 +43,16 @@ public class DroolsBeanFactory {
 
     private void getKieRepository() {
         final KieRepository kieRepository = kieServices.getRepository();
-        kieRepository.addKieModule(new KieModule() {
-                        public ReleaseId getReleaseId() {
-                return kieRepository.getDefaultReleaseId();
-            }
-        });
+        kieRepository.addKieModule(kieRepository::getDefaultReleaseId);
     }
 
-    public KieSession getKieSession(){
+    public KieSession getKieSession() {
         getKieRepository();
         KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
 
         kieFileSystem.write(ResourceFactory.newClassPathResource("com/baeldung/drools/rules/BackwardChaining.drl"));
         kieFileSystem.write(ResourceFactory.newClassPathResource("com/baeldung/drools/rules/SuggestApplicant.drl"));
-        kieFileSystem.write(ResourceFactory.newClassPathResource("com/baeldung/drools/rules/Product_rules.xls"));
-        
+        kieFileSystem.write(ResourceFactory.newClassPathResource("com/baeldung/drools/rules/Product_rules.drl.xls"));
         
         KieBuilder kb = kieServices.newKieBuilder(kieFileSystem);
         kb.buildAll();
@@ -67,7 +61,6 @@ public class DroolsBeanFactory {
         KieContainer kContainer = kieServices.newKieContainer(kieModule.getReleaseId());
 
         return kContainer.newKieSession();
-
     }
 
     public KieSession getKieSession(Resource dt) {
@@ -90,7 +83,7 @@ public class DroolsBeanFactory {
 
     /*
      * Can be used for debugging
-     * Input excelFile example: com/baeldung/drools/rules/Discount.xls
+     * Input excelFile example: com/baeldung/drools/rules/Discount.drl.xls
      */
     public String getDrlFromExcel(String excelFile) {
         DecisionTableConfiguration configuration = KnowledgeBuilderFactory.newDecisionTableConfiguration();
diff --git a/drools/src/main/java/com/baeldung/drools/optaplanner/CourseSchedule.java b/drools/src/main/java/com/baeldung/drools/optaplanner/CourseSchedule.java
index 7b2ba117a1..d0ae5318b9 100644
--- a/drools/src/main/java/com/baeldung/drools/optaplanner/CourseSchedule.java
+++ b/drools/src/main/java/com/baeldung/drools/optaplanner/CourseSchedule.java
@@ -6,7 +6,7 @@ import java.util.List;
 import org.optaplanner.core.api.domain.solution.PlanningEntityCollectionProperty;
 import org.optaplanner.core.api.domain.solution.PlanningScore;
 import org.optaplanner.core.api.domain.solution.PlanningSolution;
-import org.optaplanner.core.api.domain.solution.drools.ProblemFactCollectionProperty;
+import org.optaplanner.core.api.domain.solution.ProblemFactCollectionProperty;
 import org.optaplanner.core.api.domain.valuerange.ValueRangeProvider;
 import org.optaplanner.core.api.score.buildin.hardsoft.HardSoftScore;
 import org.slf4j.Logger;
diff --git a/drools/src/main/java/com/baeldung/drools/optaplanner/ScoreCalculator.java b/drools/src/main/java/com/baeldung/drools/optaplanner/ScoreCalculator.java
index 86501cdccd..c9d2b4df99 100644
--- a/drools/src/main/java/com/baeldung/drools/optaplanner/ScoreCalculator.java
+++ b/drools/src/main/java/com/baeldung/drools/optaplanner/ScoreCalculator.java
@@ -2,14 +2,13 @@ package com.baeldung.drools.optaplanner;
 
 import java.util.HashSet;
 
-import org.optaplanner.core.api.score.Score;
 import org.optaplanner.core.api.score.buildin.hardsoft.HardSoftScore;
-import org.optaplanner.core.impl.score.director.easy.EasyScoreCalculator;
+import org.optaplanner.core.api.score.calculator.EasyScoreCalculator;
 
-public class ScoreCalculator implements EasyScoreCalculator<CourseSchedule> {
+public class ScoreCalculator implements EasyScoreCalculator<CourseSchedule, HardSoftScore> {
 
     @Override
-    public Score calculateScore(CourseSchedule courseSchedule) {
+    public HardSoftScore calculateScore(CourseSchedule courseSchedule) {
         int hardScore = 0;
         int softScore = 0;
 
@@ -27,6 +26,6 @@ public class ScoreCalculator implements EasyScoreCalculator<CourseSchedule> {
             }
         }
 
-        return HardSoftScore.valueOf(hardScore, softScore);
+        return HardSoftScore.of(hardScore, softScore);
     }
 }
diff --git a/drools/src/main/java/com/baeldung/drools/service/ApplicantService.java b/drools/src/main/java/com/baeldung/drools/service/ApplicantService.java
index f74298ef05..06f84358b0 100644
--- a/drools/src/main/java/com/baeldung/drools/service/ApplicantService.java
+++ b/drools/src/main/java/com/baeldung/drools/service/ApplicantService.java
@@ -3,19 +3,20 @@ package com.baeldung.drools.service;
 import com.baeldung.drools.config.DroolsBeanFactory;
 import com.baeldung.drools.model.Applicant;
 import com.baeldung.drools.model.SuggestedRole;
-import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
 
-import java.io.IOException;
-
 public class ApplicantService {
 
-    KieSession kieSession=new DroolsBeanFactory().getKieSession();
+    KieSession kieSession = new DroolsBeanFactory().getKieSession();
 
-    public SuggestedRole suggestARoleForApplicant(Applicant applicant,SuggestedRole suggestedRole) throws IOException {
-        kieSession.insert(applicant);
-        kieSession.setGlobal("suggestedRole",suggestedRole);
-        kieSession.fireAllRules();
+    public SuggestedRole suggestARoleForApplicant(Applicant applicant,SuggestedRole suggestedRole) {
+        try {
+            kieSession.insert(applicant);
+            kieSession.setGlobal("suggestedRole", suggestedRole);
+            kieSession.fireAllRules();
+        } finally {
+            kieSession.dispose();
+        }
         System.out.println(suggestedRole.getRole());
         return  suggestedRole;
 
diff --git a/drools/src/main/java/com/baeldung/drools/service/ProductService.java b/drools/src/main/java/com/baeldung/drools/service/ProductService.java
index be5e43ed7b..401f5a600f 100644
--- a/drools/src/main/java/com/baeldung/drools/service/ProductService.java
+++ b/drools/src/main/java/com/baeldung/drools/service/ProductService.java
@@ -2,18 +2,21 @@ package com.baeldung.drools.service;
 
 import com.baeldung.drools.config.DroolsBeanFactory;
 import com.baeldung.drools.model.Product;
-import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
 
 public class ProductService {
 
-    private KieSession kieSession=new DroolsBeanFactory().getKieSession();
+    private KieSession kieSession = new DroolsBeanFactory().getKieSession();
 
     public Product applyLabelToProduct(Product product){
-        kieSession.insert(product);
-        kieSession.fireAllRules();
+        try {
+            kieSession.insert(product);
+            kieSession.fireAllRules();
+        } finally {
+            kieSession.dispose();
+        }
         System.out.println(product.getLabel());
-        return  product;
+        return product;
 
     }
 
diff --git a/drools/src/main/resources/com/baeldung/drools/rules/Discount.xls b/drools/src/main/resources/com/baeldung/drools/rules/Discount.drl.xls
similarity index 100%
rename from drools/src/main/resources/com/baeldung/drools/rules/Discount.xls
rename to drools/src/main/resources/com/baeldung/drools/rules/Discount.drl.xls
diff --git a/drools/src/main/resources/com/baeldung/drools/rules/Product_rules.xls b/drools/src/main/resources/com/baeldung/drools/rules/Product_rules.drl.xls
similarity index 100%
rename from drools/src/main/resources/com/baeldung/drools/rules/Product_rules.xls
rename to drools/src/main/resources/com/baeldung/drools/rules/Product_rules.drl.xls
diff --git a/drools/src/main/resources/courseScheduleSolverConfigDrools.xml b/drools/src/main/resources/courseScheduleSolverConfigDrools.xml
index 7cf95fdcd3..74112d9c7d 100644
--- a/drools/src/main/resources/courseScheduleSolverConfigDrools.xml
+++ b/drools/src/main/resources/courseScheduleSolverConfigDrools.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solver>
-    <scanAnnotatedClasses/>
-
+   
+    <solutionClass>com.baeldung.drools.optaplanner.CourseSchedule</solutionClass>
+    <entityClass>com.baeldung.drools.optaplanner.Lecture</entityClass>
+    
     <scoreDirectorFactory>
         <scoreDrl>courseSchedule.drl</scoreDrl>
     </scoreDirectorFactory>
diff --git a/drools/src/main/resources/courseScheduleSolverConfiguration.xml b/drools/src/main/resources/courseScheduleSolverConfiguration.xml
index dfedb8f2fd..4214b0943a 100644
--- a/drools/src/main/resources/courseScheduleSolverConfiguration.xml
+++ b/drools/src/main/resources/courseScheduleSolverConfiguration.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solver>
-    <scanAnnotatedClasses/>
 
+    <solutionClass>com.baeldung.drools.optaplanner.CourseSchedule</solutionClass>
+    <entityClass>com.baeldung.drools.optaplanner.Lecture</entityClass>
+    
     <scoreDirectorFactory>
         <easyScoreCalculatorClass>com.baeldung.drools.optaplanner.ScoreCalculator</easyScoreCalculatorClass>
     </scoreDirectorFactory>
diff --git a/drools/src/test/java/com/baeldung/drools/optaplanner/OptaPlannerUnitTest.java b/drools/src/test/java/com/baeldung/drools/optaplanner/OptaPlannerUnitTest.java
index 1880e30b86..36b24349c7 100644
--- a/drools/src/test/java/com/baeldung/drools/optaplanner/OptaPlannerUnitTest.java
+++ b/drools/src/test/java/com/baeldung/drools/optaplanner/OptaPlannerUnitTest.java
@@ -21,13 +21,12 @@ public class OptaPlannerUnitTest {
             unsolvedCourseSchedule.getLectureList().add(new Lecture());
         }
 
-        unsolvedCourseSchedule.getPeriodList().addAll(Arrays.asList(new Integer[] { 1, 2, 3 }));
-        unsolvedCourseSchedule.getRoomList().addAll(Arrays.asList(new Integer[] { 1, 2 }));
+        unsolvedCourseSchedule.getPeriodList().addAll(Arrays.asList(1, 2, 3));
+        unsolvedCourseSchedule.getRoomList().addAll(Arrays.asList(1, 2));
     }
 
     @Test
     public void test_whenCustomJavaSolver() {
-
         SolverFactory<CourseSchedule> solverFactory = SolverFactory.createFromXmlResource("courseScheduleSolverConfiguration.xml");
         Solver<CourseSchedule> solver = solverFactory.buildSolver();
         CourseSchedule solvedCourseSchedule = solver.solve(unsolvedCourseSchedule);
@@ -38,7 +37,6 @@ public class OptaPlannerUnitTest {
 
     @Test
     public void test_whenDroolsSolver() {
-
         SolverFactory<CourseSchedule> solverFactory = SolverFactory.createFromXmlResource("courseScheduleSolverConfigDrools.xml");
         Solver<CourseSchedule> solver = solverFactory.buildSolver();
         CourseSchedule solvedCourseSchedule = solver.solve(unsolvedCourseSchedule);
diff --git a/drools/src/test/java/com/baeldung/drools/service/DiscountExcelIntegrationTest.java b/drools/src/test/java/com/baeldung/drools/service/DiscountExcelIntegrationTest.java
index c3c4ebd4f8..49a5f81d38 100644
--- a/drools/src/test/java/com/baeldung/drools/service/DiscountExcelIntegrationTest.java
+++ b/drools/src/test/java/com/baeldung/drools/service/DiscountExcelIntegrationTest.java
@@ -18,7 +18,7 @@ public class DiscountExcelIntegrationTest {
 
     @Before
     public void setup() {
-        Resource resource = ResourceFactory.newClassPathResource("com/baeldung/drools/rules/Discount.xls", getClass());
+        Resource resource = ResourceFactory.newClassPathResource("com/baeldung/drools/rules/Discount.drl.xls", getClass());
         kSession = new DroolsBeanFactory().getKieSession(resource);
     }
 
diff --git a/ethereum/pom.xml b/ethereum/pom.xml
index 6c1a0e900f..8dc25427d9 100644
--- a/ethereum/pom.xml
+++ b/ethereum/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         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">
+    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>
     <groupId>com.baeldung.ethereum</groupId>
     <artifactId>ethereum</artifactId>
@@ -113,7 +113,8 @@
             <scope>test</scope>
             <version>${spring.boot.version}</version>
             <exclusions>
-                <!-- junit4 dependency is excluded as it should to be resolved from junit-vintage-engine included in parent-modules. -->
+                <!-- junit4 dependency is excluded as it should to be resolved from junit-vintage-engine 
+                    included in parent-modules. -->
                 <exclusion>
                     <groupId>junit</groupId>
                     <artifactId>junit</artifactId>
@@ -195,4 +196,5 @@
         <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
         <compiler.plugin.version>3.1</compiler.plugin.version>
     </properties>
+
 </project>
\ No newline at end of file
diff --git a/feign/README.md b/feign/README.md
index 8079c46e9e..074ce1cbd2 100644
--- a/feign/README.md
+++ b/feign/README.md
@@ -6,9 +6,4 @@ This module contains articles about Feign
 
 - [Intro to Feign](https://www.baeldung.com/intro-to-feign)
 - [Retrying Feign Calls](https://www.baeldung.com/feign-retry)
-- [Setting Request Headers Using Feign](https://www.baeldung.com/java-feign-request-headers)
-- [File Upload With Open Feign](https://www.baeldung.com/java-feign-file-upload)
-- [Feign Logging Configuration](https://www.baeldung.com/java-feign-logging)
-- [Retrieve Original Message From Feign ErrorDecoder](https://www.baeldung.com/feign-retrieve-original-message)
-- [RequestLine with Feign Client](https://www.baeldung.com/feign-requestline)
-- [Propagating Exceptions With OpenFeign and Spring](https://www.baeldung.com/spring-openfeign-propagate-exception)
\ No newline at end of file
+- [Setting Request Headers Using Feign](https://www.baeldung.com/java-feign-request-headers)
\ No newline at end of file
diff --git a/feign/pom.xml b/feign/pom.xml
index 7338cf7508..edb55e7da5 100644
--- a/feign/pom.xml
+++ b/feign/pom.xml
@@ -3,7 +3,6 @@
     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>
-    <groupId>com.baeldung.feign</groupId>
     <artifactId>feign</artifactId>
     <name>feign</name>
 
@@ -69,11 +68,6 @@
             <artifactId>feign-form-spring</artifactId>
             <version>${feign.form.spring.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-            <version>${spring.cloud.openfeign.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock-jre8</artifactId>
@@ -103,7 +97,7 @@
                 <configuration>
                     <packageName>com.baeldung.feign.soap</packageName>
                     <sources>
-                        <source>src/main/resources/users.xsd</source>
+                        <source>${project.basedir}/src/main/resources/users.xsd</source>
                     </sources>
                 </configuration>
             </plugin>
diff --git a/feign/src/main/java/com/baeldung/core/ExampleApplication.java b/feign/src/main/java/com/baeldung/core/ExampleApplication.java
index 391e808ede..881265d5ba 100644
--- a/feign/src/main/java/com/baeldung/core/ExampleApplication.java
+++ b/feign/src/main/java/com/baeldung/core/ExampleApplication.java
@@ -2,10 +2,8 @@ package com.baeldung.core;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @SpringBootApplication
-@EnableFeignClients
 public class ExampleApplication {
 
     public static void main(String[] args) {
diff --git a/feign/src/main/java/com/baeldung/core/fileupload/config/ExceptionMessage.java b/feign/src/main/java/com/baeldung/core/fileupload/config/ExceptionMessage.java
deleted file mode 100644
index 8301705ca6..0000000000
--- a/feign/src/main/java/com/baeldung/core/fileupload/config/ExceptionMessage.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.baeldung.core.fileupload.config;
-
-public class ExceptionMessage {
-    private String timestamp;
-    private int status;
-    private String error;
-    private String message;
-    private String path;
-
-    public String getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(String timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public String getError() {
-        return error;
-    }
-
-    public void setError(String error) {
-        this.error = error;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @Override
-    public String toString() {
-        return "ExceptionMessage [timestamp=" + timestamp + ", status=" + status + ", error=" + error + ", message=" + message + ", path=" + path + "]";
-    }
-
-}
diff --git a/feign/src/main/java/com/baeldung/core/fileupload/config/RetreiveMessageErrorDecoder.java b/feign/src/main/java/com/baeldung/core/fileupload/config/RetreiveMessageErrorDecoder.java
deleted file mode 100644
index fc2c8da0ed..0000000000
--- a/feign/src/main/java/com/baeldung/core/fileupload/config/RetreiveMessageErrorDecoder.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.baeldung.core.fileupload.config;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import com.baeldung.core.exception.BadRequestException;
-import com.baeldung.core.exception.NotFoundException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import feign.Response;
-import feign.codec.ErrorDecoder;
-
-public class RetreiveMessageErrorDecoder implements ErrorDecoder {
-    private final ErrorDecoder errorDecoder = new Default();
-
-    @Override
-    public Exception decode(String methodKey, Response response) {
-        ExceptionMessage message;
-        try (InputStream bodyIs = response.body()
-            .asInputStream()) {
-            ObjectMapper mapper = new ObjectMapper();
-            message = mapper.readValue(bodyIs, ExceptionMessage.class);
-        } catch (IOException e) {
-            return new Exception(e.getMessage());
-        }
-        switch (response.status()) {
-        case 400:
-            return new BadRequestException(message.getMessage() != null ? message.getMessage() : "Bad Request");
-        case 404:
-            return new NotFoundException(message.getMessage() != null ? message.getMessage() : "Not found");
-        default:
-            return errorDecoder.decode(methodKey, response);
-        }
-    }
-}
diff --git a/feign/src/main/java/com/baeldung/core/fileupload/service/UploadResource.java b/feign/src/main/java/com/baeldung/core/fileupload/service/UploadResource.java
deleted file mode 100644
index 9d3d173cd4..0000000000
--- a/feign/src/main/java/com/baeldung/core/fileupload/service/UploadResource.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.baeldung.core.fileupload.service;
-
-import org.springframework.web.multipart.MultipartFile;
-
-import feign.Headers;
-import feign.Param;
-import feign.RequestLine;
-import feign.Response;
-
-public interface UploadResource {
-    
-    @RequestLine("POST /upload-file")
-    @Headers("Content-Type: multipart/form-data")
-    Response uploadFile(@Param("file") MultipartFile file);
-    
-}
\ No newline at end of file
diff --git a/feign/src/main/java/com/baeldung/core/fileupload/service/UploadService.java b/feign/src/main/java/com/baeldung/core/fileupload/service/UploadService.java
deleted file mode 100644
index 5176ddf0fa..0000000000
--- a/feign/src/main/java/com/baeldung/core/fileupload/service/UploadService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.baeldung.core.fileupload.service;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import feign.Feign;
-import feign.Response;
-import feign.form.spring.SpringFormEncoder;
-
-@Service
-public class UploadService {
-    private static final String HTTP_FILE_UPLOAD_URL = "http://localhost:8081";
-    
-    @Autowired
-    private UploadClient client;
-
-    public boolean uploadFileWithManualClient(MultipartFile file) {
-        UploadResource fileUploadResource = Feign.builder().encoder(new SpringFormEncoder())
-                .target(UploadResource.class, HTTP_FILE_UPLOAD_URL);
-        Response response = fileUploadResource.uploadFile(file);
-        return response.status() == 200;
-    }
-    
-    public String uploadFile(MultipartFile file) {
-        return client.fileUpload(file);
-    }
-    
-    public String uploadFileError(MultipartFile file) {
-        return client.fileUpload(file);
-    }
-}
\ No newline at end of file
diff --git a/feign/src/test/java/com/baeldung/core/OpenFeignFileUploadLiveTest.java b/feign/src/test/java/com/baeldung/core/OpenFeignFileUploadLiveTest.java
deleted file mode 100644
index f9dc8b13ed..0000000000
--- a/feign/src/test/java/com/baeldung/core/OpenFeignFileUploadLiveTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.baeldung.core;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import org.apache.commons.io.IOUtils;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.baeldung.core.fileupload.service.UploadService;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = ExampleApplication.class)
-public class OpenFeignFileUploadLiveTest {
-    
-    @Autowired
-    private UploadService uploadService;
-    
-    private static String FILE_NAME = "fileupload.txt";
-    
-    @Test
-    public void whenFeignBuilder_thenFileUploadSuccess() throws IOException {
-        ClassLoader classloader = Thread.currentThread().getContextClassLoader();
-        File file = new File(classloader.getResource(FILE_NAME).getFile());
-        Assert.assertTrue(file.exists());
-        FileInputStream input = new FileInputStream(file);
-        MultipartFile multipartFile = new MockMultipartFile("file", file.getName(), "text/plain",
-                IOUtils.toByteArray(input));
-        Assert.assertTrue(uploadService.uploadFileWithManualClient(multipartFile));
-    }
-    
-    @Test
-    public void whenAnnotatedFeignClient_thenFileUploadSuccess() throws IOException {
-        ClassLoader classloader = Thread.currentThread().getContextClassLoader();
-        File file = new File(classloader.getResource(FILE_NAME).getFile());
-        Assert.assertTrue(file.exists());
-        FileInputStream input = new FileInputStream(file);
-        MultipartFile multipartFile = new MockMultipartFile("file", file.getName(), "text/plain",
-                IOUtils.toByteArray(input));
-        String uploadFile = uploadService.uploadFile(multipartFile);
-        Assert.assertNotNull(uploadFile);
-    }
-}
diff --git a/gcp-firebase/pom.xml b/gcp-firebase/pom.xml
index c563099ad6..10a899f370 100644
--- a/gcp-firebase/pom.xml
+++ b/gcp-firebase/pom.xml
@@ -1,48 +1,51 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>gcp-firebase</artifactId>
+
     <parent>
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
         <relativePath>../parent-boot-2</relativePath>
     </parent>
-  <artifactId>gcp-firebase</artifactId>
-  
-  <properties>
-    <firebase-admin.version>9.1.1</firebase-admin.version>
-  </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>com.google.firebase</groupId>
-      <artifactId>firebase-admin</artifactId>
-      <version>${firebase-admin.version}</version>
-    </dependency>
-    
-    
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-configuration-processor</artifactId>
-        <optional>true</optional>
-    </dependency>
-  </dependencies>
-  
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
+    <dependencies>
+        <dependency>
+            <groupId>com.google.firebase</groupId>
+            <artifactId>firebase-admin</artifactId>
+            <version>${firebase-admin.version}</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <firebase-admin.version>9.1.1</firebase-admin.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/gcp-firebase/src/main/resources/firebase-service-account.json b/gcp-firebase/src/main/resources/firebase-service-account.json
index ed5afa9f13..cd87ff6bda 100644
--- a/gcp-firebase/src/main/resources/firebase-service-account.json
+++ b/gcp-firebase/src/main/resources/firebase-service-account.json
@@ -1,10 +1,10 @@
 {
   "type": "service_account",
-  "project_id": "tutorials-2cdfb",
-  "private_key_id": "d9f6a684d6814f85ed2d0490585eb7bf590f983a",
-  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDdJWTeGT2eBFo+\nXxzT9xFJYPtyawTAj0K1rVUNlWNUwj3zszK6P2sAsrpI2Rz1klwQ9aDz9i3+Opxv\n7UZ3pOzur6S58JnoswtNs6BZ9P7oeggLJJC6MPjioxwh8jLLIGMgdVtC2/iPYW3r\nGzurWlwkM8M8DyCgNq7KKJcx44pGcyy16ZGCYiijuTEmK6R+WHJTTyICzRFu3Org\nuHGlZUs/G4E76p10HanoFX2AIS/fDEEMP2DXBB73yoCal5GuvMY9yZWxnvV65Y5z\nGveY3NDB9EESbO2AAhDvHekWT17uWhymtO5N3gM8da48J9d51tVzi0D/NIPZnF0u\nTS64uxK3AgMBAAECggEAYuEQa7oPcfLyQscWRbRH1250n2E4e7zSkBcTW4J7Km+7\ncZajTOGEP4iqgF4Lc8XgQnkBYXOmdvDP97+47VAh3EtOtRDeUEyV9kUlonNH8rx1\nkj3kNEwnTHav4oG/slEl4WJ3zro6NinTEvdXQ7OgVVOLrPP6m4g3uQ5TJCxgLEUI\nTd3Hs3cg3P71mzEqfBF4NmGVmC1ea5lXFELd6giJJMvL7g+O2w22/fquGWOrreAM\ncj/G2Xv9/vmzeb9yzbgGxqCJyY6vspmd90fQLUu7bxkEY5/PPc6Zk8qay4AdEn47\nkL6hnJiR8H1wMCzV2RTUKE7ospriNVdBilXgxm9IMQKBgQD1TmF0Bg85zvXmEKBa\nLBhbc3xTtM7DOgKs+pI12sYDKwgL/QKEI/TKkYXua0aVGiQWc2Bk2/0sYhO6aB2f\n6AN1ZUrf4PRM8c53jebChc7beVLSjWI8Tx+kE+0t8864OwvELYZUzP35oSx3RdJD\nE/CvqBM7NQfJwx2Mw2VJK/YRGQKBgQDmyWLm/IWitehkITw6xMQpkkFs2m4Joq3A\nJvAyri58TRkw/7rqWaIxb5Wcy/7BOvjDN8PZNTHh4ZvhQiHpn7NGUks2/ULnWxUB\nWAA9YbeO9PNHJfZ6PjD2FSvwOXHj+vVkWt2GCXT8pDGYM2ImqXon85Oe3OH/h+N5\nktO9taesTwKBgQCSdPGKK/P7N61oZpTWQW1pbFHWSCUKOiBO1mtk6/E9AvwS7EQM\nUMteBfRInJPPgYP6Q3hRv2YwkX3l1TOavRMTjB5f/BbfuZ7jkj0r9mfCcXUZcIAu\nMa9abus0fFP3eolT3zpMdvdLiwbZTz5x/f29YkPZHZhAxdVmrWJThYOsQQKBgBDu\nZVsc25D8V3hBF/IXzWxfVn1t6PS8ApM+SBDvxmlIHrkBiez3dna6APfn32C9utJX\nnP6qcGZp7s2v1F0XYkeecfYuzmG6xOe8VQgryxOp1M87ccG2HlFvbDHLhRd8qdQa\n9nWG7BY81Yac/m5nsJaNwB6/hbUBeybIJtCcKxjxAoGBAJ3y+QSFb4AYmxLFtmMA\nklOvlT+r70w4RV/z4SEO1gjWEh9IozNSXknl5Q/8Zh9IVm3+/qYap//IzEv9JUc3\nv4+HlpZu0trxTpvRWWjPqVr3ssxRdiFLC0LCLEk4rzqWLBVyzJm8uHVIF9Inv8PE\naudInvdbnfAWi60+1Wi8u0Co\n-----END PRIVATE KEY-----\n",
-  "client_email": "firebase-adminsdk-2afzd@tutorials-2cdfb.iam.gserviceaccount.com",
-  "client_id": "111111112074248894669",
+  "project_id": "REPLACE WITH VALID PROJECT ID",
+  "private_key_id": "REPLACE WITH VALID PRIVATE KEY ID",
+  "private_key": "REPLACE WITH VALID PRIVATE KEY",
+  "client_email": "REPLACE WITH VALID CLIENT EMAIL",
+  "client_id": "REPLACE WITH VALID CLIENT ID",
   "auth_uri": "https://accounts.google.com/o/oauth2/auth",
   "token_uri": "https://oauth2.googleapis.com/token",
   "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
diff --git a/geotools/pom.xml b/geotools/pom.xml
index 6edb344c8c..61682ae0f5 100644
--- a/geotools/pom.xml
+++ b/geotools/pom.xml
@@ -4,10 +4,8 @@
     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>geotools</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>geotools</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>
@@ -15,14 +13,6 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <repositories>
-        <repository>
-            <id>osgeo-release</id>
-            <name>OSGeo Repository</name>
-            <url>https://repo.osgeo.org/repository/release/</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>org.geotools</groupId>
@@ -39,15 +29,16 @@
             <artifactId>gt-swing</artifactId>
             <version>${geotools-swing.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.locationtech.jts</groupId>
-            <artifactId>jts-core</artifactId>
-            <version>1.19.0</version>
-        </dependency>
-
-
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>osgeo-release</id>
+            <name>OSGeo Repository</name>
+            <url>https://repo.osgeo.org/repository/release/</url>
+        </repository>
+    </repositories>
+
     <properties>
         <geotools.version>28.1</geotools.version>
         <geotools-swing.version>28.1</geotools-swing.version>
diff --git a/code-generation/README.md b/google-auto-project/README.md
similarity index 100%
rename from code-generation/README.md
rename to google-auto-project/README.md
diff --git a/code-generation/pom.xml b/google-auto-project/pom.xml
similarity index 96%
rename from code-generation/pom.xml
rename to google-auto-project/pom.xml
index ed8890e1dd..839ccabc5f 100644
--- a/code-generation/pom.xml
+++ b/google-auto-project/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 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>code-generation</artifactId>
+    <artifactId>google-auto-project</artifactId>
     <version>1.0</version>
-    <name>code-generation</name>
+    <name>google-auto-project</name>
 
     <parent>
         <groupId>com.baeldung</groupId>
diff --git a/code-generation/src/main/java/com/baeldung/autofactory/App.java b/google-auto-project/src/main/java/com/baeldung/autofactory/App.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autofactory/App.java
rename to google-auto-project/src/main/java/com/baeldung/autofactory/App.java
diff --git a/code-generation/src/main/java/com/baeldung/autofactory/CustomStorage.java b/google-auto-project/src/main/java/com/baeldung/autofactory/CustomStorage.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autofactory/CustomStorage.java
rename to google-auto-project/src/main/java/com/baeldung/autofactory/CustomStorage.java
diff --git a/code-generation/src/main/java/com/baeldung/autofactory/custom/AbstractFactory.java b/google-auto-project/src/main/java/com/baeldung/autofactory/custom/AbstractFactory.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autofactory/custom/AbstractFactory.java
rename to google-auto-project/src/main/java/com/baeldung/autofactory/custom/AbstractFactory.java
diff --git a/code-generation/src/main/java/com/baeldung/autofactory/custom/CustomPhone.java b/google-auto-project/src/main/java/com/baeldung/autofactory/custom/CustomPhone.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autofactory/custom/CustomPhone.java
rename to google-auto-project/src/main/java/com/baeldung/autofactory/custom/CustomPhone.java
diff --git a/code-generation/src/main/java/com/baeldung/autofactory/custom/SmartPhone.java b/google-auto-project/src/main/java/com/baeldung/autofactory/custom/SmartPhone.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autofactory/custom/SmartPhone.java
rename to google-auto-project/src/main/java/com/baeldung/autofactory/custom/SmartPhone.java
diff --git a/code-generation/src/main/java/com/baeldung/autofactory/model/Camera.java b/google-auto-project/src/main/java/com/baeldung/autofactory/model/Camera.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autofactory/model/Camera.java
rename to google-auto-project/src/main/java/com/baeldung/autofactory/model/Camera.java
diff --git a/code-generation/src/main/java/com/baeldung/autofactory/model/ClassicPhone.java b/google-auto-project/src/main/java/com/baeldung/autofactory/model/ClassicPhone.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autofactory/model/ClassicPhone.java
rename to google-auto-project/src/main/java/com/baeldung/autofactory/model/ClassicPhone.java
diff --git a/code-generation/src/main/java/com/baeldung/autofactory/model/Phone.java b/google-auto-project/src/main/java/com/baeldung/autofactory/model/Phone.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autofactory/model/Phone.java
rename to google-auto-project/src/main/java/com/baeldung/autofactory/model/Phone.java
diff --git a/code-generation/src/main/java/com/baeldung/autofactory/modules/SonyCameraModule.java b/google-auto-project/src/main/java/com/baeldung/autofactory/modules/SonyCameraModule.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autofactory/modules/SonyCameraModule.java
rename to google-auto-project/src/main/java/com/baeldung/autofactory/modules/SonyCameraModule.java
diff --git a/code-generation/src/main/java/com/baeldung/autofactory/provided/IntermediateAssembler.java b/google-auto-project/src/main/java/com/baeldung/autofactory/provided/IntermediateAssembler.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autofactory/provided/IntermediateAssembler.java
rename to google-auto-project/src/main/java/com/baeldung/autofactory/provided/IntermediateAssembler.java
diff --git a/code-generation/src/main/java/com/baeldung/autofactory/provider/SonyCameraProvider.java b/google-auto-project/src/main/java/com/baeldung/autofactory/provider/SonyCameraProvider.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autofactory/provider/SonyCameraProvider.java
rename to google-auto-project/src/main/java/com/baeldung/autofactory/provider/SonyCameraProvider.java
diff --git a/code-generation/src/main/java/com/baeldung/autoservice/BingTranslationServiceProvider.java b/google-auto-project/src/main/java/com/baeldung/autoservice/BingTranslationServiceProvider.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autoservice/BingTranslationServiceProvider.java
rename to google-auto-project/src/main/java/com/baeldung/autoservice/BingTranslationServiceProvider.java
diff --git a/code-generation/src/main/java/com/baeldung/autoservice/GoogleTranslationServiceProvider.java b/google-auto-project/src/main/java/com/baeldung/autoservice/GoogleTranslationServiceProvider.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autoservice/GoogleTranslationServiceProvider.java
rename to google-auto-project/src/main/java/com/baeldung/autoservice/GoogleTranslationServiceProvider.java
diff --git a/code-generation/src/main/java/com/baeldung/autoservice/TranslationService.java b/google-auto-project/src/main/java/com/baeldung/autoservice/TranslationService.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autoservice/TranslationService.java
rename to google-auto-project/src/main/java/com/baeldung/autoservice/TranslationService.java
diff --git a/code-generation/src/main/java/com/baeldung/autovalue/AutoValueMoney.java b/google-auto-project/src/main/java/com/baeldung/autovalue/AutoValueMoney.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autovalue/AutoValueMoney.java
rename to google-auto-project/src/main/java/com/baeldung/autovalue/AutoValueMoney.java
diff --git a/code-generation/src/main/java/com/baeldung/autovalue/AutoValueMoneyWithBuilder.java b/google-auto-project/src/main/java/com/baeldung/autovalue/AutoValueMoneyWithBuilder.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autovalue/AutoValueMoneyWithBuilder.java
rename to google-auto-project/src/main/java/com/baeldung/autovalue/AutoValueMoneyWithBuilder.java
diff --git a/code-generation/src/main/java/com/baeldung/autovalue/Foo.java b/google-auto-project/src/main/java/com/baeldung/autovalue/Foo.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autovalue/Foo.java
rename to google-auto-project/src/main/java/com/baeldung/autovalue/Foo.java
diff --git a/code-generation/src/main/java/com/baeldung/autovalue/ImmutableMoney.java b/google-auto-project/src/main/java/com/baeldung/autovalue/ImmutableMoney.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autovalue/ImmutableMoney.java
rename to google-auto-project/src/main/java/com/baeldung/autovalue/ImmutableMoney.java
diff --git a/code-generation/src/main/java/com/baeldung/autovalue/MutableMoney.java b/google-auto-project/src/main/java/com/baeldung/autovalue/MutableMoney.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autovalue/MutableMoney.java
rename to google-auto-project/src/main/java/com/baeldung/autovalue/MutableMoney.java
diff --git a/code-generation/src/main/java/com/baeldung/autovalue/Person.java b/google-auto-project/src/main/java/com/baeldung/autovalue/Person.java
similarity index 100%
rename from code-generation/src/main/java/com/baeldung/autovalue/Person.java
rename to google-auto-project/src/main/java/com/baeldung/autovalue/Person.java
diff --git a/code-generation/src/main/resources/logback.xml b/google-auto-project/src/main/resources/logback.xml
similarity index 100%
rename from code-generation/src/main/resources/logback.xml
rename to google-auto-project/src/main/resources/logback.xml
diff --git a/code-generation/src/test/java/com/baeldung/autoservice/TranslationServiceUnitTest.java b/google-auto-project/src/test/java/com/baeldung/autoservice/TranslationServiceUnitTest.java
similarity index 100%
rename from code-generation/src/test/java/com/baeldung/autoservice/TranslationServiceUnitTest.java
rename to google-auto-project/src/test/java/com/baeldung/autoservice/TranslationServiceUnitTest.java
diff --git a/code-generation/src/test/java/com/baeldung/autovalue/MoneyUnitTest.java b/google-auto-project/src/test/java/com/baeldung/autovalue/MoneyUnitTest.java
similarity index 100%
rename from code-generation/src/test/java/com/baeldung/autovalue/MoneyUnitTest.java
rename to google-auto-project/src/test/java/com/baeldung/autovalue/MoneyUnitTest.java
diff --git a/code-generation/src/test/java/com/baeldung/autovalue/PersonUnitTest.java b/google-auto-project/src/test/java/com/baeldung/autovalue/PersonUnitTest.java
similarity index 100%
rename from code-generation/src/test/java/com/baeldung/autovalue/PersonUnitTest.java
rename to google-auto-project/src/test/java/com/baeldung/autovalue/PersonUnitTest.java
diff --git a/google-cloud/pom.xml b/google-cloud/pom.xml
index 72b9647bc8..8bb535f12a 100644
--- a/google-cloud/pom.xml
+++ b/google-cloud/pom.xml
@@ -4,7 +4,6 @@
     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>google-cloud</artifactId>
-    <version>0.1-SNAPSHOT</version>
     <name>google-cloud</name>
     <packaging>jar</packaging>
     <description>Google Cloud Tutorials</description>
@@ -24,7 +23,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <!-- Check for the most recent available version: https://projectlombok.org/changelog.html -->
             <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/gradle-modules/gradle-customization/protobuf/README.md b/gradle-modules/gradle-customization/protobuf/README.md
new file mode 100644
index 0000000000..4e94aa3557
--- /dev/null
+++ b/gradle-modules/gradle-customization/protobuf/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Configuring Protobuf Compilation with Custom Source Directories](https://www.baeldung.com/java-configure-protobuf-compilation-custom-source-directories)
diff --git a/gradle-modules/gradle-customization/protobuf/build.gradle b/gradle-modules/gradle-customization/protobuf/build.gradle
new file mode 100644
index 0000000000..3cac57fb03
--- /dev/null
+++ b/gradle-modules/gradle-customization/protobuf/build.gradle
@@ -0,0 +1,45 @@
+plugins {
+	id 'java'
+	id "com.google.protobuf" version "0.8.18"
+}
+
+group = 'com.baeldung'
+version = '0.0.1-SNAPSHOT'
+sourceCompatibility = '17'
+
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.15.0'
+	implementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
+	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
+	testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
+}
+
+tasks.named('test') {
+	useJUnitPlatform()
+}
+
+protobuf {
+	protoc {
+		artifact = 'com.google.protobuf:protoc:3.15.0'
+	}
+}
+
+sourceSets {
+	main {
+		proto {
+			srcDir 'src/sample_protofiles'
+		}
+		java {
+			srcDirs 'build/generated/source/proto/main/java'
+		}
+	}
+	test {
+		proto {
+			srcDir 'src/sample_protofiles'
+		}
+	}
+}
\ No newline at end of file
diff --git a/gradle-modules/gradle-customization/protobuf/gradle/wrapper/gradle-wrapper.properties b/gradle-modules/gradle-customization/protobuf/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..774fae8767
--- /dev/null
+++ b/gradle-modules/gradle-customization/protobuf/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradle-modules/gradle-customization/protobuf/gradlew b/gradle-modules/gradle-customization/protobuf/gradlew
new file mode 100755
index 0000000000..a69d9cb6c2
--- /dev/null
+++ b/gradle-modules/gradle-customization/protobuf/gradlew
@@ -0,0 +1,240 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradle-modules/gradle-customization/protobuf/gradlew.bat b/gradle-modules/gradle-customization/protobuf/gradlew.bat
new file mode 100644
index 0000000000..f127cfd49d
--- /dev/null
+++ b/gradle-modules/gradle-customization/protobuf/gradlew.bat
@@ -0,0 +1,91 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/gradle-modules/gradle-customization/protobuf/settings.gradle b/gradle-modules/gradle-customization/protobuf/settings.gradle
new file mode 100644
index 0000000000..63483bae11
--- /dev/null
+++ b/gradle-modules/gradle-customization/protobuf/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'protobuf'
diff --git a/gradle-modules/gradle-customization/protobuf/src/main/resources/application.properties b/gradle-modules/gradle-customization/protobuf/src/main/resources/application.properties
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/gradle-modules/gradle-customization/protobuf/src/main/resources/application.properties
@@ -0,0 +1 @@
+
diff --git a/gradle-modules/gradle-customization/protobuf/src/sample_protofiles/user_message.proto b/gradle-modules/gradle-customization/protobuf/src/sample_protofiles/user_message.proto
new file mode 100644
index 0000000000..60e06c2016
--- /dev/null
+++ b/gradle-modules/gradle-customization/protobuf/src/sample_protofiles/user_message.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+package com.baeldung.protobuf;
+
+option java_multiple_files = true;
+option java_package = "com.baeldung.protobuf.service";
+
+message User {
+  string firstName = 1;
+  optional string middleName = 2;
+  string lastName = 3;
+  optional uint32 age = 4;
+}
\ No newline at end of file
diff --git a/gradle-modules/gradle-customization/protobuf/src/test/java/com/baeldung/protobuf/ProtobufCodeGenerationUnitTest.java b/gradle-modules/gradle-customization/protobuf/src/test/java/com/baeldung/protobuf/ProtobufCodeGenerationUnitTest.java
new file mode 100644
index 0000000000..12187e3efb
--- /dev/null
+++ b/gradle-modules/gradle-customization/protobuf/src/test/java/com/baeldung/protobuf/ProtobufCodeGenerationUnitTest.java
@@ -0,0 +1,28 @@
+package com.baeldung.protobuf;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import com.baeldung.protobuf.service.User;
+
+class ProtobufCodeGenerationUnitTest {
+
+	@Test
+	void givenUserData_whenObjectCreated_thenDataShouldMatch() {
+		final String firstName = "John";
+		final String lastName = "Doe";
+		final int age = 28;
+
+		User user = User.newBuilder()
+		.setFirstName(firstName)
+		.setLastName(lastName)
+		.setAge(age)
+		.build();
+
+		assertEquals(firstName, user.getFirstName());
+		assertEquals(lastName, user.getLastName());
+		assertEquals(age, user.getAge());
+	}
+
+}
diff --git a/graphql-modules/graphql-dgs/pom.xml b/graphql-modules/graphql-dgs/pom.xml
index 051785b4b8..313e598130 100644
--- a/graphql-modules/graphql-dgs/pom.xml
+++ b/graphql-modules/graphql-dgs/pom.xml
@@ -4,7 +4,6 @@
     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>graphql-dgs</artifactId>
-    <version>1.0</version>
     <name>graphql-dgs</name>
 
     <parent>
diff --git a/graphql-modules/graphql-java/pom.xml b/graphql-modules/graphql-java/pom.xml
index 01b7a4fbc3..88f2beb574 100644
--- a/graphql-modules/graphql-java/pom.xml
+++ b/graphql-modules/graphql-java/pom.xml
@@ -4,7 +4,6 @@
     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>graphql-java</artifactId>
-    <version>1.0</version>
     <name>graphql-java</name>
 
     <parent>
@@ -13,21 +12,6 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <repositories>
-        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
-        </repository>
-        <repository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <id>central</id>
-            <name>Central Repository</name>
-            <url>https://repo.maven.apache.org/maven2</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>com.graphql-java</groupId>
@@ -143,6 +127,13 @@
         </plugins>
     </build>
 
+    <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+    </repositories>
+
     <properties>
         <graphql-java.version>11.0</graphql-java.version>
         <graphql-java-tools.version>5.2.4</graphql-java-tools.version>
diff --git a/graphql-modules/graphql-spqr-boot-starter/pom.xml b/graphql-modules/graphql-spqr-boot-starter/pom.xml
index 6cb1d74329..fd9ebc0224 100644
--- a/graphql-modules/graphql-spqr-boot-starter/pom.xml
+++ b/graphql-modules/graphql-spqr-boot-starter/pom.xml
@@ -4,7 +4,6 @@
     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>graphql-spqr-boot-starter</artifactId>
-    <version>1.0</version>
     <name>graphql-spqr-boot-starter</name>
 
     <parent>
diff --git a/graphql-modules/graphql-spqr/pom.xml b/graphql-modules/graphql-spqr/pom.xml
index d845d1ac8a..756930f2ac 100644
--- a/graphql-modules/graphql-spqr/pom.xml
+++ b/graphql-modules/graphql-spqr/pom.xml
@@ -4,7 +4,6 @@
     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>graphql-spqr</artifactId>
-    <version>1.0</version>
     <name>graphql-spqr</name>
 
     <parent>
diff --git a/graphql-modules/pom.xml b/graphql-modules/pom.xml
index a42400b7cc..4b43cbffde 100644
--- a/graphql-modules/pom.xml
+++ b/graphql-modules/pom.xml
@@ -5,7 +5,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.graphql</groupId>
     <artifactId>graphql-modules</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
     <name>graphql-modules</name>
     <packaging>pom</packaging>
 
diff --git a/grpc/pom.xml b/grpc/pom.xml
index 40d35183dc..fed1e801f2 100644
--- a/grpc/pom.xml
+++ b/grpc/pom.xml
@@ -4,7 +4,6 @@
     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>grpc</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>grpc</name>
     <packaging>jar</packaging>
 
diff --git a/guava-modules/guava-18/pom.xml b/guava-modules/guava-18/pom.xml
index 8f5108bff1..873555bf24 100644
--- a/guava-modules/guava-18/pom.xml
+++ b/guava-modules/guava-18/pom.xml
@@ -4,7 +4,6 @@
     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>guava-18</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>guava-18</name>
 
     <parent>
diff --git a/guava-modules/guava-19/pom.xml b/guava-modules/guava-19/pom.xml
index ba85fe0ae8..9a40677e08 100644
--- a/guava-modules/guava-19/pom.xml
+++ b/guava-modules/guava-19/pom.xml
@@ -4,7 +4,6 @@
     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>guava-19</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>guava-19</name>
 
     <parent>
diff --git a/guava-modules/guava-21/pom.xml b/guava-modules/guava-21/pom.xml
index 9e791bfe23..a26176ba0b 100644
--- a/guava-modules/guava-21/pom.xml
+++ b/guava-modules/guava-21/pom.xml
@@ -4,7 +4,6 @@
     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>guava-21</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>guava-21</name>
 
     <parent>
diff --git a/guava-modules/guava-collections-list/pom.xml b/guava-modules/guava-collections-list/pom.xml
index 6863b4011c..a07f34e56c 100644
--- a/guava-modules/guava-collections-list/pom.xml
+++ b/guava-modules/guava-collections-list/pom.xml
@@ -4,7 +4,6 @@
     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>guava-collections-list</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>guava-collections-list</name>
 
     <parent>
diff --git a/guava-modules/guava-collections-map/pom.xml b/guava-modules/guava-collections-map/pom.xml
index 04beaa13a1..6b73e8c29a 100644
--- a/guava-modules/guava-collections-map/pom.xml
+++ b/guava-modules/guava-collections-map/pom.xml
@@ -5,7 +5,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.guava</groupId>
     <artifactId>guava-collections-map</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>guava-collections-map</name>
 
     <parent>
diff --git a/guava-modules/guava-collections-set/pom.xml b/guava-modules/guava-collections-set/pom.xml
index 49bfc46ee2..ffd6c80a3e 100644
--- a/guava-modules/guava-collections-set/pom.xml
+++ b/guava-modules/guava-collections-set/pom.xml
@@ -4,7 +4,6 @@
     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>guava-collections-set</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>guava-collections-set</name>
 
     <parent>
diff --git a/guava-modules/guava-collections/pom.xml b/guava-modules/guava-collections/pom.xml
index 9283107023..e016b1c547 100644
--- a/guava-modules/guava-collections/pom.xml
+++ b/guava-modules/guava-collections/pom.xml
@@ -4,7 +4,6 @@
     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>guava-collections</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>guava-collections</name>
 
     <parent>
@@ -37,6 +36,7 @@
             <version>${java-hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
+
     </dependencies>
 
     <build>
diff --git a/guava-modules/guava-core/pom.xml b/guava-modules/guava-core/pom.xml
index dd68fef43a..6c4f76356f 100644
--- a/guava-modules/guava-core/pom.xml
+++ b/guava-modules/guava-core/pom.xml
@@ -4,7 +4,6 @@
     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>guava-core</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>guava-core</name>
 
     <parent>
diff --git a/guava-modules/guava-io/pom.xml b/guava-modules/guava-io/pom.xml
index 2ea91c5e4f..367533139e 100644
--- a/guava-modules/guava-io/pom.xml
+++ b/guava-modules/guava-io/pom.xml
@@ -4,7 +4,6 @@
     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>guava-io</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>guava-io</name>
 
     <parent>
diff --git a/guava-modules/guava-utilities/pom.xml b/guava-modules/guava-utilities/pom.xml
index ab849072a5..407a44587e 100644
--- a/guava-modules/guava-utilities/pom.xml
+++ b/guava-modules/guava-utilities/pom.xml
@@ -4,7 +4,6 @@
     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>guava-utilities</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>guava-utilities</name>
 
     <parent>
diff --git a/hazelcast/pom.xml b/hazelcast/pom.xml
index 694563790f..4742f213e5 100644
--- a/hazelcast/pom.xml
+++ b/hazelcast/pom.xml
@@ -4,7 +4,6 @@
     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>hazelcast</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>hazelcast</name>
 
     <parent>
diff --git a/httpclient-simple/pom.xml b/httpclient-simple/pom.xml
index eea056477c..a6049432ce 100644
--- a/httpclient-simple/pom.xml
+++ b/httpclient-simple/pom.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         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">
+    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>httpclient-simple</artifactId>
-    <version>0.1-SNAPSHOT</version>
     <name>httpclient-simple</name>
     <packaging>war</packaging>
 
diff --git a/httpclient-simple/src/test/java/com/baeldung/httpclient/HttpClientHeadersLiveTest.java b/httpclient-simple/src/test/java/com/baeldung/httpclient/HttpClientHeadersLiveTest.java
index 616b6470af..3992fd821e 100644
--- a/httpclient-simple/src/test/java/com/baeldung/httpclient/HttpClientHeadersLiveTest.java
+++ b/httpclient-simple/src/test/java/com/baeldung/httpclient/HttpClientHeadersLiveTest.java
@@ -25,26 +25,22 @@ class HttpClientHeadersLiveTest {
 
     @Test
     void whenClientUsesCustomUserAgent_thenCorrect() throws IOException {
+        final CloseableHttpClient client = HttpClients.custom()
+            .setUserAgent("Mozilla/5.0 Firefox/26.0")
+            .build();
         final HttpGet request = new HttpGet(SAMPLE_URL);
 
-        try (CloseableHttpClient client = HttpClients.custom()
-            .setUserAgent("Mozilla/5.0 Firefox/26.0")
-            .build()) {
-
-            String response = client.execute(request, new BasicHttpClientResponseHandler());
-            logger.info("Response -> {}", response);
-        }
+        String response = client.execute(request, new BasicHttpClientResponseHandler());
+        logger.info("Response -> {}", response);
     }
 
     @Test
     void whenRequestHasCustomUserAgent_thenCorrect() throws IOException {
+        CloseableHttpClient client = HttpClients.createDefault();
         final HttpGet request = new HttpGet(SAMPLE_URL);
         request.setHeader(HttpHeaders.USER_AGENT, "Mozilla/5.0 Firefox/26.0");
-
-        try (CloseableHttpClient client = HttpClients.createDefault()) {
-            String response = client.execute(request, new BasicHttpClientResponseHandler());
-            logger.info("Response -> {}", response);
-        }
+        String response = client.execute(request, new BasicHttpClientResponseHandler());
+        logger.info("Response -> {}", response);
     }
 
     @Test
diff --git a/httpclient4/.gitignore b/httpclient4/.gitignore
deleted file mode 100644
index 83c05e60c8..0000000000
--- a/httpclient4/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.class
-
-#folders#
-/target
-/neoDb*
-/data
-/src/main/webapp/WEB-INF/classes
-*/META-INF/*
-
-# Packaged files #
-*.jar
-*.war
-*.ear
\ No newline at end of file
diff --git a/httpclient4/src/test/resources/.gitignore b/httpclient4/src/test/resources/.gitignore
deleted file mode 100644
index 83c05e60c8..0000000000
--- a/httpclient4/src/test/resources/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.class
-
-#folders#
-/target
-/neoDb*
-/data
-/src/main/webapp/WEB-INF/classes
-*/META-INF/*
-
-# Packaged files #
-*.jar
-*.war
-*.ear
\ No newline at end of file
diff --git a/hystrix/pom.xml b/hystrix/pom.xml
index 639d4eba02..007c2e237b 100644
--- a/hystrix/pom.xml
+++ b/hystrix/pom.xml
@@ -4,7 +4,6 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>hystrix</artifactId>
-    <version>1.0</version>
     <name>hystrix</name>
 
     <parent>
diff --git a/image-processing/pom.xml b/image-processing/pom.xml
index 3780ecfd33..2a2b92ca48 100644
--- a/image-processing/pom.xml
+++ b/image-processing/pom.xml
@@ -4,7 +4,6 @@
     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>image-processing</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>image-processing</name>
 
     <parent>
diff --git a/jackson-modules/jackson-annotations/pom.xml b/jackson-modules/jackson-annotations/pom.xml
index 4bb9341e43..e2d5e1e607 100644
--- a/jackson-modules/jackson-annotations/pom.xml
+++ b/jackson-modules/jackson-annotations/pom.xml
@@ -4,7 +4,6 @@
     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>jackson-annotations</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>jackson-annotations</name>
 
     <parent>
diff --git a/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/format/User.java b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/format/User.java
index e655deb93b..119c1e3ce3 100644
--- a/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/format/User.java
+++ b/jackson-modules/jackson-annotations/src/main/java/com/baeldung/jackson/format/User.java
@@ -1,26 +1,41 @@
 package com.baeldung.jackson.format;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
 
-import com.baeldung.jackson.domain.Person;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-/**
- * @author Jay Sridhar
- * @version 1.0
- */
-public class User extends Person {
+public class User {
     private String firstName;
     private String lastName;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd@HH:mm:ss.SSSZ")
     private Date createdDate;
 
+    public User() {
+    }
+
     public User(String firstName, String lastName) {
-        super(firstName, lastName);
+        this.firstName = firstName;
+        this.lastName = lastName;
         this.createdDate = new Date();
     }
 
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
     public Date getCreatedDate() {
         return createdDate;
     }
@@ -35,3 +50,51 @@ public class User extends Person {
         return new Date();
     }
 }
+
+@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
+class UserIgnoreCase {
+    private String firstName;
+    private String lastName;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd@HH:mm:ss.SSSZ")
+    private Date createdDate;
+
+    public UserIgnoreCase() {
+    }
+
+    public UserIgnoreCase(String firstName, String lastName) {
+        this.firstName = firstName;
+        this.lastName = lastName;
+        this.createdDate = new Date();
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public Date getCreatedDate() {
+        return createdDate;
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd@HH:mm:ss.SSSZ", locale = "en_GB")
+    public Date getCurrentDate() {
+        return new Date();
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER)
+    public Date getDateNum() {
+        return new Date();
+    }
+}
\ No newline at end of file
diff --git a/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/format/JsonFormatUnitTest.java b/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/format/JsonFormatUnitTest.java
index cf166fdc36..5cdc248d3b 100644
--- a/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/format/JsonFormatUnitTest.java
+++ b/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/format/JsonFormatUnitTest.java
@@ -1,24 +1,25 @@
 package com.baeldung.jackson.format;
 
-import java.util.Date;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
-
+import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
 import org.junit.Test;
 
-import static io.restassured.path.json.JsonPath.from;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
 
+import static io.restassured.path.json.JsonPath.from;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.from;
 import static org.assertj.core.data.Percentage.withPercentage;
 
-/**
- * @author Jay Sridhar
- * @version 1.0
- */
 public class JsonFormatUnitTest {
 
+    private static final String JSON_STRING = "{\"FIRSTNAME\":\"John\",\"lastname\":\"Smith\",\"cReAtEdDaTe\":\"2016-12-18@07:53:34.740+0000\"}";
+
     @Test
     public void whenSerializedDateFormat_thenCorrect() throws JsonProcessingException {
 
@@ -32,6 +33,24 @@ public class JsonFormatUnitTest {
         // Expected to be close to current time
         long now = new Date().getTime();
         assertThat(from(result).getLong("dateNum")).isCloseTo(now, withPercentage(10.0));
-
     }
-}
+
+    @Test
+    public void whenDeserializeJsonStrToUserObject_thenFail() {
+        assertThatThrownBy(() -> new ObjectMapper().readValue(JSON_STRING, User.class)).isInstanceOf(UnrecognizedPropertyException.class);
+    }
+
+    @Test
+    public void whenDeserializeJsonStrToUserIgnoreCaseObject_thenSuccess() throws JsonProcessingException, ParseException {
+        UserIgnoreCase result = new ObjectMapper().readValue(JSON_STRING, UserIgnoreCase.class);
+        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSzz");
+        Date expectedDate = fmt.parse("2016-12-18T07:53:34.740+0000");
+
+        assertThat(result)
+            .isNotNull()
+            .returns("John", from(UserIgnoreCase::getFirstName))
+            .returns("Smith", from(UserIgnoreCase::getLastName))
+            .returns(expectedDate, from(UserIgnoreCase::getCreatedDate));
+    }
+
+}
\ No newline at end of file
diff --git a/jackson-modules/jackson-conversions-2/pom.xml b/jackson-modules/jackson-conversions-2/pom.xml
index 1c6d2fc002..457045b460 100644
--- a/jackson-modules/jackson-conversions-2/pom.xml
+++ b/jackson-modules/jackson-conversions-2/pom.xml
@@ -4,7 +4,6 @@
     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>jackson-conversions-2</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>jackson-conversions-2</name>
 
     <parent>
diff --git a/jackson-modules/jackson-conversions/pom.xml b/jackson-modules/jackson-conversions/pom.xml
index 9218f209ac..e0990ed34f 100644
--- a/jackson-modules/jackson-conversions/pom.xml
+++ b/jackson-modules/jackson-conversions/pom.xml
@@ -4,7 +4,6 @@
     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>jackson-conversions</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>jackson-conversions</name>
 
     <parent>
@@ -24,6 +23,11 @@
             <artifactId>jackson-datatype-jsr310</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/map/Fruit.java b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/map/Fruit.java
new file mode 100644
index 0000000000..49e45f2161
--- /dev/null
+++ b/jackson-modules/jackson-conversions/src/main/java/com/baeldung/jackson/map/Fruit.java
@@ -0,0 +1,21 @@
+package com.baeldung.jackson.map;
+
+import com.fasterxml.jackson.annotation.JsonKey;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public class Fruit {
+    public String variety;
+
+    @JsonKey
+    public String name;
+
+    public Fruit(String variety, String name) {
+        this.variety = variety;
+        this.name = name;
+    }
+
+    @JsonValue
+    public String getFullName() {
+        return this.variety + " " + this.name;
+    }
+}
diff --git a/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/map/MapWithJsonKeyValueUnitTest.java b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/map/MapWithJsonKeyValueUnitTest.java
new file mode 100644
index 0000000000..0b4639ca3b
--- /dev/null
+++ b/jackson-modules/jackson-conversions/src/test/java/com/baeldung/jackson/map/MapWithJsonKeyValueUnitTest.java
@@ -0,0 +1,48 @@
+package com.baeldung.jackson.map;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class MapWithJsonKeyValueUnitTest {
+    private static final Fruit FRUIT1 = new Fruit("Alphonso", "Mango");
+    private static final Fruit FRUIT2 = new Fruit("Black", "Grapes");
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+    @Test
+    public void givenObject_WhenSerialize_ThenUseJsonValueForSerialization() throws JsonProcessingException {
+        String serializedValueForFruit1 = OBJECT_MAPPER.writeValueAsString(FRUIT1);
+        Assertions.assertEquals("\"Alphonso Mango\"", serializedValueForFruit1);
+        String serializedValueForFruit2 = OBJECT_MAPPER.writeValueAsString(FRUIT2);
+        Assertions.assertEquals("\"Black Grapes\"", serializedValueForFruit2);
+    }
+
+    @Test
+    public void givenMapWithObjectKeys_WhenSerialize_ThenUseJsonKeyForSerialization() throws JsonProcessingException {
+        // Given
+        Map<Fruit, String> selectionByFruit = new LinkedHashMap();
+        selectionByFruit.put(FRUIT1, "Hagrid");
+        selectionByFruit.put(FRUIT2, "Hercules");
+        // When
+        String serializedValue = OBJECT_MAPPER.writeValueAsString(selectionByFruit);
+        // Then
+        Assertions.assertEquals("{\"Mango\":\"Hagrid\",\"Grapes\":\"Hercules\"}", serializedValue);
+    }
+
+    @Test
+    public void givenMapWithObjectValues_WhenSerialize_ThenUseJsonValueForSerialization() throws JsonProcessingException {
+        // Given
+        Map<String, Fruit> selectionByPerson = new LinkedHashMap();
+        selectionByPerson.put("Hagrid", FRUIT1);
+        selectionByPerson.put("Hercules", FRUIT2);
+        // When
+        String serializedValue = OBJECT_MAPPER.writeValueAsString(selectionByPerson);
+        // Then
+        Assertions.assertEquals("{\"Hagrid\":\"Alphonso Mango\",\"Hercules\":\"Black Grapes\"}", serializedValue);
+    }
+}
diff --git a/jackson-modules/jackson-core/README.md b/jackson-modules/jackson-core/README.md
index 0aa3dc5aef..73293b1e84 100644
--- a/jackson-modules/jackson-core/README.md
+++ b/jackson-modules/jackson-core/README.md
@@ -14,3 +14,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Inheritance with Jackson](https://www.baeldung.com/jackson-inheritance)
 - [Working with Tree Model Nodes in Jackson](https://www.baeldung.com/jackson-json-node-tree-model)
 - [Get all the Keys in a JSON String Using JsonNode](https://www.baeldung.com/java-jsonnode-get-keys)
+- [Difference Between asText() and toString() in JsonNode](https://www.baeldung.com/java-jsonnode-astext-vs-tostring)
+- [Deserialize Generic Type with Jackson](https://www.baeldung.com/java-deserialize-generic-type-with-jackson)
diff --git a/jackson-modules/jackson-core/pom.xml b/jackson-modules/jackson-core/pom.xml
index f3edffc07c..4eccd4d8f8 100644
--- a/jackson-modules/jackson-core/pom.xml
+++ b/jackson-modules/jackson-core/pom.xml
@@ -4,7 +4,6 @@
     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>jackson-core</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>jackson-core</name>
 
     <parent>
diff --git a/jackson-modules/jackson-core/src/main/java/com/baeldung/jackson/deserialization/jsongeneric/JsonResponse.java b/jackson-modules/jackson-core/src/main/java/com/baeldung/jackson/deserialization/jsongeneric/JsonResponse.java
new file mode 100644
index 0000000000..14f6b3f8ad
--- /dev/null
+++ b/jackson-modules/jackson-core/src/main/java/com/baeldung/jackson/deserialization/jsongeneric/JsonResponse.java
@@ -0,0 +1,14 @@
+package com.baeldung.jackson.deserialization.jsongeneric;
+
+public class JsonResponse<T> {
+
+    private T result;
+
+    public T getResult() {
+        return result;
+    }
+
+    public void setResult(T result) {
+        this.result = result;
+    }
+}
diff --git a/jackson-modules/jackson-core/src/main/java/com/baeldung/jackson/deserialization/jsongeneric/User.java b/jackson-modules/jackson-core/src/main/java/com/baeldung/jackson/deserialization/jsongeneric/User.java
new file mode 100644
index 0000000000..1efb3af7f9
--- /dev/null
+++ b/jackson-modules/jackson-core/src/main/java/com/baeldung/jackson/deserialization/jsongeneric/User.java
@@ -0,0 +1,33 @@
+package com.baeldung.jackson.deserialization.jsongeneric;
+
+public class User {
+
+    private Long id;
+    private String firstName;
+    private String lastName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+}
+
diff --git a/jackson-modules/jackson-core/src/test/java/com/baeldung/jackson/deserialization/jsongeneric/GenericTypeDeserializerUnitTest.java b/jackson-modules/jackson-core/src/test/java/com/baeldung/jackson/deserialization/jsongeneric/GenericTypeDeserializerUnitTest.java
new file mode 100644
index 0000000000..24baeb7f1f
--- /dev/null
+++ b/jackson-modules/jackson-core/src/test/java/com/baeldung/jackson/deserialization/jsongeneric/GenericTypeDeserializerUnitTest.java
@@ -0,0 +1,40 @@
+package com.baeldung.jackson.deserialization.jsongeneric;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class GenericTypeDeserializerUnitTest {
+
+    ObjectMapper objectMapper = new ObjectMapper();
+
+    @Test
+    void givenJsonObject_whenDeserializeIntoGenericTypeByTypeReference_thenCorrect() throws JsonProcessingException {
+        String json = "{\"result\":{\"id\":1,\"firstName\":\"John\",\"lastName\":\"Lewis\"}}";
+
+        TypeReference<JsonResponse<User>> typeRef = new TypeReference<JsonResponse<User>>() {};
+        JsonResponse<User> jsonResponse = objectMapper.readValue(json, typeRef);
+        User user = jsonResponse.getResult();
+
+        assertThat(user.getId()).isEqualTo(1);
+        assertThat(user.getFirstName()).isEqualTo("John");
+        assertThat(user.getLastName()).isEqualTo("Lewis");
+    }
+
+    @Test
+    void givenJsonObject_whenDeserializeIntoGenericTypeByJavaType_thenCorrect() throws JsonProcessingException {
+        String json = "{\"result\":{\"id\":1,\"firstName\":\"John\",\"lastName\":\"Lewis\"}}";
+
+        JavaType javaType = objectMapper.getTypeFactory().constructParametricType(JsonResponse.class, User.class);
+        JsonResponse<User> jsonResponse = objectMapper.readValue(json, javaType);
+        User user = jsonResponse.getResult();
+
+        assertThat(user.getId()).isEqualTo(1);
+        assertThat(user.getFirstName()).isEqualTo("John");
+        assertThat(user.getLastName()).isEqualTo("Lewis");
+    }
+}
\ No newline at end of file
diff --git a/jackson-modules/jackson-core/src/test/java/com/baeldung/jackson/jsonnode/AsTextVsAsStringTest.java b/jackson-modules/jackson-core/src/test/java/com/baeldung/jackson/jsonnode/AsTextVsAsStringTest.java
new file mode 100644
index 0000000000..4a566594ae
--- /dev/null
+++ b/jackson-modules/jackson-core/src/test/java/com/baeldung/jackson/jsonnode/AsTextVsAsStringTest.java
@@ -0,0 +1,53 @@
+package com.baeldung.jackson.jsonnode;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+class AsTextVsAsStringUnitTest {
+    @Test
+    void shouldUseAsText() throws JsonProcessingException {
+        String json = "{\"name\":\"John\",\"age\":30}";
+        JsonNode node = new ObjectMapper().readTree(json);
+
+        String name = node.get("name")
+          .asText();
+        String age = node.get("age")
+          .asText();
+        String jsonText = node.asText();
+        assertThat(jsonText).isEmpty();
+        assertThat(name).isEqualTo("John");
+        assertThat(age).isEqualTo("30");
+    }
+
+    @Test
+    void shouldUseAsTextWithEscapeCharacters() throws JsonProcessingException {
+        String specialCharsJson = "{\"text\":\"Hello \\\"world\\\" !\"}";
+        JsonNode specialCharsNode = new ObjectMapper().readTree(specialCharsJson);
+        String specialCharsJsonAsText = specialCharsNode.get("text")
+          .asText();
+        String specialCharsJsonToString = specialCharsNode.get("text")
+          .toString();
+        assertThat(specialCharsJsonAsText).isEqualTo("Hello \"world\" !");
+        assertThat(specialCharsJsonToString).isEqualTo("\"Hello \\\"world\\\" !\"");
+    }
+
+    @Test
+    void shouldUseToString() throws JsonProcessingException {
+        String json = "{\"name\":\"John\",\"age\":30}";
+        JsonNode node = new ObjectMapper().readTree(json);
+
+        String jsonString = node.toString();
+        String name = node.get("name")
+          .toString();
+        String age = node.get("age")
+          .toString();
+        assertThat(jsonString).isEqualTo("{\"name\":\"John\",\"age\":30}");
+        assertThat(name).isEqualTo("\"John\"");
+        assertThat(age).isEqualTo("30");
+    }
+}
\ No newline at end of file
diff --git a/jackson-modules/jackson-custom-conversions/README.md b/jackson-modules/jackson-custom-conversions/README.md
index 68e9a6d50d..2f45a2f43b 100644
--- a/jackson-modules/jackson-custom-conversions/README.md
+++ b/jackson-modules/jackson-custom-conversions/README.md
@@ -7,3 +7,4 @@ This module contains articles about Jackson custom conversions.
 - [Getting Started with Custom Deserialization in Jackson](https://www.baeldung.com/jackson-deserialization)
 - [Serialize Only Fields that meet a Custom Criteria with Jackson](https://www.baeldung.com/jackson-serialize-field-custom-criteria)
 - [Calling Default Serializer from Custom Serializer in Jackson](https://www.baeldung.com/jackson-call-default-serializer-from-custom-serializer)
+- [OffsetDateTime Serialization With Jackson](https://www.baeldung.com/java-jackson-offsetdatetime)
diff --git a/jackson-modules/jackson-custom-conversions/pom.xml b/jackson-modules/jackson-custom-conversions/pom.xml
index 79af962eec..31e460511a 100644
--- a/jackson-modules/jackson-custom-conversions/pom.xml
+++ b/jackson-modules/jackson-custom-conversions/pom.xml
@@ -4,7 +4,6 @@
     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>jackson-custom-conversions</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>jackson-custom-conversions</name>
 
     <parent>
diff --git a/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/offsetdatetime/Main.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/offsetdatetime/Main.java
new file mode 100644
index 0000000000..eb82c3c4c8
--- /dev/null
+++ b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/offsetdatetime/Main.java
@@ -0,0 +1,50 @@
+package com.baeldung.offsetdatetime;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
+import java.time.OffsetDateTime;
+
+public class Main {
+    public static void main(String[] args) throws JsonProcessingException {
+        System.out.println(serializeUser());
+        System.out.println(customSerialize());
+        System.out.println(customDeserialize());
+    }
+
+    static String serializeUser() throws JsonProcessingException {
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        objectMapper.registerModule(new JavaTimeModule());
+
+        User user = new User();
+        user.setCreatedAt(OffsetDateTime.parse("2021-09-30T15:30:00+01:00"));
+
+        return objectMapper.writeValueAsString(user);
+    }
+
+    static String customSerialize() throws JsonProcessingException {
+        ObjectMapper objectMapper = new ObjectMapper();
+
+        objectMapper.registerModule(new SimpleModule().addSerializer(OffsetDateTime.class, new OffsetDateTimeSerializer()));
+
+        User user = new User();
+        user.setCreatedAt(OffsetDateTime.parse("2021-09-30T15:30:00+01:00"));
+
+        return objectMapper.writeValueAsString(user);
+    }
+
+    static String customDeserialize() throws JsonProcessingException {
+        ObjectMapper objectMapper = new ObjectMapper();
+
+        objectMapper.registerModule(new SimpleModule().addDeserializer(OffsetDateTime.class, new OffsetDateTimeDeserializer()));
+
+        String jsonString = "{\"createdAt\":\"30-09-2021 15:30:00 +01:00\"}";
+        User returnedUser = objectMapper.readValue(jsonString, User.class);
+
+        return returnedUser.getCreatedAt().toString();
+    }
+}
diff --git a/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/offsetdatetime/OffsetDateTimeDeserializer.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/offsetdatetime/OffsetDateTimeDeserializer.java
new file mode 100644
index 0000000000..a76d598b8f
--- /dev/null
+++ b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/offsetdatetime/OffsetDateTimeDeserializer.java
@@ -0,0 +1,24 @@
+package com.baeldung.offsetdatetime;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+
+import java.io.IOException;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+
+public class OffsetDateTimeDeserializer extends JsonDeserializer<OffsetDateTime> {
+    private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter
+            .ofPattern("dd-MM-yyyy HH:mm:ss XXX");
+
+    @Override
+    public OffsetDateTime deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+            throws IOException {
+        String dateAsString = jsonParser.getText();
+        if (dateAsString == null) {
+            throw new IOException("OffsetDateTime argument is null.");
+        }
+        return OffsetDateTime.parse(dateAsString, DATE_TIME_FORMATTER);
+    }
+}
\ No newline at end of file
diff --git a/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/offsetdatetime/OffsetDateTimeSerializer.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/offsetdatetime/OffsetDateTimeSerializer.java
new file mode 100644
index 0000000000..8821f37e8e
--- /dev/null
+++ b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/offsetdatetime/OffsetDateTimeSerializer.java
@@ -0,0 +1,23 @@
+package com.baeldung.offsetdatetime;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+
+public class OffsetDateTimeSerializer extends JsonSerializer<OffsetDateTime> {
+    private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter
+            .ofPattern("dd-MM-yyyy HH:mm:ss XXX");
+
+    @Override
+    public void serialize(OffsetDateTime value, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
+            throws IOException {
+        if (value == null) {
+            throw new IOException("OffsetDateTime argument is null.");
+        }
+        jsonGenerator.writeString(DATE_TIME_FORMATTER.format(value));
+    }
+}
\ No newline at end of file
diff --git a/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/offsetdatetime/User.java b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/offsetdatetime/User.java
new file mode 100644
index 0000000000..44978cac87
--- /dev/null
+++ b/jackson-modules/jackson-custom-conversions/src/main/java/com/baeldung/offsetdatetime/User.java
@@ -0,0 +1,18 @@
+package com.baeldung.offsetdatetime;
+
+import java.time.OffsetDateTime;
+
+public class User {
+    private OffsetDateTime createdAt;
+
+    public User() {
+    }
+
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+}
\ No newline at end of file
diff --git a/jackson-modules/jackson-custom-conversions/src/test/java/com/baeldung/offsetdatetime/MainUnitTest.java b/jackson-modules/jackson-custom-conversions/src/test/java/com/baeldung/offsetdatetime/MainUnitTest.java
new file mode 100644
index 0000000000..553adc8fdf
--- /dev/null
+++ b/jackson-modules/jackson-custom-conversions/src/test/java/com/baeldung/offsetdatetime/MainUnitTest.java
@@ -0,0 +1,23 @@
+package com.baeldung.offsetdatetime;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class MainUnitTest {
+
+    @Test
+    void givenUser_whenSerialized_thenCreatedDateIsSerialized() throws JsonProcessingException {
+        Assertions.assertEquals("{\"createdAt\":\"2021-09-30T15:30:00+01:00\"}", Main.serializeUser());
+    }
+
+    @Test
+    void givenUser_whenCustomSerialized_thenCreatedDateIsSerialized() throws JsonProcessingException {
+        Assertions.assertEquals("{\"createdAt\":\"30-09-2021 15:30:00 +01:00\"}", Main.customSerialize());
+    }
+
+    @Test
+    void givenUser_whenCustomDeserialized_thenCreatedDateIsDeserialized() throws JsonProcessingException {
+        Assertions.assertEquals("2021-09-30T15:30+01:00", Main.customDeserialize());
+    }
+}
\ No newline at end of file
diff --git a/jackson-modules/jackson-exceptions/README.md b/jackson-modules/jackson-exceptions/README.md
index 6f082aaaa5..b9c43cb09f 100644
--- a/jackson-modules/jackson-exceptions/README.md
+++ b/jackson-modules/jackson-exceptions/README.md
@@ -5,3 +5,4 @@ This module contains articles about Jackson exceptions.
 ### Relevant Articles: 
 - [Jackson Exceptions – Problems and Solutions](https://www.baeldung.com/jackson-exception)
 - [Jackson – JsonMappingException (No serializer found for class)](https://www.baeldung.com/jackson-jsonmappingexception)
+- [Fix the JsonMappingException: Can not deserialize instance of java.util.ArrayList from Object value (token `JsonToken.START_OBJECT`)](https://www.baeldung.com/jsonmappingexception-can-not-deserialize-instance-of-java-util-arraylist-from-object-value-token-jsontoken-start_object)
diff --git a/jackson-modules/jackson-exceptions/pom.xml b/jackson-modules/jackson-exceptions/pom.xml
index a24a0ab4b7..e19ef4f883 100644
--- a/jackson-modules/jackson-exceptions/pom.xml
+++ b/jackson-modules/jackson-exceptions/pom.xml
@@ -4,7 +4,6 @@
     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>jackson-exceptions</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>jackson-exceptions</name>
 
     <parent>
diff --git a/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/Contact.java b/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/Contact.java
new file mode 100644
index 0000000000..6417d60310
--- /dev/null
+++ b/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/Contact.java
@@ -0,0 +1,15 @@
+package com.baeldung.exceptions;
+
+public class Contact {
+
+    private String email;
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+}
diff --git a/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/Person.java b/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/Person.java
new file mode 100644
index 0000000000..1572d7a71f
--- /dev/null
+++ b/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/Person.java
@@ -0,0 +1,33 @@
+package com.baeldung.exceptions;
+
+public class Person {
+
+    private String firstName;
+    private String lastName;
+    private String contact;
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getContact() {
+        return contact;
+    }
+
+    public void setContact(String contact) {
+        this.contact = contact;
+    }
+
+}
diff --git a/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/PersonContact.java b/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/PersonContact.java
new file mode 100644
index 0000000000..0c75240d94
--- /dev/null
+++ b/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/exceptions/PersonContact.java
@@ -0,0 +1,33 @@
+package com.baeldung.exceptions;
+
+public class PersonContact {
+
+    private String firstName;
+    private String lastName;
+    private Contact contact;
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public Contact getContact() {
+        return contact;
+    }
+
+    public void setContact(Contact contact) {
+        this.contact = contact;
+    }
+
+}
diff --git a/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/mappingexception/Country.java b/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/mappingexception/Country.java
new file mode 100644
index 0000000000..a8e6dfbc94
--- /dev/null
+++ b/jackson-modules/jackson-exceptions/src/main/java/com/baeldung/mappingexception/Country.java
@@ -0,0 +1,26 @@
+package com.baeldung.mappingexception;
+
+import java.util.List;
+
+public class Country {
+
+    private String name;
+    private List<String> cities;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<String> getCities() {
+        return cities;
+    }
+
+    public void setCities(List<String> cities) {
+        this.cities = cities;
+    }
+
+}
diff --git a/jackson-modules/jackson-exceptions/src/test/java/com/baeldung/exceptions/JacksonExceptionsUnitTest.java b/jackson-modules/jackson-exceptions/src/test/java/com/baeldung/exceptions/JacksonExceptionsUnitTest.java
index 38ef3f9390..127d466436 100644
--- a/jackson-modules/jackson-exceptions/src/test/java/com/baeldung/exceptions/JacksonExceptionsUnitTest.java
+++ b/jackson-modules/jackson-exceptions/src/test/java/com/baeldung/exceptions/JacksonExceptionsUnitTest.java
@@ -3,17 +3,14 @@ package com.baeldung.exceptions;
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.util.List;
 
 import org.junit.Test;
 
-import com.baeldung.exceptions.User;
-import com.baeldung.exceptions.UserWithPrivateFields;
-import com.baeldung.exceptions.UserWithRoot;
-import com.baeldung.exceptions.Zoo;
-import com.baeldung.exceptions.ZooConfigured;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonFactory;
@@ -82,6 +79,32 @@ public class JacksonExceptionsUnitTest {
             .readValue(json);
     }
 
+    @Test
+    public void givenJsonObject_whenDeserializingIntoString_thenException() throws IOException {
+        final String json = "{\"firstName\":\"Azhrioun\",\"lastName\":\"Abderrahim\",\"contact\":{\"email\":\"azh@email.com\"}}";
+        final ObjectMapper mapper = new ObjectMapper();
+
+        Exception exception = assertThrows(JsonMappingException.class, () -> mapper.reader()
+            .forType(Person.class)
+            .readValue(json));
+
+        assertTrue(exception.getMessage()
+            .contains("Cannot deserialize value of type `java.lang.String` from Object value (token `JsonToken.START_OBJECT`)"));
+    }
+
+    @Test
+    public void givenJsonObject_whenDeserializingIntoObject_thenDeserialize() throws IOException {
+        final String json = "{\"firstName\":\"Azhrioun\",\"lastName\":\"Abderrahim\",\"contact\":{\"email\":\"azh@email.com\"}}";
+        final ObjectMapper mapper = new ObjectMapper();
+
+        PersonContact person = mapper.reader()
+            .forType(PersonContact.class)
+            .readValue(json);
+
+        assertEquals("azh@email.com", person.getContact()
+            .getEmail());
+    }
+
     @Test
     public void givenDefaultConstructor_whenDeserializing_thenCorrect() throws IOException {
         final String json = "{\"id\":1,\"name\":\"John\"}";
diff --git a/jackson-modules/jackson-exceptions/src/test/java/com/baeldung/mappingexception/JacksonMappingExceptionUnitTest.java b/jackson-modules/jackson-exceptions/src/test/java/com/baeldung/mappingexception/JacksonMappingExceptionUnitTest.java
index df35626828..026fd6719f 100644
--- a/jackson-modules/jackson-exceptions/src/test/java/com/baeldung/mappingexception/JacksonMappingExceptionUnitTest.java
+++ b/jackson-modules/jackson-exceptions/src/test/java/com/baeldung/mappingexception/JacksonMappingExceptionUnitTest.java
@@ -1,34 +1,33 @@
 package com.baeldung.mappingexception;
 
 import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Arrays;
 
-import java.io.IOException;
-import java.util.List;
 import org.junit.Test;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.google.common.collect.Lists;
 
 public class JacksonMappingExceptionUnitTest {
 
     @Test(expected = JsonMappingException.class)
-    public final void givenObjectHasNoAccessors_whenSerializing_thenException() throws JsonParseException, IOException {
+    public void givenObjectHasNoAccessors_whenSerializing_thenException() throws JsonProcessingException {
         final String dtoAsString = new ObjectMapper().writeValueAsString(new MyDtoNoAccessors());
 
         assertThat(dtoAsString, notNullValue());
     }
 
     @Test
-    public final void givenObjectHasNoAccessors_whenSerializingWithPrivateFieldsVisibility_thenNoException() throws JsonParseException, IOException {
+    public void givenObjectHasNoAccessors_whenSerializingWithPrivateFieldsVisibility_thenNoException() throws JsonProcessingException {
         final ObjectMapper objectMapper = new ObjectMapper();
         objectMapper.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
         final String dtoAsString = objectMapper.writeValueAsString(new MyDtoNoAccessors());
@@ -39,7 +38,7 @@ public class JacksonMappingExceptionUnitTest {
     }
 
     @Test
-    public final void givenObjectHasNoAccessorsButHasVisibleFields_whenSerializing_thenNoException() throws JsonParseException, IOException {
+    public void givenObjectHasNoAccessorsButHasVisibleFields_whenSerializing_thenNoException() throws JsonProcessingException {
         final ObjectMapper objectMapper = new ObjectMapper();
         final String dtoAsString = objectMapper.writeValueAsString(new MyDtoNoAccessorsAndFieldVisibility());
 
@@ -48,4 +47,30 @@ public class JacksonMappingExceptionUnitTest {
         assertThat(dtoAsString, containsString("booleanValue"));
     }
 
+    @Test
+    public void givenJsonWithInvalidList_whenDeserializing_thenThrowException() throws JsonProcessingException {
+        final String json = "{\"name\":\"Netherlands\",\"cities\":{\"Amsterdam\", \"Tamassint\"}}";
+        final ObjectMapper mapper = new ObjectMapper();
+
+        Exception exception = assertThrows(JsonMappingException.class, () -> mapper.reader()
+            .forType(Country.class)
+            .readValue(json));
+
+        assertTrue(exception.getMessage()
+            .contains("Cannot deserialize value of type `java.util.ArrayList<java.lang.String>`"));
+    }
+
+    @Test
+    public void givenJsonWithValidList_whenDeserializing_thenCorrect() throws JsonProcessingException {
+        final String json = "{\"name\":\"Netherlands\",\"cities\":[\"Amsterdam\", \"Tamassint\"]}";
+        final ObjectMapper mapper = new ObjectMapper();
+
+        Country country = mapper.reader()
+            .forType(Country.class)
+            .readValue(json);
+
+        assertEquals("Netherlands", country.getName());
+        assertEquals(Arrays.asList("Amsterdam", "Tamassint"), country.getCities());
+    }
+
 }
diff --git a/jackson-modules/pom.xml b/jackson-modules/pom.xml
index 4163d1912f..531d5628f7 100644
--- a/jackson-modules/pom.xml
+++ b/jackson-modules/pom.xml
@@ -24,11 +24,6 @@
     </modules>
 
     <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
         <!--jackson for xml -->
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
diff --git a/jackson-simple/pom.xml b/jackson-simple/pom.xml
index f71cb1ffbf..d1fcc867cf 100644
--- a/jackson-simple/pom.xml
+++ b/jackson-simple/pom.xml
@@ -4,7 +4,6 @@
     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>jackson-simple</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>jackson-simple</name>
 
     <parent>
@@ -33,4 +32,8 @@
         </resources>
     </build>
 
+    <properties>
+        <jackson.version>2.14.2</jackson.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithInclude.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithInclude.java
new file mode 100644
index 0000000000..18130fc9f2
--- /dev/null
+++ b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithInclude.java
@@ -0,0 +1,18 @@
+package com.baeldung.jackson.annotation;
+
+import com.fasterxml.jackson.annotation.JsonIncludeProperties;
+
+@JsonIncludeProperties({ "name" })
+public class BeanWithInclude {
+    public int id;
+    public String name;
+
+    public BeanWithInclude() {
+
+    }
+
+    public BeanWithInclude(final int id, final String name) {
+        this.id = id;
+        this.name = name;
+    }
+}
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/GeneralBean.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/GeneralBean.java
new file mode 100644
index 0000000000..a8333f54ae
--- /dev/null
+++ b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/GeneralBean.java
@@ -0,0 +1,26 @@
+package com.baeldung.jackson.annotation;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public class GeneralBean {
+    Integer id;
+
+    @JsonValue
+    String name;
+
+    public GeneralBean() {
+    }
+
+    public GeneralBean(Integer id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/PriorityEnum.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/PriorityEnum.java
new file mode 100644
index 0000000000..ed74052ede
--- /dev/null
+++ b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/PriorityEnum.java
@@ -0,0 +1,16 @@
+package com.baeldung.jackson.annotation;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum PriorityEnum {
+
+    LOW(0), MEDIUM(1), HIGH(3);
+
+    @JsonValue
+    private int level;
+
+    PriorityEnum(int level) {
+        this.level = level;
+    }
+
+}
diff --git a/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/withEnum/TypeEnumWithValue.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/withEnum/TypeEnumWithValue.java
new file mode 100644
index 0000000000..2c8718dfd8
--- /dev/null
+++ b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/withEnum/TypeEnumWithValue.java
@@ -0,0 +1,23 @@
+package com.baeldung.jackson.annotation.dtos.withEnum;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum TypeEnumWithValue {
+    TYPE1(1, "Type A"), TYPE2(2, "Type 2");
+
+    private Integer id;
+
+    @JsonValue
+    private String name;
+
+
+    TypeEnumWithValue(int id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    //@JsonValue
+    public String getName() {
+        return name;
+    }
+}
diff --git a/jackson-simple/src/test/java/com/baeldung/jackson/annotation/JacksonAnnotationUnitTest.java b/jackson-simple/src/test/java/com/baeldung/jackson/annotation/JacksonAnnotationUnitTest.java
index bbbb79b0a8..1a6c7b1286 100644
--- a/jackson-simple/src/test/java/com/baeldung/jackson/annotation/JacksonAnnotationUnitTest.java
+++ b/jackson-simple/src/test/java/com/baeldung/jackson/annotation/JacksonAnnotationUnitTest.java
@@ -20,10 +20,12 @@ import com.baeldung.jackson.annotation.bidirection.UserWithIdentity;
 import com.baeldung.jackson.annotation.bidirection.UserWithRef;
 import com.baeldung.jackson.annotation.date.EventWithFormat;
 import com.baeldung.jackson.annotation.date.EventWithSerializer;
+import com.baeldung.jackson.annotation.dtos.withEnum.TypeEnumWithValue;
 import com.baeldung.jackson.annotation.ignore.MyMixInForIgnoreType;
 import com.baeldung.jackson.annotation.dtos.withEnum.DistanceEnumWithValue;
 import com.baeldung.jackson.annotation.exception.UserWithRoot;
 import com.baeldung.jackson.annotation.exception.UserWithRootNamespace;
+import com.baeldung.jackson.annotation.ignore.MyMixInForIgnoreType;
 import com.baeldung.jackson.annotation.jsonview.Item;
 import com.baeldung.jackson.annotation.jsonview.Views;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -95,6 +97,14 @@ public class JacksonAnnotationUnitTest {
         assertThat(enumAsString, is("1609.34"));
     }
 
+
+    @Test
+    public void whenSerializingFieldUsingJsonValue_thenCorrect() throws IOException {
+        final String enumAsString = new ObjectMapper().writeValueAsString(PriorityEnum.HIGH);
+
+        assertEquals("3", enumAsString);
+    }
+
     @Test
     public void whenSerializingUsingJsonSerialize_thenCorrect() throws JsonProcessingException, ParseException {
         final SimpleDateFormat df = new SimpleDateFormat("dd-MM-yyyy hh:mm:ss");
@@ -107,6 +117,19 @@ public class JacksonAnnotationUnitTest {
         assertThat(result, containsString(toParse));
     }
 
+    @Test
+    public void whenSerializingUsingJsonValueAnnotatedField_thenCorrect() throws JsonProcessingException {
+        final String enumValue = new ObjectMapper().writeValueAsString(TypeEnumWithValue.TYPE1);
+        assertThat(enumValue, is("\"Type A\""));
+    }
+
+    @Test
+    public void whenSerializingUsingJsonValueAnnotatedFieldInPojo_thenCorrect() throws JsonProcessingException {
+        GeneralBean bean1 = new GeneralBean(1, "Bean 1");
+        final String bean1AsString = new ObjectMapper().writeValueAsString(bean1);
+        assertThat(bean1AsString, is("\"Bean 1\""));
+    }
+
     // ========================= Deserializing annotations ============================
 
     @Test
@@ -118,6 +141,7 @@ public class JacksonAnnotationUnitTest {
         assertEquals("My bean", bean.name);
     }
 
+
     @Test
     public void whenDeserializingUsingJsonInject_thenCorrect() throws IOException {
         final String json = "{\"name\":\"My bean\"}";
@@ -161,6 +185,23 @@ public class JacksonAnnotationUnitTest {
         assertEquals("20-12-2014 02:30:00", df.format(event.eventDate));
     }
 
+    @Test
+    public void whenDeserializingUsingJsonValue_thenCorrect() throws JsonProcessingException {
+        final String str = "\"Type A\"";
+        TypeEnumWithValue te = new ObjectMapper().readerFor(TypeEnumWithValue.class)
+            .readValue(str);
+        assertThat(te, is(TypeEnumWithValue.TYPE1));
+    }
+
+    @Test(expected = Exception.class)
+    public void whenDeserializingUsingJsonValueAnnotatedFieldInPojo_thenGetException() throws JsonProcessingException {
+        GeneralBean bean1 = new GeneralBean(1, "Bean 1");
+        final String bean1AsString = new ObjectMapper().writeValueAsString(bean1);
+        GeneralBean bean = new ObjectMapper().readerFor(GeneralBean.class)
+            .readValue(bean1AsString);
+        assertThat(bean.getName(), is(bean1.getName()));
+    }
+
     // ========================= Inclusion annotations ============================
 
     @Test
@@ -172,6 +213,15 @@ public class JacksonAnnotationUnitTest {
         assertThat(result, not(containsString("id")));
     }
 
+    @Test
+    public void whenSerializingUsingJsonIncludeProperties_thenCorrect() throws JsonProcessingException {
+        final BeanWithInclude bean = new BeanWithInclude(1, "My bean");
+        final String result = new ObjectMapper().writeValueAsString(bean);
+        assertThat(result, containsString("My bean"));
+        assertThat(result, not(containsString("id")));
+        assertThat(result, containsString("name"));
+    }
+
     @Test
     public void whenSerializingUsingJsonIgnore_thenCorrect() throws JsonProcessingException {
         final BeanWithIgnore bean = new BeanWithIgnore(1, "My bean");
@@ -399,7 +449,5 @@ public class JacksonAnnotationUnitTest {
         */
 
     }
-    
-    
 
 }
diff --git a/java-blockchain/pom.xml b/java-blockchain/pom.xml
index 2279a7ceff..d45d2bf573 100644
--- a/java-blockchain/pom.xml
+++ b/java-blockchain/pom.xml
@@ -5,7 +5,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.blockchain</groupId>
     <artifactId>java-blockchain</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>java-blockchain</name>
     <packaging>jar</packaging>
 
diff --git a/java-jdi/pom.xml b/java-jdi/pom.xml
index a8716de4ee..dded13896f 100644
--- a/java-jdi/pom.xml
+++ b/java-jdi/pom.xml
@@ -4,7 +4,6 @@
     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>java-jdi</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <name>java-jdi</name>
     <packaging>jar</packaging>
 
@@ -16,13 +15,7 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>com.sun</groupId>
-            <artifactId>tools</artifactId>
-            <version>${tools.version}</version>
-            <scope>system</scope>
-            <systemPath>${java.home}/../lib/tools.jar</systemPath>
-        </dependency>
+
     </dependencies>
 
     <build>
@@ -33,10 +26,25 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${maven.compiler.source.version}</source>
+                    <target>${maven.compiler.target.version}</target>
+                    <compilerArgs>
+                        <arg>--add-exports=jdk.jdi/com.sun.jdi=ALL-UNNAMED</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
+
     <properties>
-        <tools.version>1.8</tools.version>
+        <maven.compiler.source.version>17</maven.compiler.source.version>
+        <maven.compiler.target.version>17</maven.compiler.target.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/java-panama/README.md b/java-panama/README.md
new file mode 100644
index 0000000000..9c7d824cad
--- /dev/null
+++ b/java-panama/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Guide to Java Project Panama](https://www.baeldung.com/java-project-panama)
diff --git a/java-panama/pom.xml b/java-panama/pom.xml
new file mode 100644
index 0000000000..7c6b420eeb
--- /dev/null
+++ b/java-panama/pom.xml
@@ -0,0 +1,48 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>${project.model.version}</modelVersion>
+    <groupId>com.baeldung.java.panama</groupId>
+    <artifactId>java-panama</artifactId>
+    <version>${project.version}</version>
+    <name>java-panama</name>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit.jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven.compiler.version}</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <compilerArgs>
+                        <arg>--add-opens=java.base/java.lang.foreign=ALL-UNNAMED</arg>
+                        <arg>--enable-preview</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <project.model.version>4.0.0</project.model.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.version>1.0</project.version>
+        <maven.compiler.source>19</maven.compiler.source>
+        <maven.compiler.target>19</maven.compiler.target>
+        <maven.compiler.version>3.10.1</maven.compiler.version>
+        <junit.jupiter.version>5.9.0</junit.jupiter.version>
+    </properties>
+
+</project>
diff --git a/java-panama/src/main/java/com/baeldung/java/panama/core/Greetings.java b/java-panama/src/main/java/com/baeldung/java/panama/core/Greetings.java
new file mode 100644
index 0000000000..1937bd65e9
--- /dev/null
+++ b/java-panama/src/main/java/com/baeldung/java/panama/core/Greetings.java
@@ -0,0 +1,40 @@
+package com.baeldung.java.panama.core;
+
+import static java.lang.foreign.ValueLayout.ADDRESS;
+import static java.lang.foreign.ValueLayout.JAVA_INT;
+
+import java.lang.foreign.FunctionDescriptor;
+import java.lang.foreign.Linker;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.MemorySession;
+import java.lang.foreign.SymbolLookup;
+import java.lang.invoke.MethodHandle;
+
+public class Greetings {
+
+    public static void main(String[] args) throws Throwable {
+
+        String symbolName = "printf";
+        String greeting = "Hello World from Project Panama Baeldung Article";
+
+        Linker nativeLinker = Linker.nativeLinker();
+        SymbolLookup stdlibLookup = nativeLinker.defaultLookup();
+        SymbolLookup loaderLookup = SymbolLookup.loaderLookup();
+
+        FunctionDescriptor descriptor = FunctionDescriptor.of(JAVA_INT, ADDRESS);
+
+        MethodHandle methodHandle = loaderLookup.lookup(symbolName)
+          .or(() -> stdlibLookup.lookup(symbolName))
+          .map(symbolSegment -> nativeLinker.downcallHandle(symbolSegment, descriptor))
+          .orElse(null);
+
+        if (methodHandle == null) {
+            throw new NoSuchMethodError("Method Handle was not found");
+        }
+
+        try (MemorySession memorySession = MemorySession.openConfined()) {
+            MemorySegment greetingSegment = memorySession.allocateUtf8String(greeting);
+            methodHandle.invoke(greetingSegment);
+        }
+    }
+}
diff --git a/java-panama/src/main/java/com/baeldung/java/panama/core/MemoryAllocation.java b/java-panama/src/main/java/com/baeldung/java/panama/core/MemoryAllocation.java
new file mode 100644
index 0000000000..239b25b69e
--- /dev/null
+++ b/java-panama/src/main/java/com/baeldung/java/panama/core/MemoryAllocation.java
@@ -0,0 +1,23 @@
+package com.baeldung.java.panama.core;
+
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.MemorySession;
+import java.lang.foreign.SegmentAllocator;
+import java.lang.foreign.ValueLayout;
+
+public class MemoryAllocation {
+
+    public static void main(String[] args) throws Throwable {
+
+        try (MemorySession session = MemorySession.openConfined()) {
+            String[] greetingStrings = { "hello", "world", "panama", "baeldung" };
+            SegmentAllocator allocator = SegmentAllocator.implicitAllocator();
+            MemorySegment offHeapSegment = allocator.allocateArray(ValueLayout.ADDRESS, greetingStrings.length);
+            for (int i = 0; i < greetingStrings.length; i++) {
+                // Allocate a string off-heap, then store a pointer to it
+                MemorySegment cString = allocator.allocateUtf8String(greetingStrings[i]);
+                offHeapSegment.setAtIndex(ValueLayout.ADDRESS, i, cString);
+            }
+        }
+    }
+}
diff --git a/java-panama/src/main/java/com/baeldung/java/panama/core/MemoryLayout.java b/java-panama/src/main/java/com/baeldung/java/panama/core/MemoryLayout.java
new file mode 100644
index 0000000000..612997e35e
--- /dev/null
+++ b/java-panama/src/main/java/com/baeldung/java/panama/core/MemoryLayout.java
@@ -0,0 +1,53 @@
+package com.baeldung.java.panama.core;
+
+import static java.lang.foreign.MemoryLayout.sequenceLayout;
+import static java.lang.foreign.MemoryLayout.structLayout;
+import static java.lang.foreign.ValueLayout.JAVA_DOUBLE;
+import static java.lang.foreign.ValueLayout.JAVA_FLOAT;
+import static java.lang.foreign.ValueLayout.PathElement;
+
+import java.lang.foreign.GroupLayout;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.MemorySession;
+import java.lang.foreign.SequenceLayout;
+import java.lang.invoke.VarHandle;
+
+public class MemoryLayout {
+
+    public static void main(String[] args) {
+
+        GroupLayout pointLayout = structLayout(JAVA_DOUBLE.withName("x"), JAVA_DOUBLE.withName("y"));
+
+        SequenceLayout ptsLayout = sequenceLayout(10, pointLayout);
+
+        VarHandle xvarHandle = pointLayout.varHandle(PathElement.groupElement("x"));
+        VarHandle yvarHandle = pointLayout.varHandle(PathElement.groupElement("y"));
+
+        try (MemorySession memorySession = MemorySession.openConfined()) {
+
+            MemorySegment pointSegment = memorySession.allocate(pointLayout);
+            xvarHandle.set(pointSegment, 3d);
+            yvarHandle.set(pointSegment, 4d);
+
+            System.out.println(pointSegment.toString());
+
+        }
+
+    }
+
+    static class ValueLayout {
+
+        public static void main(String[] args) {
+
+            try (MemorySession memorySession = MemorySession.openConfined()) {
+                int byteSize = 5;
+                int index = 3;
+                float value = 6;
+                MemorySegment segment = MemorySegment.allocateNative(byteSize, memorySession);
+                segment.setAtIndex(JAVA_FLOAT, index, value);
+                float result = segment.getAtIndex(JAVA_FLOAT, index);
+                System.out.println("Float value is:" + result);
+            }
+        }
+    }
+}
diff --git a/java-panama/src/main/java/com/baeldung/java/panama/jextract/Greetings.java b/java-panama/src/main/java/com/baeldung/java/panama/jextract/Greetings.java
new file mode 100644
index 0000000000..43b575d52a
--- /dev/null
+++ b/java-panama/src/main/java/com/baeldung/java/panama/jextract/Greetings.java
@@ -0,0 +1,19 @@
+package com.baeldung.java.panama.jextract;
+
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.MemorySession;
+// Generate JExtract bindings before uncommenting
+// import static foreign.c.stdio_h.printf;
+
+public class Greetings {
+
+    public static void main(String[] args) {
+        String greeting = "Hello World from Project Panama Baeldung Article, using JExtract!";
+
+        try (MemorySession memorySession = MemorySession.openConfined()) {
+            MemorySegment greetingSegment = memorySession.allocateUtf8String(greeting);
+            // Generate JExtract bingings before uncommenting
+            //  printf(greetingSegment);
+        }
+    }
+}
diff --git a/java-panama/src/main/resources/hello.c b/java-panama/src/main/resources/hello.c
new file mode 100644
index 0000000000..3f2d3fce6a
--- /dev/null
+++ b/java-panama/src/main/resources/hello.c
@@ -0,0 +1,5 @@
+#include <stdio.h>
+int main() {
+   printf("Hello World from Project Panama Baeldung Article");
+   return 0;
+}
\ No newline at end of file
diff --git a/java-rmi/pom.xml b/java-rmi/pom.xml
index fee5107423..2256883f84 100644
--- a/java-rmi/pom.xml
+++ b/java-rmi/pom.xml
@@ -5,7 +5,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.rmi</groupId>
     <artifactId>java-rmi</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>java-rmi</name>
     <packaging>jar</packaging>
 
diff --git a/java-websocket/pom.xml b/java-websocket/pom.xml
index ffc2b0631e..7c5c006aa9 100644
--- a/java-websocket/pom.xml
+++ b/java-websocket/pom.xml
@@ -4,7 +4,6 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>java-websocket</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>java-websocket</name>
     <packaging>war</packaging>
 
@@ -31,6 +30,7 @@
     <properties>
         <javax.websocket-api.version>1.1</javax.websocket-api.version>
         <gson.version>2.8.0</gson.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/javafx/pom.xml b/javafx/pom.xml
index 9b0b6002a8..69855a9494 100644
--- a/javafx/pom.xml
+++ b/javafx/pom.xml
@@ -12,4 +12,35 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-controls</artifactId>
+            <version>${javafx.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-fxml</artifactId>
+            <version>${javafx.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.openjfx</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>${javafx-maven-plugin.version}</version>
+                <configuration>
+                    <mainClass>Main</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <javafx.version>19</javafx.version>
+        <javafx-maven-plugin.version>0.0.8</javafx-maven-plugin.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/javax-sound/pom.xml b/javax-sound/pom.xml
index dcd08cbcb8..6652022a40 100644
--- a/javax-sound/pom.xml
+++ b/javax-sound/pom.xml
@@ -5,7 +5,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.javax-sound</groupId>
     <artifactId>javax-sound</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>javax-sound</name>
     <packaging>jar</packaging>
 
diff --git a/javax-validation-advanced/pom.xml b/javax-validation-advanced/pom.xml
index 39da166071..7709f37883 100644
--- a/javax-validation-advanced/pom.xml
+++ b/javax-validation-advanced/pom.xml
@@ -4,7 +4,6 @@
     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>javax-validation-advanced</artifactId>
-    <version>0.1-SNAPSHOT</version>
     <name>javax-validation-advanced</name>
 
     <parent>
diff --git a/javaxval-2/README.md b/javaxval-2/README.md
index 52c9b42ac4..0fd5ce163b 100644
--- a/javaxval-2/README.md
+++ b/javaxval-2/README.md
@@ -4,7 +4,6 @@ This module contains articles about Bean Validation.
 
 ### Relevant Articles: 
 - [Method Constraints with Bean Validation 2.0](https://www.baeldung.com/javax-validation-method-constraints)
-- [Difference Between @NotNull, @NotEmpty, and @NotBlank Constraints in Bean Validation](https://www.baeldung.com/java-bean-validation-not-null-empty-blank)
 - [Guide to ParameterMessageInterpolator](https://www.baeldung.com/hibernate-parametermessageinterpolator)
 - [Hibernate Validator Annotation Processor in Depth](https://www.baeldung.com/hibernate-validator-annotation-processor)
 - More articles: [[<-- prev]](../javaxval)
\ No newline at end of file
diff --git a/javaxval/README.md b/javaxval/README.md
index 95d9410fff..b7e19d5794 100644
--- a/javaxval/README.md
+++ b/javaxval/README.md
@@ -10,4 +10,5 @@ This module contains articles about Bean Validation.
 - [Grouping Javax Validation Constraints](https://www.baeldung.com/javax-validation-groups)
 - [Constraint Composition with Bean Validation](https://www.baeldung.com/java-bean-validation-constraint-composition)
 - [Using @NotNull on a Method Parameter](https://www.baeldung.com/java-notnull-method-parameter)
+- [Difference Between @NotNull, @NotEmpty, and @NotBlank Constraints in Bean Validation](https://www.baeldung.com/java-bean-validation-not-null-empty-blank)
 - More articles: [[next -->]](../javaxval-2)
\ No newline at end of file
diff --git a/javaxval/pom.xml b/javaxval/pom.xml
index 1feed71abb..bececb2ea7 100644
--- a/javaxval/pom.xml
+++ b/javaxval/pom.xml
@@ -4,7 +4,6 @@
     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>javaxval</artifactId>
-    <version>0.1-SNAPSHOT</version>
     <name>javaxval</name>
 
     <parent>
@@ -14,26 +13,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.hibernate.validator</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>${hibernate-validator.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.el</artifactId>
-            <version>${javax.el.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${org.springframework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${org.springframework.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
@@ -46,7 +25,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-		
+
     <!-- uncomment in order to enable Hibernate Validator Anotation Processor -->
     <!-- <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> -->
     <!--<version>${maven.compiler.version}</version> <configuration> <source>${maven.compiler.source}</source> -->
@@ -58,11 +37,8 @@
     <!--</plugin> </plugins> </build> -->
 
     <properties>
-        <hibernate-validator.version>6.2.3.Final</hibernate-validator.version>
         <hibernate-validator.ap.version>6.2.0.Final</hibernate-validator.ap.version>
-        <javax.el.version>3.0.0</javax.el.version>
-        <org.springframework.version>5.3.21</org.springframework.version>
-        <spring.boot.version>2.7.1</spring.boot.version>
+        <spring.boot.version>3.0.4</spring.boot.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/beanvalidation/User.java b/javaxval/src/main/java/com/baeldung/javaxval/beanvalidation/User.java
index d583ac51d2..7305b6c201 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/beanvalidation/User.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/beanvalidation/User.java
@@ -4,14 +4,14 @@ import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
 
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Past;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Past;
+import jakarta.validation.constraints.Size;
 
 public class User {
 
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/bigdecimal/Invoice.java b/javaxval/src/main/java/com/baeldung/javaxval/bigdecimal/Invoice.java
index c14a6bd2b1..c946a8df68 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/bigdecimal/Invoice.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/bigdecimal/Invoice.java
@@ -2,8 +2,8 @@ package com.baeldung.javaxval.bigdecimal;
 
 import java.math.BigDecimal;
 
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.Digits;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Digits;
 
 public class Invoice {
 
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/AlphanumericReturnValue.java b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/AlphanumericReturnValue.java
index 6e3408712b..65f6eceb34 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/AlphanumericReturnValue.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/AlphanumericReturnValue.java
@@ -2,12 +2,12 @@ package com.baeldung.javaxval.constraint.composition;
 
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraintvalidation.SupportedValidationTarget;
-import javax.validation.constraintvalidation.ValidationTarget;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraintvalidation.SupportedValidationTarget;
+import jakarta.validation.constraintvalidation.ValidationTarget;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidAlphanumeric.java b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidAlphanumeric.java
index 916b4e36a4..9d4d4995c5 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidAlphanumeric.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidAlphanumeric.java
@@ -11,10 +11,10 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
 import org.hibernate.validator.constraints.Length;
 
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidAlphanumericWithSingleViolation.java b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidAlphanumericWithSingleViolation.java
index edc5b6af3e..31eca29a07 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidAlphanumericWithSingleViolation.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidAlphanumericWithSingleViolation.java
@@ -11,11 +11,11 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import javax.validation.ReportAsSingleViolation;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+import jakarta.validation.ReportAsSingleViolation;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
 import org.hibernate.validator.constraints.Length;
 
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidLengthOrNumericCharacter.java b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidLengthOrNumericCharacter.java
index 444cb4a63a..9f46e1e7b8 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidLengthOrNumericCharacter.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/constraint/composition/ValidLengthOrNumericCharacter.java
@@ -4,9 +4,9 @@ import org.hibernate.validator.constraints.CompositionType;
 import org.hibernate.validator.constraints.ConstraintComposition;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.Pattern;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/container/validation/Customer.java b/javaxval/src/main/java/com/baeldung/javaxval/container/validation/Customer.java
index 03811635ee..c0b23f0ae8 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/container/validation/Customer.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/container/validation/Customer.java
@@ -4,9 +4,9 @@ import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.PositiveOrZero;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.PositiveOrZero;
 
 public class Customer {
 
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/container/validation/CustomerMap.java b/javaxval/src/main/java/com/baeldung/javaxval/container/validation/CustomerMap.java
index 554285fbae..902f04c654 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/container/validation/CustomerMap.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/container/validation/CustomerMap.java
@@ -2,8 +2,8 @@ package com.baeldung.javaxval.container.validation;
 
 import java.util.Map;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotNull;
 
 public class CustomerMap {
 
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/container/validation/valueextractors/ProfileValueExtractor.java b/javaxval/src/main/java/com/baeldung/javaxval/container/validation/valueextractors/ProfileValueExtractor.java
index 03e0c7aac4..a3a21fe88b 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/container/validation/valueextractors/ProfileValueExtractor.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/container/validation/valueextractors/ProfileValueExtractor.java
@@ -1,8 +1,8 @@
 package com.baeldung.javaxval.container.validation.valueextractors;
 
-import javax.validation.valueextraction.ExtractedValue;
-import javax.validation.valueextraction.UnwrapByDefault;
-import javax.validation.valueextraction.ValueExtractor;
+import jakarta.validation.valueextraction.ExtractedValue;
+import jakarta.validation.valueextraction.UnwrapByDefault;
+import jakarta.validation.valueextraction.ValueExtractor;
 
 import com.baeldung.javaxval.container.validation.Profile;
 
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/enums/CustomerTypeSubSetValidator.java b/javaxval/src/main/java/com/baeldung/javaxval/enums/CustomerTypeSubSetValidator.java
index c91f449bad..da86ec6c89 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/enums/CustomerTypeSubSetValidator.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/enums/CustomerTypeSubSetValidator.java
@@ -2,8 +2,8 @@ package com.baeldung.javaxval.enums;
 
 import java.util.Arrays;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 import com.baeldung.javaxval.enums.constraints.CustomerTypeSubset;
 import com.baeldung.javaxval.enums.demo.CustomerType;
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/enums/EnumNamePatternValidator.java b/javaxval/src/main/java/com/baeldung/javaxval/enums/EnumNamePatternValidator.java
index 3d56d40563..5cce8e10e7 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/enums/EnumNamePatternValidator.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/enums/EnumNamePatternValidator.java
@@ -4,8 +4,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 import com.baeldung.javaxval.enums.constraints.EnumNamePattern;
 
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/enums/EnumSubSetValidator.java b/javaxval/src/main/java/com/baeldung/javaxval/enums/EnumSubSetValidator.java
index 04cccb8b0c..a3a92a4f4e 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/enums/EnumSubSetValidator.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/enums/EnumSubSetValidator.java
@@ -3,8 +3,8 @@ package com.baeldung.javaxval.enums;
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 public abstract class EnumSubSetValidator<T extends Annotation, U> implements ConstraintValidator<T, U> {
     private U[] subset;
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/enums/ValueOfEnumValidator.java b/javaxval/src/main/java/com/baeldung/javaxval/enums/ValueOfEnumValidator.java
index 0203d63923..c2f2ecee3b 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/enums/ValueOfEnumValidator.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/enums/ValueOfEnumValidator.java
@@ -4,8 +4,8 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 import com.baeldung.javaxval.enums.constraints.ValueOfEnum;
 
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/CustomerTypeSubset.java b/javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/CustomerTypeSubset.java
index 97c2137f6a..fe03e228f6 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/CustomerTypeSubset.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/CustomerTypeSubset.java
@@ -12,8 +12,8 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import com.baeldung.javaxval.enums.CustomerTypeSubSetValidator;
 import com.baeldung.javaxval.enums.demo.CustomerType;
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/EnumNamePattern.java b/javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/EnumNamePattern.java
index 29fff857c8..4ef1eac9c0 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/EnumNamePattern.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/EnumNamePattern.java
@@ -12,8 +12,8 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import com.baeldung.javaxval.enums.EnumNamePatternValidator;
 
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/ValueOfEnum.java b/javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/ValueOfEnum.java
index 29b44a1793..bbfe6ed5ab 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/ValueOfEnum.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/enums/constraints/ValueOfEnum.java
@@ -12,8 +12,8 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import com.baeldung.javaxval.enums.ValueOfEnumValidator;
 
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/enums/demo/Customer.java b/javaxval/src/main/java/com/baeldung/javaxval/enums/demo/Customer.java
index 15cd9e0da7..db38dd0015 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/enums/demo/Customer.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/enums/demo/Customer.java
@@ -1,6 +1,6 @@
 package com.baeldung.javaxval.enums.demo;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import com.baeldung.javaxval.enums.constraints.CustomerTypeSubset;
 import com.baeldung.javaxval.enums.constraints.EnumNamePattern;
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/application/Application.java b/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/application/Application.java
index 22157f351c..b1c53c5be3 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/application/Application.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/application/Application.java
@@ -1,7 +1,7 @@
 package com.baeldung.javaxval.javabeanconstraints.application;
 
-import javax.validation.Validation;
-import javax.validation.Validator;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
 
 import com.baeldung.javaxval.javabeanconstraints.entities.UserNotBlank;
 
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotBlank.java b/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotBlank.java
index 5542be8c25..1a6c634ed4 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotBlank.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotBlank.java
@@ -1,6 +1,6 @@
 package com.baeldung.javaxval.javabeanconstraints.entities;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 public class UserNotBlank {
 
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotEmpty.java b/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotEmpty.java
index e3dbe27b0e..0e01c41388 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotEmpty.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotEmpty.java
@@ -1,6 +1,6 @@
 package com.baeldung.javaxval.javabeanconstraints.entities;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 
 public class UserNotEmpty {
 
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotNull.java b/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotNull.java
index b3a0f90d36..39164e2f6b 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotNull.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/javabeanconstraints/entities/UserNotNull.java
@@ -1,6 +1,6 @@
 package com.baeldung.javaxval.javabeanconstraints.entities;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 public class UserNotNull {
 
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/validationgroup/CompleteInfo.java b/javaxval/src/main/java/com/baeldung/javaxval/validationgroup/CompleteInfo.java
index 4ecdc3c5f1..22c0b01ddf 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/validationgroup/CompleteInfo.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/validationgroup/CompleteInfo.java
@@ -1,6 +1,6 @@
 package com.baeldung.javaxval.validationgroup;
 
-import javax.validation.GroupSequence;
+import jakarta.validation.GroupSequence;
 
 @GroupSequence({ BasicInfo.class, AdvanceInfo.class })
 public interface CompleteInfo {
diff --git a/javaxval/src/main/java/com/baeldung/javaxval/validationgroup/RegistrationForm.java b/javaxval/src/main/java/com/baeldung/javaxval/validationgroup/RegistrationForm.java
index a30a074556..2f759d633d 100644
--- a/javaxval/src/main/java/com/baeldung/javaxval/validationgroup/RegistrationForm.java
+++ b/javaxval/src/main/java/com/baeldung/javaxval/validationgroup/RegistrationForm.java
@@ -1,7 +1,7 @@
 package com.baeldung.javaxval.validationgroup;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
 
 public class RegistrationForm {
     @NotBlank(groups = BasicInfo.class)
diff --git a/javaxval/src/test/java/com/baeldung/javaxval/beanvalidation/ValidationIntegrationTest.java b/javaxval/src/test/java/com/baeldung/javaxval/beanvalidation/ValidationIntegrationTest.java
index 3e60fa7acd..132dddad5d 100644
--- a/javaxval/src/test/java/com/baeldung/javaxval/beanvalidation/ValidationIntegrationTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/beanvalidation/ValidationIntegrationTest.java
@@ -6,10 +6,10 @@ import java.time.LocalDate;
 import java.util.Collections;
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/javaxval/src/test/java/com/baeldung/javaxval/bigdecimal/InvoiceUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/bigdecimal/InvoiceUnitTest.java
index 801d7966a5..a149a3a6fe 100644
--- a/javaxval/src/test/java/com/baeldung/javaxval/bigdecimal/InvoiceUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/bigdecimal/InvoiceUnitTest.java
@@ -4,9 +4,9 @@ import com.baeldung.javaxval.LocaleAwareUnitTest;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
 import java.math.BigDecimal;
 import java.util.Set;
 
diff --git a/javaxval/src/test/java/com/baeldung/javaxval/constraint/composition/ConstraintCompositionUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/constraint/composition/ConstraintCompositionUnitTest.java
index 6c2b8f801c..918944cd5f 100644
--- a/javaxval/src/test/java/com/baeldung/javaxval/constraint/composition/ConstraintCompositionUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/constraint/composition/ConstraintCompositionUnitTest.java
@@ -5,11 +5,11 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/javaxval/src/test/java/com/baeldung/javaxval/container/validation/ContainerValidationIntegrationTest.java b/javaxval/src/test/java/com/baeldung/javaxval/container/validation/ContainerValidationIntegrationTest.java
index d96b641442..5c50fde7c6 100644
--- a/javaxval/src/test/java/com/baeldung/javaxval/container/validation/ContainerValidationIntegrationTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/container/validation/ContainerValidationIntegrationTest.java
@@ -6,10 +6,10 @@ import java.util.Collections;
 import java.util.OptionalInt;
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 
 import com.baeldung.javaxval.container.validation.valueextractors.ProfileValueExtractor;
 import org.junit.Before;
diff --git a/javaxval/src/test/java/com/baeldung/javaxval/enums/CustomerTypeSubSetValidatorUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/enums/CustomerTypeSubSetValidatorUnitTest.java
index 524f8eec36..7ccd840e8c 100644
--- a/javaxval/src/test/java/com/baeldung/javaxval/enums/CustomerTypeSubSetValidatorUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/enums/CustomerTypeSubSetValidatorUnitTest.java
@@ -4,9 +4,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/javaxval/src/test/java/com/baeldung/javaxval/enums/EnumNamePatternValidatorUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/enums/EnumNamePatternValidatorUnitTest.java
index 805d40ee5e..0556f88832 100644
--- a/javaxval/src/test/java/com/baeldung/javaxval/enums/EnumNamePatternValidatorUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/enums/EnumNamePatternValidatorUnitTest.java
@@ -6,9 +6,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/javaxval/src/test/java/com/baeldung/javaxval/enums/ValueOfEnumValidatorUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/enums/ValueOfEnumValidatorUnitTest.java
index 150da5d83b..c7eb740d86 100644
--- a/javaxval/src/test/java/com/baeldung/javaxval/enums/ValueOfEnumValidatorUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/enums/ValueOfEnumValidatorUnitTest.java
@@ -4,9 +4,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/javaxval/src/test/java/com/baeldung/javaxval/enums/demo/CustomerUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/enums/demo/CustomerUnitTest.java
index 02a49f50fa..c4380f75fa 100644
--- a/javaxval/src/test/java/com/baeldung/javaxval/enums/demo/CustomerUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/enums/demo/CustomerUnitTest.java
@@ -5,9 +5,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 import java.util.Set;
 import java.util.function.Predicate;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/UserNotBlankUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/UserNotBlankUnitTest.java
index 4cb87e8e27..68e48de41d 100644
--- a/javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/UserNotBlankUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/UserNotBlankUnitTest.java
@@ -4,9 +4,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
 
 import com.baeldung.javaxval.javabeanconstraints.entities.UserNotBlank;
 import org.junit.BeforeClass;
diff --git a/javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/UserNotEmptyUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/UserNotEmptyUnitTest.java
index eb76ac260c..bd83d30601 100644
--- a/javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/UserNotEmptyUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/UserNotEmptyUnitTest.java
@@ -4,9 +4,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
 
 import com.baeldung.javaxval.javabeanconstraints.entities.UserNotEmpty;
 import org.junit.BeforeClass;
diff --git a/javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/UserNotNullUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/UserNotNullUnitTest.java
index f0280000de..36874f4f21 100644
--- a/javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/UserNotNullUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/javabeanconstraints/UserNotNullUnitTest.java
@@ -4,9 +4,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
 
 import com.baeldung.javaxval.javabeanconstraints.entities.UserNotNull;
 import org.junit.BeforeClass;
diff --git a/javaxval/src/test/java/com/baeldung/javaxval/validationgroup/RegistrationFormUnitTest.java b/javaxval/src/test/java/com/baeldung/javaxval/validationgroup/RegistrationFormUnitTest.java
index 3333703328..52aadf80b0 100644
--- a/javaxval/src/test/java/com/baeldung/javaxval/validationgroup/RegistrationFormUnitTest.java
+++ b/javaxval/src/test/java/com/baeldung/javaxval/validationgroup/RegistrationFormUnitTest.java
@@ -4,9 +4,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/jaxb/pom.xml b/jaxb/pom.xml
index 183f7f13cb..ac448d2d62 100644
--- a/jaxb/pom.xml
+++ b/jaxb/pom.xml
@@ -4,7 +4,6 @@
     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>jaxb</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>jaxb</name>
 
     <parent>
@@ -25,6 +24,11 @@
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang3.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${jaxb-runtime.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -97,8 +101,9 @@
 
     <properties>
         <!-- maven plugins -->
-        <jaxb2-maven-plugin.version>2.3</jaxb2-maven-plugin.version>
+        <jaxb2-maven-plugin.version>3.1.0</jaxb2-maven-plugin.version>
         <lifecycle-mapping-plugin.version>1.0.0</lifecycle-mapping-plugin.version>
+        <jaxb-runtime.version>4.0.0</jaxb-runtime.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/jaxb/src/main/java/com/baeldung/jaxb/Book.java b/jaxb/src/main/java/com/baeldung/jaxb/Book.java
index b7a5d39ce5..8c78e0f8b0 100644
--- a/jaxb/src/main/java/com/baeldung/jaxb/Book.java
+++ b/jaxb/src/main/java/com/baeldung/jaxb/Book.java
@@ -2,11 +2,11 @@ package com.baeldung.jaxb;
 
 import java.util.Date;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/jaxb/src/main/java/com/baeldung/jaxb/DateAdapter.java b/jaxb/src/main/java/com/baeldung/jaxb/DateAdapter.java
index 6631525619..418f88065f 100644
--- a/jaxb/src/main/java/com/baeldung/jaxb/DateAdapter.java
+++ b/jaxb/src/main/java/com/baeldung/jaxb/DateAdapter.java
@@ -4,7 +4,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 public class DateAdapter extends XmlAdapter<String, Date> {
 
diff --git a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/Book.java b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/Book.java
index 0625c58344..c61220dd55 100644
--- a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/Book.java
+++ b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/Book.java
@@ -1,9 +1,11 @@
 package com.baeldung.jaxb.dateunmarshalling;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.datatype.XMLGregorianCalendar;
 
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
+
 @XmlRootElement(name = "book")
 public class Book {
 
diff --git a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/BookDateAdapter.java b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/BookDateAdapter.java
index c882f37a04..4ecc041d35 100644
--- a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/BookDateAdapter.java
+++ b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/BookDateAdapter.java
@@ -1,8 +1,8 @@
 package com.baeldung.jaxb.dateunmarshalling;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.util.Date;
 
 @XmlRootElement(name = "book")
diff --git a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/BookLocalDateTimeAdapter.java b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/BookLocalDateTimeAdapter.java
index 53a780a87a..3d3e988c98 100644
--- a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/BookLocalDateTimeAdapter.java
+++ b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/BookLocalDateTimeAdapter.java
@@ -1,8 +1,8 @@
 package com.baeldung.jaxb.dateunmarshalling;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.time.LocalDateTime;
 
 @XmlRootElement(name = "book")
diff --git a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/DateAdapter.java b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/DateAdapter.java
index 3b0fd0bd26..27484976a4 100644
--- a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/DateAdapter.java
+++ b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/DateAdapter.java
@@ -1,6 +1,6 @@
 package com.baeldung.jaxb.dateunmarshalling;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
diff --git a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/JaxbDateUnmarshalling.java b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/JaxbDateUnmarshalling.java
index 205859b2bf..311156d265 100644
--- a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/JaxbDateUnmarshalling.java
+++ b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/JaxbDateUnmarshalling.java
@@ -1,8 +1,8 @@
 package com.baeldung.jaxb.dateunmarshalling;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import java.io.InputStream;
 
 public class JaxbDateUnmarshalling {
diff --git a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/LocalDateTimeAdapter.java b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/LocalDateTimeAdapter.java
index 7fa224334c..5ace605593 100644
--- a/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/LocalDateTimeAdapter.java
+++ b/jaxb/src/main/java/com/baeldung/jaxb/dateunmarshalling/LocalDateTimeAdapter.java
@@ -1,6 +1,6 @@
 package com.baeldung.jaxb.dateunmarshalling;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
diff --git a/jaxb/src/main/java/com/baeldung/jaxb/gen/ObjectFactory.java b/jaxb/src/main/java/com/baeldung/jaxb/gen/ObjectFactory.java
index 0a3da677ce..132c41dbb3 100644
--- a/jaxb/src/main/java/com/baeldung/jaxb/gen/ObjectFactory.java
+++ b/jaxb/src/main/java/com/baeldung/jaxb/gen/ObjectFactory.java
@@ -1,7 +1,7 @@
 
 package com.baeldung.jaxb.gen;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
diff --git a/jaxb/src/main/java/com/baeldung/jaxb/gen/UserRequest.java b/jaxb/src/main/java/com/baeldung/jaxb/gen/UserRequest.java
index 1c1abc61a6..7ba9064e9e 100644
--- a/jaxb/src/main/java/com/baeldung/jaxb/gen/UserRequest.java
+++ b/jaxb/src/main/java/com/baeldung/jaxb/gen/UserRequest.java
@@ -2,11 +2,11 @@
 package com.baeldung.jaxb.gen;
 
 import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jaxb/src/main/java/com/baeldung/jaxb/gen/UserResponse.java b/jaxb/src/main/java/com/baeldung/jaxb/gen/UserResponse.java
index b80405e4a9..f35b001a68 100644
--- a/jaxb/src/main/java/com/baeldung/jaxb/gen/UserResponse.java
+++ b/jaxb/src/main/java/com/baeldung/jaxb/gen/UserResponse.java
@@ -3,13 +3,13 @@ package com.baeldung.jaxb.gen;
 
 import java.io.Serializable;
 import java.util.Calendar;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.w3._2001.xmlschema.Adapter1;
 
 
diff --git a/jaxb/src/main/java/com/baeldung/jaxb/gen/package-info.java b/jaxb/src/main/java/com/baeldung/jaxb/gen/package-info.java
index 639d00179c..1818dc82fe 100644
--- a/jaxb/src/main/java/com/baeldung/jaxb/gen/package-info.java
+++ b/jaxb/src/main/java/com/baeldung/jaxb/gen/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.baeldung.com/jaxb/gen", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.baeldung.com/jaxb/gen", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package com.baeldung.jaxb.gen;
diff --git a/jaxb/src/main/java/org/w3/_2001/xmlschema/Adapter1.java b/jaxb/src/main/java/org/w3/_2001/xmlschema/Adapter1.java
index 54b3c360dc..1607fa7dce 100644
--- a/jaxb/src/main/java/org/w3/_2001/xmlschema/Adapter1.java
+++ b/jaxb/src/main/java/org/w3/_2001/xmlschema/Adapter1.java
@@ -2,7 +2,7 @@
 package org.w3._2001.xmlschema;
 
 import java.util.Calendar;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 public class Adapter1
     extends XmlAdapter<String, Calendar>
@@ -10,14 +10,14 @@ public class Adapter1
 
 
     public Calendar unmarshal(String value) {
-        return (javax.xml.bind.DatatypeConverter.parseDateTime(value));
+        return (jakarta.xml.bind.DatatypeConverter.parseDateTime(value));
     }
 
     public String marshal(Calendar value) {
         if (value == null) {
             return null;
         }
-        return (javax.xml.bind.DatatypeConverter.printDateTime(value));
+        return (jakarta.xml.bind.DatatypeConverter.printDateTime(value));
     }
 
 }
diff --git a/jaxb/src/main/resources/global.xjb b/jaxb/src/main/resources/global.xjb
index de9dcf1577..3cda00b31a 100644
--- a/jaxb/src/main/resources/global.xjb
+++ b/jaxb/src/main/resources/global.xjb
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<jaxb:bindings version="2.0" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<jaxb:bindings version="3.0" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
     xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" xmlns:xs="http://www.w3.org/2001/XMLSchema"
     jaxb:extensionBindingPrefixes="xjc">
 
@@ -7,7 +7,7 @@
         <xjc:simple />
         <xjc:serializable uid="-1" />
         <jaxb:javaType name="java.util.Calendar" xmlType="xs:dateTime"
-            parseMethod="javax.xml.bind.DatatypeConverter.parseDateTime"
-            printMethod="javax.xml.bind.DatatypeConverter.printDateTime" />
+            parseMethod="jakarta.xml.bind.DatatypeConverter.parseDateTime"
+            printMethod="jakarta.xml.bind.DatatypeConverter.printDateTime" />
     </jaxb:globalBindings>
 </jaxb:bindings>
\ No newline at end of file
diff --git a/jaxb/src/test/java/com/baeldung/jaxb/dateunmarshalling/JaxbDateUnmarshallingUnitTest.java b/jaxb/src/test/java/com/baeldung/jaxb/dateunmarshalling/JaxbDateUnmarshallingUnitTest.java
index 298034be3d..7862a8194f 100644
--- a/jaxb/src/test/java/com/baeldung/jaxb/dateunmarshalling/JaxbDateUnmarshallingUnitTest.java
+++ b/jaxb/src/test/java/com/baeldung/jaxb/dateunmarshalling/JaxbDateUnmarshallingUnitTest.java
@@ -2,7 +2,7 @@ package com.baeldung.jaxb.dateunmarshalling;
 
 import org.junit.Test;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
diff --git a/jaxb/src/test/java/com/baeldung/jaxb/test/JaxbIntegrationTest.java b/jaxb/src/test/java/com/baeldung/jaxb/test/JaxbIntegrationTest.java
index 77b7f1a0b3..9117bb621e 100644
--- a/jaxb/src/test/java/com/baeldung/jaxb/test/JaxbIntegrationTest.java
+++ b/jaxb/src/test/java/com/baeldung/jaxb/test/JaxbIntegrationTest.java
@@ -6,10 +6,10 @@ import java.io.IOException;
 import java.util.Date;
 import java.util.TimeZone;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.Assert;
@@ -48,7 +48,7 @@ public class JaxbIntegrationTest {
     }
 
     @Test
-    public void unMashal() throws JAXBException, IOException {
+    public void unmarshal() throws JAXBException, IOException {
         Unmarshaller unmarshaller = context.createUnmarshaller();
         String bookFile = this.getClass().getResource("/book.xml").getFile();
         Book unMarshallerbook = (Book) unmarshaller.unmarshal(new FileReader(bookFile));
diff --git a/jenkins-modules/jenkins-jobs/README.md b/jenkins-modules/jenkins-jobs/README.md
index d29a25244f..e6de0d57e0 100644
--- a/jenkins-modules/jenkins-jobs/README.md
+++ b/jenkins-modules/jenkins-jobs/README.md
@@ -3,3 +3,5 @@
 - [Fixing the “No Such DSL method” Error in Jenkins Pipeline](https://www.baeldung.com/ops/jenkins-pipeline-no-such-dsl-method-error)
 - [Jenkins Pipeline – Change to Another Folder](https://www.baeldung.com/ops/jenkins-pipeline-change-to-another-folder)
 - [How to Stop a Zombie Job on Jenkins Without Restarting the Server?](https://www.baeldung.com/ops/stop-zombie-job-on-jenkins-without-restarting-the-server)
+- [Running Stages in Parallel With Jenkins Workflow / Pipeline](https://www.baeldung.com/ops/running-stages-in-parallel-jenkins-workflow-pipeline)
+- [Skip a Stage in a Jenkins Pipeline](https://www.baeldung.com/ops/jenkins-pipeline-skip-stage)
diff --git a/jenkins-modules/jenkins-jobs/output-job/pipeline-command-substitution-job b/jenkins-modules/jenkins-jobs/output-job/pipeline-command-substitution-job
new file mode 100644
index 0000000000..acaacfa867
--- /dev/null
+++ b/jenkins-modules/jenkins-jobs/output-job/pipeline-command-substitution-job
@@ -0,0 +1,13 @@
+pipeline {
+    agent any
+    stages {
+        stage('Example') {
+            steps {
+                script {
+                    def output = sh(script: "echo \$(ls)", returnStdout: true)
+                    echo "Output: ${output}"
+                }
+            }
+        }
+    }
+}
diff --git a/jenkins-modules/jenkins-jobs/output-job/pipeline-returnstatus-job b/jenkins-modules/jenkins-jobs/output-job/pipeline-returnstatus-job
new file mode 100644
index 0000000000..1b1dc7d315
--- /dev/null
+++ b/jenkins-modules/jenkins-jobs/output-job/pipeline-returnstatus-job
@@ -0,0 +1,17 @@
+pipeline {
+    agent any
+    stages {
+        stage('Example') {
+            steps {
+                script {
+                    def status = sh(returnStatus: true, script: 'ls /test')
+                    if (status != 0) {
+                        echo "Error: Command exited with status ${status}"
+                    } else {
+                        echo "Command executed successfully"
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/jenkins-modules/jenkins-jobs/output-job/pipeline-returnstdout-job b/jenkins-modules/jenkins-jobs/output-job/pipeline-returnstdout-job
new file mode 100644
index 0000000000..ad00b30d92
--- /dev/null
+++ b/jenkins-modules/jenkins-jobs/output-job/pipeline-returnstdout-job
@@ -0,0 +1,13 @@
+pipeline {
+    agent any
+    stages {
+        stage('Example') {
+            steps {
+                script {
+                    def output = sh(returnStdout: true, script: 'pwd')
+                    echo "Output: ${output}"
+                }
+            }
+        }
+    }
+}
diff --git a/jenkins-modules/jenkins-jobs/output-job/pipeline-returnstdouttrim-job b/jenkins-modules/jenkins-jobs/output-job/pipeline-returnstdouttrim-job
new file mode 100644
index 0000000000..d253173934
--- /dev/null
+++ b/jenkins-modules/jenkins-jobs/output-job/pipeline-returnstdouttrim-job
@@ -0,0 +1,13 @@
+pipeline {
+    agent any
+    stages {
+        stage('Example') {
+            steps {
+                script {
+                  def output = sh(returnStdout: true, returnStdoutTrim: true, script: 'echo "    hello    "')
+                    echo "Output: '${output}'"
+                }
+            }
+        }
+    }
+}
diff --git a/jenkins-modules/jenkins-jobs/parallel-stage-job/pipeline-parallel-job b/jenkins-modules/jenkins-jobs/parallel-stage-job/pipeline-parallel-job
new file mode 100644
index 0000000000..c44d61d099
--- /dev/null
+++ b/jenkins-modules/jenkins-jobs/parallel-stage-job/pipeline-parallel-job
@@ -0,0 +1,34 @@
+pipeline {
+    agent any
+    stages {
+        stage('Build') {
+            steps {
+                sh 'echo "Building the application"'
+                // Add commands to build application
+            }
+        }
+        stage('Test') {
+            parallel {
+                stage('Unit Tests') {
+                    steps {
+                        sh 'sleep 5s'
+                        sh 'echo "Running unit tests"'
+                        // Add commands to run unit tests
+                    }
+                }
+                stage('Integration Tests') {
+                    steps {
+                        sh 'echo "Running integration tests"'
+                        // Add commands to run integration tests
+                    }
+                }
+            }
+        }
+        stage('Deploy') {
+            steps {
+                sh 'echo "Deploying the application"'
+                // Add commands to deploy application
+            }
+        }
+    }
+}
diff --git a/jenkins-modules/jenkins-jobs/skip-stage-job/skip-function-script b/jenkins-modules/jenkins-jobs/skip-stage-job/skip-function-script
new file mode 100644
index 0000000000..62163d6301
--- /dev/null
+++ b/jenkins-modules/jenkins-jobs/skip-stage-job/skip-function-script
@@ -0,0 +1,32 @@
+pipeline {
+    agent any
+    parameters {
+        booleanParam(name: 'skip_test', defaultValue: false, description: 'Set to true to skip the test stage')
+    }
+    stages {
+        stage('Build') {
+            steps {
+                sh 'echo "Building the application"'
+            }
+        }
+        stage('Test') {
+            steps {
+                execute_stage('Test', params.skip_test)
+            }
+        }
+        stage('Deploy') {
+            steps {
+                sh 'echo "Deploying the application"'
+            }
+        }
+    }
+}
+
+def execute_stage(stage_name, skip) {
+    stage(stage_name) {
+        if(skip) {
+            echo "Skipping ${stage_name} stage"
+            return
+        }
+        // Add steps to test the application
+    }
diff --git a/jenkins-modules/jenkins-jobs/skip-stage-job/skip-input-script b/jenkins-modules/jenkins-jobs/skip-stage-job/skip-input-script
new file mode 100644
index 0000000000..ba5560578a
--- /dev/null
+++ b/jenkins-modules/jenkins-jobs/skip-stage-job/skip-input-script
@@ -0,0 +1,29 @@
+pipeline {
+    agent any
+    stages {
+        stage('Build') {
+            steps {
+                sh 'echo "Building the application"'
+                // Add steps to build the application
+            }
+        }
+        stage('Test') {
+            steps {
+                input message: 'Do you want to skip the test stage?', ok: 'Yes', parameters: [booleanParam(name: 'skip_test', defaultValue: false)], timeout: time(minutes: 5))
+                script {
+                    if(params.skip_test) {
+                        sh 'echo "Testing the application"'
+                        return
+                    }
+                }
+                // Add steps to test the application
+            }
+        }
+        stage('Deploy') {
+            steps {
+                sh 'echo "Deploying the application"'
+                // Add steps to deploy the application
+            }
+        }
+    }
+}
diff --git a/jenkins-modules/jenkins-jobs/skip-stage-job/skip-when-script b/jenkins-modules/jenkins-jobs/skip-stage-job/skip-when-script
new file mode 100644
index 0000000000..0b62a819e1
--- /dev/null
+++ b/jenkins-modules/jenkins-jobs/skip-stage-job/skip-when-script
@@ -0,0 +1,27 @@
+pipeline {
+    agent any
+    parameters {
+        booleanParam(name: 'skip_test', defaultValue: false, description: 'Set to true to skip the test stage')
+    }
+    stages {
+        stage('Build') {
+            steps {
+                sh 'echo "Building application"'
+                // Add build steps here
+            }
+        }
+        stage('Test') {
+            when { expression { params.skip_test != true } }
+            steps {
+                sh 'echo "Testing application"'
+                // Add test steps here
+            }
+        }
+        stage('Deploy') {
+            steps {
+                sh 'echo "Deploying application"'
+                // Add deployment steps here
+            }
+        }
+    }
+}
diff --git a/jenkins-modules/plugins/pom.xml b/jenkins-modules/plugins/pom.xml
index 7f88382e22..42add1664e 100644
--- a/jenkins-modules/plugins/pom.xml
+++ b/jenkins-modules/plugins/pom.xml
@@ -4,7 +4,6 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>plugins</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>plugins</name>
     <packaging>hpi</packaging>
     <description>A sample Jenkins Hello World plugin</description>
diff --git a/jersey/pom.xml b/jersey/pom.xml
index 7c7330d84f..005fa85077 100644
--- a/jersey/pom.xml
+++ b/jersey/pom.xml
@@ -4,7 +4,6 @@
     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>jersey</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>jersey</name>
     <packaging>war</packaging>
 
@@ -100,7 +99,8 @@
     </build>
 
     <properties>
-        <jersey.version>2.38</jersey.version>
+        <jersey.version>3.1.1</jersey.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/jersey/src/main/java/com/baeldung/jersey/client/JerseyClient.java b/jersey/src/main/java/com/baeldung/jersey/client/JerseyClient.java
index 88ad891411..3865e64aa0 100644
--- a/jersey/src/main/java/com/baeldung/jersey/client/JerseyClient.java
+++ b/jersey/src/main/java/com/baeldung/jersey/client/JerseyClient.java
@@ -1,19 +1,20 @@
 package com.baeldung.jersey.client;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.Response;
-
 import org.glassfish.jersey.client.ClientConfig;
 
 import com.baeldung.jersey.client.filter.RequestClientFilter;
 import com.baeldung.jersey.client.filter.ResponseClientFilter;
 import com.baeldung.jersey.client.interceptor.RequestClientWriterInterceptor;
+import com.baeldung.jersey.server.Greetings;
+
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.Response;
 
 public class JerseyClient {
 
-    private static final String URI_GREETINGS = "http://localhost:8080/jersey/greetings";
+    public static final String URI_GREETINGS = "http://localhost:8080/jersey/greetings";
 
     public static String getHelloGreeting() {
         return createClient().target(URI_GREETINGS)
@@ -38,6 +39,7 @@ public class JerseyClient {
         config.register(RequestClientFilter.class);
         config.register(ResponseClientFilter.class);
         config.register(RequestClientWriterInterceptor.class);
+        config.register(Greetings.class);
 
         return ClientBuilder.newClient(config);
     }
diff --git a/jersey/src/main/java/com/baeldung/jersey/client/JerseyClientHeaders.java b/jersey/src/main/java/com/baeldung/jersey/client/JerseyClientHeaders.java
index 29db298e9e..f0d62111aa 100644
--- a/jersey/src/main/java/com/baeldung/jersey/client/JerseyClientHeaders.java
+++ b/jersey/src/main/java/com/baeldung/jersey/client/JerseyClientHeaders.java
@@ -9,17 +9,17 @@ import org.glassfish.jersey.client.oauth1.ConsumerCredentials;
 import org.glassfish.jersey.client.oauth1.OAuth1ClientSupport;
 import org.glassfish.jersey.client.oauth2.OAuth2ClientSupport;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Feature;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.sse.InboundSseEvent;
-import javax.ws.rs.sse.SseEventSource;
-
 import static org.glassfish.jersey.client.authentication.HttpAuthenticationFeature.*;
 
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.Feature;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.sse.InboundSseEvent;
+import jakarta.ws.rs.sse.SseEventSource;
+
 public class JerseyClientHeaders {
 
     private static final String BEARER_CONSUMER_SECRET = "my-consumer-secret";
diff --git a/jersey/src/main/java/com/baeldung/jersey/client/filter/AddHeaderOnRequestFilter.java b/jersey/src/main/java/com/baeldung/jersey/client/filter/AddHeaderOnRequestFilter.java
index a874928c16..61f2dfe475 100644
--- a/jersey/src/main/java/com/baeldung/jersey/client/filter/AddHeaderOnRequestFilter.java
+++ b/jersey/src/main/java/com/baeldung/jersey/client/filter/AddHeaderOnRequestFilter.java
@@ -1,9 +1,10 @@
 package com.baeldung.jersey.client.filter;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
 import java.io.IOException;
 
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientRequestFilter;
+
 public class AddHeaderOnRequestFilter implements ClientRequestFilter {
 
     public static final String FILTER_HEADER_VALUE = "filter-header-value";
diff --git a/jersey/src/main/java/com/baeldung/jersey/client/filter/RequestClientFilter.java b/jersey/src/main/java/com/baeldung/jersey/client/filter/RequestClientFilter.java
index 8c6ac2c5fb..5d7d8be684 100644
--- a/jersey/src/main/java/com/baeldung/jersey/client/filter/RequestClientFilter.java
+++ b/jersey/src/main/java/com/baeldung/jersey/client/filter/RequestClientFilter.java
@@ -2,13 +2,13 @@ package com.baeldung.jersey.client.filter;
 
 import java.io.IOException;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.ext.Provider;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientRequestFilter;
+import jakarta.ws.rs.ext.Provider;
+
 @Provider
 public class RequestClientFilter implements ClientRequestFilter {
 
diff --git a/jersey/src/main/java/com/baeldung/jersey/client/filter/ResponseClientFilter.java b/jersey/src/main/java/com/baeldung/jersey/client/filter/ResponseClientFilter.java
index 1676fa2094..4348937364 100644
--- a/jersey/src/main/java/com/baeldung/jersey/client/filter/ResponseClientFilter.java
+++ b/jersey/src/main/java/com/baeldung/jersey/client/filter/ResponseClientFilter.java
@@ -2,14 +2,14 @@ package com.baeldung.jersey.client.filter;
 
 import java.io.IOException;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientResponseContext;
-import javax.ws.rs.client.ClientResponseFilter;
-import javax.ws.rs.ext.Provider;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientResponseContext;
+import jakarta.ws.rs.client.ClientResponseFilter;
+import jakarta.ws.rs.ext.Provider;
+
 @Provider
 public class ResponseClientFilter implements ClientResponseFilter {
 
diff --git a/jersey/src/main/java/com/baeldung/jersey/client/interceptor/RequestClientWriterInterceptor.java b/jersey/src/main/java/com/baeldung/jersey/client/interceptor/RequestClientWriterInterceptor.java
index 7216cf18cc..3f55f56ec2 100644
--- a/jersey/src/main/java/com/baeldung/jersey/client/interceptor/RequestClientWriterInterceptor.java
+++ b/jersey/src/main/java/com/baeldung/jersey/client/interceptor/RequestClientWriterInterceptor.java
@@ -2,14 +2,14 @@ package com.baeldung.jersey.client.interceptor;
 
 import java.io.IOException;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.ext.Provider;
-import javax.ws.rs.ext.WriterInterceptor;
-import javax.ws.rs.ext.WriterInterceptorContext;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.WriterInterceptor;
+import jakarta.ws.rs.ext.WriterInterceptorContext;
+
 @Provider
 public class RequestClientWriterInterceptor implements WriterInterceptor {
 
diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/ExceptionHandlingConfig.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/ExceptionHandlingConfig.java
index d4cc1a81a1..efe3b6877e 100644
--- a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/ExceptionHandlingConfig.java
+++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/ExceptionHandlingConfig.java
@@ -1,12 +1,12 @@
 package com.baeldung.jersey.exceptionhandling;
 
-import javax.ws.rs.ApplicationPath;
-
 import org.glassfish.jersey.server.ResourceConfig;
 
 import com.baeldung.jersey.exceptionhandling.rest.exceptions.IllegalArgumentExceptionMapper;
 import com.baeldung.jersey.exceptionhandling.rest.exceptions.ServerExceptionMapper;
 
+import jakarta.ws.rs.ApplicationPath;
+
 @ApplicationPath("/exception-handling/*")
 public class ExceptionHandlingConfig extends ResourceConfig {
 
diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/StocksResource.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/StocksResource.java
index 64b645a1c6..de21440049 100644
--- a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/StocksResource.java
+++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/StocksResource.java
@@ -2,19 +2,19 @@ package com.baeldung.jersey.exceptionhandling.rest;
 
 import java.util.Optional;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
 import com.baeldung.jersey.exceptionhandling.data.Stock;
 import com.baeldung.jersey.exceptionhandling.repo.Db;
 import com.baeldung.jersey.exceptionhandling.service.Repository;
 
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
 @Path("/stocks")
 public class StocksResource {
     private static final Db<Stock> stocks = Repository.STOCKS_DB;
diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/WalletsResource.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/WalletsResource.java
index e5f8ddec06..667f721e4a 100644
--- a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/WalletsResource.java
+++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/WalletsResource.java
@@ -2,18 +2,6 @@ package com.baeldung.jersey.exceptionhandling.rest;
 
 import java.util.Optional;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
 import com.baeldung.jersey.exceptionhandling.data.Stock;
 import com.baeldung.jersey.exceptionhandling.data.Wallet;
 import com.baeldung.jersey.exceptionhandling.repo.Db;
@@ -21,6 +9,17 @@ import com.baeldung.jersey.exceptionhandling.rest.exceptions.InvalidTradeExcepti
 import com.baeldung.jersey.exceptionhandling.rest.exceptions.RestErrorResponse;
 import com.baeldung.jersey.exceptionhandling.service.Repository;
 
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
 @Path("/wallets")
 public class WalletsResource {
     private static final Db<Stock> stocks = Repository.STOCKS_DB;
@@ -84,7 +83,7 @@ public class WalletsResource {
             RestErrorResponse response = new RestErrorResponse();
             response.setSubject(wallet);
             response.setMessage("insufficient balance");
-            throw new WebApplicationException(Response.status(Status.NOT_ACCEPTABLE)
+            throw new WebApplicationException(Response.status(Response.Status.NOT_ACCEPTABLE)
                 .entity(response)
                 .build());
         }
diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/IllegalArgumentExceptionMapper.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/IllegalArgumentExceptionMapper.java
index b577121027..fdaeb218c0 100644
--- a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/IllegalArgumentExceptionMapper.java
+++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/IllegalArgumentExceptionMapper.java
@@ -1,8 +1,8 @@
 package com.baeldung.jersey.exceptionhandling.rest.exceptions;
 
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
 
 public class IllegalArgumentExceptionMapper implements ExceptionMapper<IllegalArgumentException> {
     public static final String DEFAULT_MESSAGE = "an illegal argument was provided";
diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/InvalidTradeException.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/InvalidTradeException.java
index 11277c048a..966683dd6a 100644
--- a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/InvalidTradeException.java
+++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/InvalidTradeException.java
@@ -1,7 +1,7 @@
 package com.baeldung.jersey.exceptionhandling.rest.exceptions;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
 
 public class InvalidTradeException extends WebApplicationException {
     private static final long serialVersionUID = 1L;
diff --git a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/ServerExceptionMapper.java b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/ServerExceptionMapper.java
index adfac000e8..f537c1756a 100644
--- a/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/ServerExceptionMapper.java
+++ b/jersey/src/main/java/com/baeldung/jersey/exceptionhandling/rest/exceptions/ServerExceptionMapper.java
@@ -1,19 +1,18 @@
 package com.baeldung.jersey.exceptionhandling.rest.exceptions;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
 
 public class ServerExceptionMapper implements ExceptionMapper<WebApplicationException> {
     public static final String HTTP_405_MESSAGE = "use one of";
 
     @Override
     public Response toResponse(final WebApplicationException exception) {
-        String message = exception.getMessage();
+        String message;
         Response response = exception.getResponse();
-        Status status = response.getStatusInfo()
+        Response.Status status = response.getStatusInfo()
             .toEnum();
 
         switch (status) {
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/EchoHeaders.java b/jersey/src/main/java/com/baeldung/jersey/server/EchoHeaders.java
index a8df3c10a8..b3b03fbb4d 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/EchoHeaders.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/EchoHeaders.java
@@ -2,14 +2,17 @@ package com.baeldung.jersey.server;
 
 import com.baeldung.jersey.client.filter.AddHeaderOnRequestFilter;
 
-import javax.annotation.security.RolesAllowed;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.*;
-import javax.ws.rs.sse.OutboundSseEvent;
-import javax.ws.rs.sse.Sse;
-import javax.ws.rs.sse.SseEventSink;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.sse.OutboundSseEvent;
+import jakarta.ws.rs.sse.Sse;
+import jakarta.ws.rs.sse.SseEventSink;
 
 @Path("/echo-headers")
 public class EchoHeaders {
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/Greetings.java b/jersey/src/main/java/com/baeldung/jersey/server/Greetings.java
index d0ea873db1..e753d34901 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/Greetings.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/Greetings.java
@@ -1,13 +1,12 @@
 package com.baeldung.jersey.server;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
 import com.baeldung.jersey.server.config.HelloBinding;
 
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
+
 @Path("/greetings")
 public class Greetings {
 
@@ -26,7 +25,7 @@ public class Greetings {
     @POST
     @Path("/custom")
     public Response getCustomGreeting(String name) {
-        return Response.status(Status.OK.getStatusCode())
+        return Response.status(Response.Status.OK.getStatusCode())
             .build();
     }
 }
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/ItemParam.java b/jersey/src/main/java/com/baeldung/jersey/server/ItemParam.java
index 0f60a20b92..6c05f5b650 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/ItemParam.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/ItemParam.java
@@ -1,8 +1,8 @@
 package com.baeldung.jersey.server;
 
-import javax.ws.rs.FormParam;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.PathParam;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.PathParam;
 
 public class ItemParam {
 
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/Items.java b/jersey/src/main/java/com/baeldung/jersey/server/Items.java
index c24e6820f5..4aab765351 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/Items.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/Items.java
@@ -1,6 +1,15 @@
 package com.baeldung.jersey.server;
 
-import javax.ws.rs.*;
+import jakarta.ws.rs.BeanParam;
+import jakarta.ws.rs.CookieParam;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.MatrixParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
 
 @Path("items")
 public class Items {
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/Responder.java b/jersey/src/main/java/com/baeldung/jersey/server/Responder.java
index cb0c976fe3..3ce8e65bd0 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/Responder.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/Responder.java
@@ -2,11 +2,11 @@ package com.baeldung.jersey.server;
 
 import com.baeldung.jersey.server.model.Person;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 @Path("/response")
 public class Responder {
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/config/HelloBinding.java b/jersey/src/main/java/com/baeldung/jersey/server/config/HelloBinding.java
index 49b11adeab..f620514094 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/config/HelloBinding.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/config/HelloBinding.java
@@ -3,7 +3,7 @@ package com.baeldung.jersey.server.config;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import javax.ws.rs.NameBinding;
+import jakarta.ws.rs.NameBinding;
 
 @NameBinding
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/config/HelloDynamicBinding.java b/jersey/src/main/java/com/baeldung/jersey/server/config/HelloDynamicBinding.java
index 19c407f80d..89b520bf97 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/config/HelloDynamicBinding.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/config/HelloDynamicBinding.java
@@ -1,13 +1,13 @@
 package com.baeldung.jersey.server.config;
 
-import javax.ws.rs.container.DynamicFeature;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.FeatureContext;
-import javax.ws.rs.ext.Provider;
-
 import com.baeldung.jersey.server.Greetings;
 import com.baeldung.jersey.server.filter.ResponseServerFilter;
 
+import jakarta.ws.rs.container.DynamicFeature;
+import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.FeatureContext;
+import jakarta.ws.rs.ext.Provider;
+
 @Provider
 public class HelloDynamicBinding implements DynamicFeature {
 
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/config/ServerConfig.java b/jersey/src/main/java/com/baeldung/jersey/server/config/ServerConfig.java
index 4670cc291c..c4db7df223 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/config/ServerConfig.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/config/ServerConfig.java
@@ -1,9 +1,9 @@
 package com.baeldung.jersey.server.config;
 
-import javax.ws.rs.ApplicationPath;
-
 import org.glassfish.jersey.server.ResourceConfig;
 
+import jakarta.ws.rs.ApplicationPath;
+
 @ApplicationPath("/*")
 public class ServerConfig extends ResourceConfig {
 
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/constraints/SerialNumber.java b/jersey/src/main/java/com/baeldung/jersey/server/constraints/SerialNumber.java
index ca49797e31..d18375c152 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/constraints/SerialNumber.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/constraints/SerialNumber.java
@@ -4,10 +4,10 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.regex.Pattern;
 
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.Payload;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Constraint(validatedBy = { SerialNumber.Validator.class })
@@ -21,7 +21,7 @@ public @interface SerialNumber {
 
     Class<? extends Payload>[] payload() default {};
 
-    public class Validator implements ConstraintValidator<SerialNumber, String> {
+    class Validator implements ConstraintValidator<SerialNumber, String> {
         @Override
         public void initialize(final SerialNumber serial) {
         }
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/filter/PrematchingRequestFilter.java b/jersey/src/main/java/com/baeldung/jersey/server/filter/PrematchingRequestFilter.java
index 181fa7f043..2c9da1afba 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/filter/PrematchingRequestFilter.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/filter/PrematchingRequestFilter.java
@@ -2,14 +2,15 @@ package com.baeldung.jersey.server.filter;
 
 import java.io.IOException;
 
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.PreMatching;
-import javax.ws.rs.ext.Provider;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.container.PreMatching;
+import jakarta.ws.rs.ext.Provider;
+
 @Provider
 @PreMatching
 public class PrematchingRequestFilter implements ContainerRequestFilter {
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/filter/ResponseServerFilter.java b/jersey/src/main/java/com/baeldung/jersey/server/filter/ResponseServerFilter.java
index de0dcbdce7..3e92b081fe 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/filter/ResponseServerFilter.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/filter/ResponseServerFilter.java
@@ -2,13 +2,13 @@ package com.baeldung.jersey.server.filter;
 
 import java.io.IOException;
 
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+
 public class ResponseServerFilter implements ContainerResponseFilter {
 
     private static final Logger LOG = LoggerFactory.getLogger(ResponseServerFilter.class);
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/filter/RestrictedOperationsRequestFilter.java b/jersey/src/main/java/com/baeldung/jersey/server/filter/RestrictedOperationsRequestFilter.java
index cb0cd185f7..1064b04204 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/filter/RestrictedOperationsRequestFilter.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/filter/RestrictedOperationsRequestFilter.java
@@ -2,18 +2,18 @@ package com.baeldung.jersey.server.filter;
 
 import java.io.IOException;
 
-import javax.annotation.Priority;
-import javax.ws.rs.Priorities;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.baeldung.jersey.server.config.HelloBinding;
 
+import jakarta.annotation.Priority;
+import jakarta.ws.rs.Priorities;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
+
 @Provider
 @Priority(Priorities.AUTHORIZATION)
 @HelloBinding
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/http/EmbeddedHttpServer.java b/jersey/src/main/java/com/baeldung/jersey/server/http/EmbeddedHttpServer.java
index 1d75508c6d..8a696d8f34 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/http/EmbeddedHttpServer.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/http/EmbeddedHttpServer.java
@@ -19,10 +19,7 @@ public class EmbeddedHttpServer {
         try {
             final HttpServer server = GrizzlyHttpServerFactory.createHttpServer(BASE_URI, new ViewApplicationConfig(), false);
 
-            Runtime.getRuntime()
-                .addShutdownHook(new Thread(() -> {
-                    server.shutdownNow();
-                }));
+            Runtime.getRuntime().addShutdownHook(new Thread(server::shutdownNow));
 
             server.start();
 
@@ -34,8 +31,8 @@ public class EmbeddedHttpServer {
 
     }
 
-    public static HttpServer startServer() {
+    public static HttpServer startServer(URI url) {
         final ResourceConfig rc = new ResourceConfig().packages("com.baeldung.jersey.server");
-        return GrizzlyHttpServerFactory.createHttpServer(URI.create(BASE_URI.toString()), rc);
+        return GrizzlyHttpServerFactory.createHttpServer(URI.create(url.toString()), rc);
     }
 }
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/interceptor/RequestServerReaderInterceptor.java b/jersey/src/main/java/com/baeldung/jersey/server/interceptor/RequestServerReaderInterceptor.java
index e9cc57fc2a..9a11c212d7 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/interceptor/RequestServerReaderInterceptor.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/interceptor/RequestServerReaderInterceptor.java
@@ -7,14 +7,14 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.stream.Collectors;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.ext.Provider;
-import javax.ws.rs.ext.ReaderInterceptor;
-import javax.ws.rs.ext.ReaderInterceptorContext;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ReaderInterceptor;
+import jakarta.ws.rs.ext.ReaderInterceptorContext;
+
 @Provider
 public class RequestServerReaderInterceptor implements ReaderInterceptor {
 
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java b/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java
index 1a648290a3..83c96e2784 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/model/Fruit.java
@@ -1,8 +1,8 @@
 package com.baeldung.jersey.server.model;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 public class Fruit {
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/providers/FruitExceptionMapper.java b/jersey/src/main/java/com/baeldung/jersey/server/providers/FruitExceptionMapper.java
index cea61c897b..10e1c6d60c 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/providers/FruitExceptionMapper.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/providers/FruitExceptionMapper.java
@@ -1,9 +1,9 @@
 package com.baeldung.jersey.server.providers;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
 
 public class FruitExceptionMapper implements ExceptionMapper<ConstraintViolationException> {
 
diff --git a/jersey/src/main/java/com/baeldung/jersey/server/rest/FruitResource.java b/jersey/src/main/java/com/baeldung/jersey/server/rest/FruitResource.java
index 88692dcc55..3ee5de8073 100644
--- a/jersey/src/main/java/com/baeldung/jersey/server/rest/FruitResource.java
+++ b/jersey/src/main/java/com/baeldung/jersey/server/rest/FruitResource.java
@@ -5,20 +5,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
 import org.glassfish.jersey.server.mvc.ErrorTemplate;
 import org.glassfish.jersey.server.mvc.Template;
 import org.glassfish.jersey.server.mvc.Viewable;
@@ -27,6 +13,19 @@ import com.baeldung.jersey.server.constraints.SerialNumber;
 import com.baeldung.jersey.server.model.Fruit;
 import com.baeldung.jersey.service.SimpleStorageService;
 
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
 @Path("/fruit")
 public class FruitResource {
 
@@ -66,7 +65,7 @@ public class FruitResource {
     @Path("/create")
     @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
     public void createFruit(
-        @NotNull(message = "Fruit name must not be null") @FormParam("name") String name, 
+        @NotNull(message = "Fruit name must not be null") @FormParam("name") String name,
         @NotNull(message = "Fruit colour must not be null") @FormParam("colour") String colour) {
 
         Fruit fruit = new Fruit(name, colour);
@@ -94,7 +93,7 @@ public class FruitResource {
     @Consumes(MediaType.APPLICATION_JSON)
     public Response createNewFruit(@Valid Fruit fruit) {
         String result = "Fruit saved : " + fruit;
-        return Response.status(Status.CREATED.getStatusCode())
+        return Response.status(Response.Status.CREATED.getStatusCode())
             .entity(result)
             .build();
     }
diff --git a/jersey/src/main/java/com/baeldung/jersey/service/SimpleStorageService.java b/jersey/src/main/java/com/baeldung/jersey/service/SimpleStorageService.java
index e21dd584a1..2c718c9d17 100644
--- a/jersey/src/main/java/com/baeldung/jersey/service/SimpleStorageService.java
+++ b/jersey/src/main/java/com/baeldung/jersey/service/SimpleStorageService.java
@@ -7,7 +7,7 @@ import com.baeldung.jersey.server.model.Fruit;
 
 public class SimpleStorageService {
 
-    private static final Map<String, Fruit> fruits = new HashMap<String, Fruit>();
+    private static final Map<String, Fruit> fruits = new HashMap<>();
 
     public static void storeFruit(final Fruit fruit) {
         fruits.put(fruit.getName(), fruit);
@@ -17,7 +17,7 @@ public class SimpleStorageService {
         return fruits.entrySet()
             .stream()
             .filter(map -> name.equals(map.getKey()))
-            .map(map -> map.getValue())
+            .map(Map.Entry::getValue)
             .findFirst()
             .get();
     }
diff --git a/jersey/src/test/java/com/baeldung/jersey/client/JerseyClientIntegrationTest.java b/jersey/src/test/java/com/baeldung/jersey/client/JerseyClientIntegrationTest.java
index a6fd606e3f..e0166d0331 100644
--- a/jersey/src/test/java/com/baeldung/jersey/client/JerseyClientIntegrationTest.java
+++ b/jersey/src/test/java/com/baeldung/jersey/client/JerseyClientIntegrationTest.java
@@ -1,35 +1,53 @@
 package com.baeldung.jersey.client;
 
-import javax.ws.rs.core.Response;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import java.net.URI;
+
+import org.glassfish.grizzly.http.server.HttpServer;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import com.baeldung.jersey.server.http.EmbeddedHttpServer;
+
+import jakarta.ws.rs.core.Response;
 
-@Ignore
 public class JerseyClientIntegrationTest {
 
     private static int HTTP_OK = 200;
 
+    private static HttpServer httpServer;
+
+    @BeforeAll
+    public static void beforeAllTests() {
+        httpServer = EmbeddedHttpServer.startServer(URI.create("http://localhost:8080/jersey"));
+    }
+
+    @AfterAll
+    public static void afterAllTests() {
+        httpServer.stop();
+    }
+
     @Test
     public void givenGreetingResource_whenCallingHelloGreeting_thenHelloReturned() {
         String response = JerseyClient.getHelloGreeting();
 
-        Assert.assertEquals("hello", response);
+        assertEquals("hello", response);
     }
 
     @Test
     public void givenGreetingResource_whenCallingHiGreeting_thenHiReturned() {
         String response = JerseyClient.getHiGreeting();
 
-        Assert.assertEquals("hi", response);
+        assertEquals("hi", response);
     }
 
     @Test
     public void givenGreetingResource_whenCallingCustomGreeting_thenCustomGreetingReturned() {
         Response response = JerseyClient.getCustomGreeting();
         
-        Assert.assertEquals(HTTP_OK, response.getStatus());
+        assertEquals(HTTP_OK, response.getStatus());
     }
 
 }
diff --git a/jersey/src/test/java/com/baeldung/jersey/exceptionhandling/rest/StocksResourceIntegrationTest.java b/jersey/src/test/java/com/baeldung/jersey/exceptionhandling/rest/StocksResourceIntegrationTest.java
index ceb59adc1f..eff5d5ae6e 100644
--- a/jersey/src/test/java/com/baeldung/jersey/exceptionhandling/rest/StocksResourceIntegrationTest.java
+++ b/jersey/src/test/java/com/baeldung/jersey/exceptionhandling/rest/StocksResourceIntegrationTest.java
@@ -2,31 +2,30 @@ package com.baeldung.jersey.exceptionhandling.rest;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.HashMap;
 
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
+import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.glassfish.jersey.test.TestProperties;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import com.baeldung.jersey.exceptionhandling.ExceptionHandlingConfig;
 import com.baeldung.jersey.exceptionhandling.data.Stock;
 import com.baeldung.jersey.exceptionhandling.data.Wallet;
 import com.baeldung.jersey.exceptionhandling.rest.exceptions.IllegalArgumentExceptionMapper;
 import com.baeldung.jersey.exceptionhandling.rest.exceptions.RestErrorResponse;
 import com.baeldung.jersey.exceptionhandling.rest.exceptions.ServerExceptionMapper;
 
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.core.Application;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
 public class StocksResourceIntegrationTest extends JerseyTest {
     private static final Entity<String> EMPTY_BODY = Entity.json("");
     private static final Stock STOCK = new Stock("BAEL", 51.57);
@@ -36,8 +35,13 @@ public class StocksResourceIntegrationTest extends JerseyTest {
 
     @Override
     protected Application configure() {
-        forceSet(TestProperties.CONTAINER_PORT, "0");
-        return new ExceptionHandlingConfig();
+        final ResourceConfig resourceConfig = new ResourceConfig();
+        resourceConfig.register(StocksResource.class);
+        resourceConfig.register(WalletsResource.class);
+        resourceConfig.register(IllegalArgumentExceptionMapper.class);
+        resourceConfig.register(ServerExceptionMapper.class);
+        resourceConfig.packages("com.baeldung.jersey.exceptionhandling.rest");
+        return resourceConfig;
     }
 
     private Invocation.Builder stocks(String path) {
@@ -56,7 +60,7 @@ public class StocksResourceIntegrationTest extends JerseyTest {
     public void whenMethodNotAllowed_thenCustomMessage() {
         Response response = stocks("").get();
 
-        assertEquals(Status.METHOD_NOT_ALLOWED.getStatusCode(), response.getStatus());
+        assertEquals(Response.Status.METHOD_NOT_ALLOWED.getStatusCode(), response.getStatus());
 
         String content = response.readEntity(String.class);
         assertThat(content, containsString(ServerExceptionMapper.HTTP_405_MESSAGE));
@@ -64,9 +68,9 @@ public class StocksResourceIntegrationTest extends JerseyTest {
 
     @Test
     public void whenTickerNotExists_thenRestErrorResponse() {
-        Response response = stocks("/UNDEFINED").get();
+        Response response = stocks("/TEST").get();
 
-        assertEquals(Status.EXPECTATION_FAILED.getStatusCode(), response.getStatus());
+        assertEquals(Response.Status.EXPECTATION_FAILED.getStatusCode(), response.getStatus());
 
         RestErrorResponse content = response.readEntity(RestErrorResponse.class);
         assertThat(content.getMessage(), startsWith(IllegalArgumentExceptionMapper.DEFAULT_MESSAGE));
@@ -77,7 +81,7 @@ public class StocksResourceIntegrationTest extends JerseyTest {
         wallets("").post(entity(WALLET));
         Response response = wallets("/%s/%d", MY_WALLET, INSUFFICIENT_AMOUNT).put(EMPTY_BODY);
 
-        assertEquals(Status.NOT_ACCEPTABLE.getStatusCode(), response.getStatus());
+        assertEquals(Response.Status.NOT_ACCEPTABLE.getStatusCode(), response.getStatus());
 
         String content = response.readEntity(String.class);
         assertThat(content, containsString(Wallet.MIN_CHARGE_MSG));
@@ -89,7 +93,7 @@ public class StocksResourceIntegrationTest extends JerseyTest {
         wallets("").post(entity(WALLET));
         
         Response response = wallets("/%s/buy/%s", MY_WALLET, STOCK.getId()).post(EMPTY_BODY);
-        assertEquals(Status.NOT_ACCEPTABLE.getStatusCode(), response.getStatus());
+        assertEquals(Response.Status.NOT_ACCEPTABLE.getStatusCode(), response.getStatus());
 
         RestErrorResponse content = response.readEntity(RestErrorResponse.class);
         assertNotNull(content.getSubject());
diff --git a/jersey/src/test/java/com/baeldung/jersey/server/EchoHeadersUnitTest.java b/jersey/src/test/java/com/baeldung/jersey/server/EchoHeadersIntegrationTest.java
similarity index 98%
rename from jersey/src/test/java/com/baeldung/jersey/server/EchoHeadersUnitTest.java
rename to jersey/src/test/java/com/baeldung/jersey/server/EchoHeadersIntegrationTest.java
index 24552f6d81..e6f06383db 100644
--- a/jersey/src/test/java/com/baeldung/jersey/server/EchoHeadersUnitTest.java
+++ b/jersey/src/test/java/com/baeldung/jersey/server/EchoHeadersIntegrationTest.java
@@ -6,8 +6,6 @@ import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.junit.Test;
 
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.Response;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
@@ -15,7 +13,10 @@ import java.util.Map;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-public class EchoHeadersUnitTest extends JerseyTest {
+import jakarta.ws.rs.core.Application;
+import jakarta.ws.rs.core.Response;
+
+public class EchoHeadersIntegrationTest extends JerseyTest {
 
     private static final String SIMPLE_HEADER_KEY = "my-header-key";
     private static final String SIMPLE_HEADER_VALUE = "my-header-value";
diff --git a/jersey/src/test/java/com/baeldung/jersey/server/GreetingsResourceIntegrationTest.java b/jersey/src/test/java/com/baeldung/jersey/server/GreetingsResourceIntegrationTest.java
index 8953f4161c..97934369e2 100644
--- a/jersey/src/test/java/com/baeldung/jersey/server/GreetingsResourceIntegrationTest.java
+++ b/jersey/src/test/java/com/baeldung/jersey/server/GreetingsResourceIntegrationTest.java
@@ -2,16 +2,15 @@ package com.baeldung.jersey.server;
 
 import static org.junit.Assert.assertEquals;
 
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.junit.Test;
 
+import jakarta.ws.rs.core.Application;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
 public class GreetingsResourceIntegrationTest extends JerseyTest {
 
     @Override
@@ -24,7 +23,7 @@ public class GreetingsResourceIntegrationTest extends JerseyTest {
         Response response = target("/greetings/hi").request()
             .get();
 
-        assertEquals("Http Response should be 200: ", Status.OK.getStatusCode(), response.getStatus());
+        assertEquals("Http Response should be 200: ", Response.Status.OK.getStatusCode(), response.getStatus());
         assertEquals("Http Content-Type should be: ", MediaType.TEXT_HTML, response.getHeaderString(HttpHeaders.CONTENT_TYPE));
 
         String content = response.readEntity(String.class);
diff --git a/jersey/src/test/java/com/baeldung/jersey/server/ItemsUnitTest.java b/jersey/src/test/java/com/baeldung/jersey/server/ItemsUnitTest.java
index b158d63720..9954c5bd53 100644
--- a/jersey/src/test/java/com/baeldung/jersey/server/ItemsUnitTest.java
+++ b/jersey/src/test/java/com/baeldung/jersey/server/ItemsUnitTest.java
@@ -1,35 +1,32 @@
 package com.baeldung.jersey.server;
 
+import static com.baeldung.jersey.server.http.EmbeddedHttpServer.BASE_URI;
 import static org.junit.Assert.assertEquals;
 
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-
 import org.glassfish.grizzly.http.server.HttpServer;
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.jupiter.api.Disabled;
 
 import com.baeldung.jersey.server.http.EmbeddedHttpServer;
 
-@Disabled
-@Ignore
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+
 public class ItemsUnitTest {
 
     private HttpServer server;
     private WebTarget target;
 
     @Before
-    public void setUp() throws Exception {
-        server = EmbeddedHttpServer.startServer();
-        target = ClientBuilder.newClient().target(EmbeddedHttpServer.BASE_URI.toString());
+    public void setUp() {
+        server = EmbeddedHttpServer.startServer(BASE_URI);
+        target = ClientBuilder.newClient().target(BASE_URI.toString());
     }
 
     @After
-    public void tearDown() throws Exception {
+    public void tearDown() {
         server.stop();
     }
 
diff --git a/jersey/src/test/java/com/baeldung/jersey/server/rest/FruitResourceIntegrationTest.java b/jersey/src/test/java/com/baeldung/jersey/server/rest/FruitResourceIntegrationTest.java
index f7bb0df1ed..4f73c9df5b 100644
--- a/jersey/src/test/java/com/baeldung/jersey/server/rest/FruitResourceIntegrationTest.java
+++ b/jersey/src/test/java/com/baeldung/jersey/server/rest/FruitResourceIntegrationTest.java
@@ -5,13 +5,6 @@ import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.Form;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
 import org.glassfish.jersey.test.JerseyTest;
 import org.glassfish.jersey.test.TestProperties;
 import org.junit.Test;
@@ -20,6 +13,12 @@ import com.baeldung.jersey.server.config.ViewApplicationConfig;
 import com.baeldung.jersey.server.model.Fruit;
 import com.baeldung.jersey.server.providers.FruitExceptionMapper;
 
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.Application;
+import jakarta.ws.rs.core.Form;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
 public class FruitResourceIntegrationTest extends JerseyTest {
 
     @Override
@@ -71,7 +70,7 @@ public class FruitResourceIntegrationTest extends JerseyTest {
         Response response = target("fruit/created").request()
             .post(Entity.json("{\"name\":\"strawberry\",\"weight\":20}"));
 
-        assertEquals("Http Response should be 201 ", Status.CREATED.getStatusCode(), response.getStatus());
+        assertEquals("Http Response should be 201 ", Response.Status.CREATED.getStatusCode(), response.getStatus());
         assertThat(response.readEntity(String.class), containsString("Fruit saved : Fruit [name: strawberry colour: null]"));
     }
 
diff --git a/jetbrains/README.md b/jetbrains/README.md
new file mode 100644
index 0000000000..c8872ec46e
--- /dev/null
+++ b/jetbrains/README.md
@@ -0,0 +1,6 @@
+## Jetbrains
+
+This module contains articles about Jetbrains' libraries.
+
+### Relevant articles:
+- [JetBrains @Contract Annotation](https://www.baeldung.com/jetbrains-contract-annotation)
diff --git a/jetbrains/pom.xml b/jetbrains/pom.xml
new file mode 100644
index 0000000000..ec46dc54f0
--- /dev/null
+++ b/jetbrains/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jetbrains</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>jetbrains</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${apache.commons.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>${jetbrains.annotations.version}</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <apache.commons.version>3.12.0</apache.commons.version>
+        <jetbrains.annotations.version>24.0.1</jetbrains.annotations.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/jetbrains/src/main/java/com/baeldung/annotations/Demo.java b/jetbrains/src/main/java/com/baeldung/annotations/Demo.java
new file mode 100644
index 0000000000..3638d13581
--- /dev/null
+++ b/jetbrains/src/main/java/com/baeldung/annotations/Demo.java
@@ -0,0 +1,112 @@
+package com.baeldung.annotations;
+
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.Contract;
+
+public class Demo {
+
+    @Contract("_ -> new")
+    Person fromName(String name) {
+        return new Person().withName(name);
+    }
+
+    @Contract(" -> fail")
+    void alwaysFail() {
+        throw new RuntimeException();
+    }
+
+    @Contract(" -> fail")
+    void doNothingWithWrongContract() {
+
+    }
+
+    @Contract("_, null -> null; null, _ -> param2; _, !null -> !null")
+    String concatenateOnlyIfSecondArgumentIsNotNull(String head, String tail) {
+        if (tail == null) {
+            return null;
+        }
+        if (head == null) {
+            return tail;
+        }
+        return head + tail;
+    }
+
+    void uselessNullCheck() {
+        String head = "1234";
+        String tail = "5678";
+        String concatenation = concatenateOnlyIfSecondArgumentIsNotNull(head, tail);
+        if (concatenation != null) {
+            System.out.println(concatenation);
+        }
+    }
+
+    void uselessNullCheckOnInferredAnnotation() {
+        if (StringUtils.isEmpty(null)) {
+            System.out.println("baeldung");
+        }
+    }
+
+    @Contract(pure = true)
+    String replace(String string, char oldChar, char newChar) {
+        return string.replace(oldChar, newChar);
+    }
+
+    @Contract(value = "true -> false; false -> true", pure = true)
+    boolean not(boolean input) {
+        return !input;
+    }
+
+    @Contract("true -> new")
+    void contractExpectsWrongParameterType(List<Integer> integers) {
+
+    }
+
+    @Contract("_, _ -> new")
+    void contractExpectsMoreParametersThanMethodHas(String s) {
+
+    }
+
+    @Contract("_ -> _; null -> !null")
+    String secondContractClauseNotReachable(String s) {
+        return "";
+    }
+
+    @Contract("_ -> true")
+    void contractExpectsWrongReturnType(String s) {
+
+    }
+
+    // NB: the following examples demonstrate how to use the mutates attribute of the annotation
+    // This attribute is currently experimental and could be changed or removed in the future
+    @Contract(mutates = "param")
+    void incrementArrayFirstElement(Integer[] integers) {
+        if (integers.length > 0) {
+            integers[0] = integers[0] + 1;
+        }
+    }
+
+    @Contract(pure = true, mutates = "param")
+    void impossibleToMutateParamInPureFunction(List<String> strings) {
+        if (strings != null) {
+            strings.forEach(System.out::println);
+        }
+    }
+
+    @Contract(mutates = "param3")
+    void impossibleToMutateThirdParamWhenMethodHasOnlyTwoParams(int a, int b) {
+
+    }
+
+    @Contract(mutates = "param")
+    void impossibleToMutableImmutableType(String s) {
+
+    }
+
+    @Contract(mutates = "this")
+    static void impossibleToMutateThisInStaticMethod() {
+
+    }
+
+}
diff --git a/jetbrains/src/main/java/com/baeldung/annotations/Person.java b/jetbrains/src/main/java/com/baeldung/annotations/Person.java
new file mode 100644
index 0000000000..086b73b47f
--- /dev/null
+++ b/jetbrains/src/main/java/com/baeldung/annotations/Person.java
@@ -0,0 +1,15 @@
+package com.baeldung.annotations;
+
+import org.jetbrains.annotations.Contract;
+
+public class Person {
+
+    String name;
+
+    @Contract("_ -> this")
+    Person withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+}
diff --git a/jgit/pom.xml b/jgit/pom.xml
index 91881fbec8..1b0d82e4d7 100644
--- a/jgit/pom.xml
+++ b/jgit/pom.xml
@@ -4,10 +4,8 @@
     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>jgit</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>jgit</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>
@@ -15,14 +13,6 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <repositories>
-        <repository>
-            <id>jgit-repository</id>
-            <url>https://repo.eclipse.org/content/groups/releases/</url>
-        </repository>
-    </repositories>
-
-    <!-- Core Library -->
     <dependencies>
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
@@ -36,6 +26,12 @@
         </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>jgit-repository</id>
+            <url>https://repo.eclipse.org/content/groups/releases/</url>
+        </repository>
+    </repositories>
 
     <properties>
         <org.eclipse.jgit.version>4.5.0.201609210915-r</org.eclipse.jgit.version>
diff --git a/jhipster-5/bookstore-monolith/.yo-rc.json b/jhipster-5/bookstore-monolith/.yo-rc.json
deleted file mode 100644
index d852aeeddc..0000000000
--- a/jhipster-5/bookstore-monolith/.yo-rc.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "generator-jhipster": {
-        "promptValues": {
-            "packageName": "com.baeldung.jhipster5"
-        },
-        "jhipsterVersion": "5.8.2",
-        "applicationType": "monolith",
-        "baseName": "Bookstore",
-        "packageName": "com.baeldung.jhipster5",
-        "packageFolder": "com/baeldung/jhipster5",
-        "serverPort": "8080",
-        "authenticationType": "jwt",
-        "cacheProvider": "no",
-        "websocket": false,
-        "databaseType": "sql",
-        "devDatabaseType": "h2Memory",
-        "prodDatabaseType": "mysql",
-        "searchEngine": false,
-        "messageBroker": false,
-        "serviceDiscoveryType": false,
-        "buildTool": "maven",
-        "enableSwaggerCodegen": false,
-        "jwtSecretKey": "NDJmOTVlZjI2NzhlZDRjNmVkNTM1NDE2NjkyNDljZDJiNzBlMjI5YmZjMjY3MzdjZmZlMjI3NjE4OTRkNzc5MWYzNDNlYWMzYmJjOWRmMjc5ZWQyZTZmOWZkOTMxZWZhNWE1MTVmM2U2NjFmYjhlNDc2Y2Q3NzliMGY0YzFkNmI=",
-        "clientFramework": "angularX",
-        "useSass": true,
-        "clientPackageManager": "npm",
-        "testFrameworks": [],
-        "jhiPrefix": "jhi",
-        "entitySuffix": "",
-        "dtoSuffix": "DTO",
-        "otherModules": [],
-        "enableTranslation": false
-    }
-}
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/audit/package-info.java b/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/audit/package-info.java
deleted file mode 100644
index 49a2a73a61..0000000000
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/audit/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Audit specific code.
- */
-package com.baeldung.jhipster5.config.audit;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/domain/package-info.java b/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/domain/package-info.java
deleted file mode 100644
index eba92a598e..0000000000
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/domain/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * JPA domain objects.
- */
-package com.baeldung.jhipster5.domain;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/repository/package-info.java b/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/repository/package-info.java
deleted file mode 100644
index a5002eb201..0000000000
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/repository/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Spring Data JPA repositories.
- */
-package com.baeldung.jhipster5.repository;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/dto/package-info.java b/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/dto/package-info.java
deleted file mode 100644
index 87951796ea..0000000000
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/dto/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Data Transfer Objects.
- */
-package com.baeldung.jhipster5.service.dto;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/package-info.java b/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/package-info.java
deleted file mode 100644
index a54ed5cca0..0000000000
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Service layer beans.
- */
-package com.baeldung.jhipster5.service;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/package-info.java b/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/package-info.java
deleted file mode 100644
index 75bf6840f6..0000000000
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Spring MVC REST controllers.
- */
-package com.baeldung.jhipster5.web.rest;
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/logs/logs.component.spec.ts b/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/logs/logs.component.spec.ts
deleted file mode 100644
index def356c0f2..0000000000
--- a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/logs/logs.component.spec.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { ComponentFixture, TestBed, async } from '@angular/core/testing';
-import { of } from 'rxjs';
-import { HttpHeaders, HttpResponse } from '@angular/common/http';
-
-import { BookstoreTestModule } from '../../../test.module';
-import { LogsComponent } from 'app/admin/logs/logs.component';
-import { LogsService } from 'app/admin/logs/logs.service';
-import { ITEMS_PER_PAGE } from 'app/shared';
-import { Log } from 'app/admin';
-
-describe('Component Tests', () => {
-    describe('LogsComponent', () => {
-        let comp: LogsComponent;
-        let fixture: ComponentFixture<LogsComponent>;
-        let service: LogsService;
-
-        beforeEach(async(() => {
-            TestBed.configureTestingModule({
-                imports: [BookstoreTestModule],
-                declarations: [LogsComponent],
-                providers: [LogsService]
-            })
-                .overrideTemplate(LogsComponent, '')
-                .compileComponents();
-        }));
-
-        beforeEach(() => {
-            fixture = TestBed.createComponent(LogsComponent);
-            comp = fixture.componentInstance;
-            service = fixture.debugElement.injector.get(LogsService);
-        });
-
-        describe('OnInit', () => {
-            it('should set all default values correctly', () => {
-                expect(comp.filter).toBe('');
-                expect(comp.orderProp).toBe('name');
-                expect(comp.reverse).toBe(false);
-            });
-            it('Should call load all on init', () => {
-                // GIVEN
-                const headers = new HttpHeaders().append('link', 'link;link');
-                const log = new Log('main', 'WARN');
-                spyOn(service, 'findAll').and.returnValue(
-                    of(
-                        new HttpResponse({
-                            body: [log],
-                            headers
-                        })
-                    )
-                );
-
-                // WHEN
-                comp.ngOnInit();
-
-                // THEN
-                expect(service.findAll).toHaveBeenCalled();
-                expect(comp.loggers[0]).toEqual(jasmine.objectContaining(log));
-            });
-        });
-        describe('change log level', () => {
-            it('should change log level correctly', () => {
-                // GIVEN
-                const log = new Log('main', 'ERROR');
-                spyOn(service, 'changeLevel').and.returnValue(of(new HttpResponse()));
-                spyOn(service, 'findAll').and.returnValue(of(new HttpResponse({ body: [log] })));
-
-                // WHEN
-                comp.changeLevel('main', 'ERROR');
-
-                // THEN
-                expect(service.changeLevel).toHaveBeenCalled();
-                expect(service.findAll).toHaveBeenCalled();
-                expect(comp.loggers[0]).toEqual(jasmine.objectContaining(log));
-            });
-        });
-    });
-});
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/logs/logs.service.spec.ts b/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/logs/logs.service.spec.ts
deleted file mode 100644
index c34833922e..0000000000
--- a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/logs/logs.service.spec.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { LogsService } from 'app/admin/logs/logs.service';
-import { Log } from 'app/admin/logs/log.model';
-import { SERVER_API_URL } from 'app/app.constants';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-
-describe('Service Tests', () => {
-    describe('Logs Service', () => {
-        let service: LogsService;
-        let httpMock;
-
-        beforeEach(() => {
-            TestBed.configureTestingModule({
-                imports: [HttpClientTestingModule]
-            });
-
-            service = TestBed.get(LogsService);
-            httpMock = TestBed.get(HttpTestingController);
-        });
-
-        afterEach(() => {
-            httpMock.verify();
-        });
-
-        describe('Service methods', () => {
-            it('should call correct URL', () => {
-                service.findAll().subscribe(() => {});
-
-                const req = httpMock.expectOne({ method: 'GET' });
-                const resourceUrl = SERVER_API_URL + 'management/logs';
-                expect(req.request.url).toEqual(resourceUrl);
-            });
-
-            it('should return Logs', () => {
-                const log = new Log('main', 'ERROR');
-
-                service.findAll().subscribe(received => {
-                    expect(received.body[0]).toEqual(log);
-                });
-
-                const req = httpMock.expectOne({ method: 'GET' });
-                req.flush([log]);
-            });
-
-            it('should change log level', () => {
-                const log = new Log('main', 'ERROR');
-
-                service.changeLevel(log).subscribe(received => {
-                    expect(received.body[0]).toEqual(log);
-                });
-
-                const req = httpMock.expectOne({ method: 'PUT' });
-                req.flush([log]);
-            });
-        });
-    });
-});
diff --git a/jhipster-5/README.md b/jhipster-6/README.md
similarity index 89%
rename from jhipster-5/README.md
rename to jhipster-6/README.md
index ba05641af0..9db409a032 100644
--- a/jhipster-5/README.md
+++ b/jhipster-6/README.md
@@ -1,3 +1,3 @@
-## JHipster 5
+## JHipster 6
 
 This module contains articles about JHipster 5. This is an aggregator module, articles are in the relevant submodules.
diff --git a/jhipster-5/bookstore-monolith/.editorconfig b/jhipster-6/bookstore-monolith/.editorconfig
similarity index 100%
rename from jhipster-5/bookstore-monolith/.editorconfig
rename to jhipster-6/bookstore-monolith/.editorconfig
diff --git a/jhipster-5/bookstore-monolith/.gitattributes b/jhipster-6/bookstore-monolith/.gitattributes
similarity index 100%
rename from jhipster-5/bookstore-monolith/.gitattributes
rename to jhipster-6/bookstore-monolith/.gitattributes
diff --git a/jhipster-5/bookstore-monolith/.gitignore b/jhipster-6/bookstore-monolith/.gitignore
similarity index 100%
rename from jhipster-5/bookstore-monolith/.gitignore
rename to jhipster-6/bookstore-monolith/.gitignore
diff --git a/jhipster-5/bookstore-monolith/.huskyrc b/jhipster-6/bookstore-monolith/.huskyrc
similarity index 100%
rename from jhipster-5/bookstore-monolith/.huskyrc
rename to jhipster-6/bookstore-monolith/.huskyrc
diff --git a/jhipster-5/bookstore-monolith/.jhipster/Book.json b/jhipster-6/bookstore-monolith/.jhipster/Book.json
similarity index 100%
rename from jhipster-5/bookstore-monolith/.jhipster/Book.json
rename to jhipster-6/bookstore-monolith/.jhipster/Book.json
diff --git a/jhipster-5/bookstore-monolith/.mvn/wrapper/MavenWrapperDownloader.java b/jhipster-6/bookstore-monolith/.mvn/wrapper/MavenWrapperDownloader.java
similarity index 100%
rename from jhipster-5/bookstore-monolith/.mvn/wrapper/MavenWrapperDownloader.java
rename to jhipster-6/bookstore-monolith/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/jhipster-5/bookstore-monolith/.mvn/wrapper/maven-wrapper.jar b/jhipster-6/bookstore-monolith/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from jhipster-5/bookstore-monolith/.mvn/wrapper/maven-wrapper.jar
rename to jhipster-6/bookstore-monolith/.mvn/wrapper/maven-wrapper.jar
diff --git a/jhipster-5/bookstore-monolith/.mvn/wrapper/maven-wrapper.properties b/jhipster-6/bookstore-monolith/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from jhipster-5/bookstore-monolith/.mvn/wrapper/maven-wrapper.properties
rename to jhipster-6/bookstore-monolith/.mvn/wrapper/maven-wrapper.properties
diff --git a/jhipster-5/bookstore-monolith/.prettierignore b/jhipster-6/bookstore-monolith/.prettierignore
similarity index 100%
rename from jhipster-5/bookstore-monolith/.prettierignore
rename to jhipster-6/bookstore-monolith/.prettierignore
diff --git a/jhipster-5/bookstore-monolith/.prettierrc b/jhipster-6/bookstore-monolith/.prettierrc
similarity index 100%
rename from jhipster-5/bookstore-monolith/.prettierrc
rename to jhipster-6/bookstore-monolith/.prettierrc
diff --git a/jhipster-6/bookstore-monolith/.yo-rc.json b/jhipster-6/bookstore-monolith/.yo-rc.json
new file mode 100644
index 0000000000..3ec14d8ada
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/.yo-rc.json
@@ -0,0 +1,36 @@
+{
+  "generator-jhipster": {
+    "promptValues": {
+      "packageName": "com.baeldung.jhipster5"
+    },
+    "jhipsterVersion": "6.0.0",
+    "applicationType": "monolith",
+    "baseName": "Bookstore",
+    "packageName": "com.baeldung.jhipster5",
+    "packageFolder": "com/baeldung/jhipster5",
+    "serverPort": "8080",
+    "authenticationType": "jwt",
+    "cacheProvider": "no",
+    "websocket": false,
+    "databaseType": "sql",
+    "devDatabaseType": "h2Memory",
+    "prodDatabaseType": "mysql",
+    "searchEngine": false,
+    "messageBroker": false,
+    "serviceDiscoveryType": false,
+    "buildTool": "maven",
+    "enableSwaggerCodegen": false,
+    "jwtSecretKey": "NDJmOTVlZjI2NzhlZDRjNmVkNTM1NDE2NjkyNDljZDJiNzBlMjI5YmZjMjY3MzdjZmZlMjI3NjE4OTRkNzc5MWYzNDNlYWMzYmJjOWRmMjc5ZWQyZTZmOWZkOTMxZWZhNWE1MTVmM2U2NjFmYjhlNDc2Y2Q3NzliMGY0YzFkNmI=",
+    "clientFramework": "angularX",
+    "useSass": true,
+    "clientPackageManager": "npm",
+    "testFrameworks": [],
+    "jhiPrefix": "jhi",
+    "entitySuffix": "",
+    "dtoSuffix": "DTO",
+    "otherModules": [],
+    "enableTranslation": false,
+    "enableHibernateCache": false,
+    "clientTheme": "none"
+  }
+}
\ No newline at end of file
diff --git a/jhipster-5/bookstore-monolith/README.md b/jhipster-6/bookstore-monolith/README.md
similarity index 100%
rename from jhipster-5/bookstore-monolith/README.md
rename to jhipster-6/bookstore-monolith/README.md
diff --git a/jhipster-5/bookstore-monolith/angular.json b/jhipster-6/bookstore-monolith/angular.json
similarity index 100%
rename from jhipster-5/bookstore-monolith/angular.json
rename to jhipster-6/bookstore-monolith/angular.json
diff --git a/jhipster-5/bookstore-monolith/mvnw b/jhipster-6/bookstore-monolith/mvnw
old mode 100755
new mode 100644
similarity index 100%
rename from jhipster-5/bookstore-monolith/mvnw
rename to jhipster-6/bookstore-monolith/mvnw
diff --git a/jhipster-5/bookstore-monolith/mvnw.cmd b/jhipster-6/bookstore-monolith/mvnw.cmd
similarity index 100%
rename from jhipster-5/bookstore-monolith/mvnw.cmd
rename to jhipster-6/bookstore-monolith/mvnw.cmd
diff --git a/jhipster-5/bookstore-monolith/package.json b/jhipster-6/bookstore-monolith/package.json
similarity index 99%
rename from jhipster-5/bookstore-monolith/package.json
rename to jhipster-6/bookstore-monolith/package.json
index 46b920edb3..76b74a4312 100644
--- a/jhipster-5/bookstore-monolith/package.json
+++ b/jhipster-6/bookstore-monolith/package.json
@@ -51,7 +51,7 @@
         "file-loader": "3.0.1",
         "fork-ts-checker-webpack-plugin": "0.5.2",
         "friendly-errors-webpack-plugin": "1.7.0",
-        "generator-jhipster": "5.8.2",
+        "generator-jhipster": "6.0.0",
         "html-loader": "0.5.5",
         "html-webpack-plugin": "3.2.0",
         "husky": "1.3.1",
diff --git a/jhipster-5/bookstore-monolith/pom.xml b/jhipster-6/bookstore-monolith/pom.xml
similarity index 89%
rename from jhipster-5/bookstore-monolith/pom.xml
rename to jhipster-6/bookstore-monolith/pom.xml
index ccaa802a39..f719baab8b 100644
--- a/jhipster-5/bookstore-monolith/pom.xml
+++ b/jhipster-6/bookstore-monolith/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.baeldung.jhipster5</groupId>
+    <groupId>com.baeldung.jhipster6</groupId>
     <artifactId>bookstore-monolith</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>bookstore-monolith</name>
 
     <parent>
-        <artifactId>jhipster-5</artifactId>
+        <artifactId>jhipster-6</artifactId>
         <groupId>com.baeldung.jhipster</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
@@ -41,8 +41,25 @@
         <dependency>
             <groupId>io.github.jhipster</groupId>
             <artifactId>jhipster-framework</artifactId>
+            <version>3.0.1</version>
         </dependency>
 
+        <!-- API, java.xml.bind module -->
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>4.0.0</version>
+        </dependency>
+        <!-- Runtime, com.sun.xml.bind module -->
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>4.0.0</version>
+        </dependency>
+
+
+
+
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-hibernate5</artifactId>
@@ -78,10 +95,10 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-bean-validators</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.mattbertolini</groupId>
-            <artifactId>liquibase-slf4j</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.mattbertolini</groupId>-->
+<!--            <artifactId>liquibase-slf4j</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
@@ -94,6 +111,10 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -120,9 +141,13 @@
             <groupId>net.logstash.logback</groupId>
             <artifactId>logstash-logback-encoder</artifactId>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.mapstruct</groupId>-->
+<!--            <artifactId>mapstruct-jdk8</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-jdk8</artifactId>
+            <artifactId>mapstruct</artifactId>
         </dependency>
         <dependency>
             <groupId>org.mapstruct</groupId>
@@ -269,6 +294,11 @@
                             <artifactId>hibernate-jpamodelgen</artifactId>
                             <version>${hibernate.version}</version>
                         </path>
+                        <path>
+                            <groupId>org.glassfish.jaxb</groupId>
+                            <artifactId>jaxb-runtime</artifactId>
+                            <version>${jaxb-runtime.version}</version>
+                        </path>
 
                     </annotationProcessorPaths>
                 </configuration>
@@ -492,9 +522,8 @@
                                 <version>[${maven.version},)</version>
                             </requireMavenVersion>
                             <requireJavaVersion>
-                                <!-- Until JHipster supports JDK 9 -->
-                                <message>You are running an incompatible version of Java. JHipster requires JDK ${java.version}</message>
-                                <version>[1.8,1.9)</version>
+                                <message>You are running an incompatible version of Java. JHipster supports JDK 11.</message>
+                                <version>[${java.version},)</version>
                             </requireJavaVersion>
                         </rules>
                     </configuration>
@@ -681,6 +710,9 @@
                                 <goals>
                                     <goal>npm</goal>
                                 </goals>
+                                <configuration>
+                                    <arguments>install --legacy-peer-deps</arguments>
+                                </configuration>
                             </execution>
                             <execution>
                                 <id>webpack build dev</id>
@@ -1023,135 +1055,12 @@
                 </pluginManagement>
             </build>
         </profile>
-        <!-- jhipster-needle-maven-add-profile -->
-        <profile>
-            <id>default-first</id>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.github.eirslett</groupId>
-                        <artifactId>frontend-maven-plugin</artifactId>
-
-                        <executions>
-                            <execution>
-                                <id>install node and npm</id>
-                                <phase>none</phase>
-                            </execution>
-                            <execution>
-                                <id>npm install</id>
-                                <phase>none</phase>
-                            </execution>
-                            <execution>
-                                <id>webpack build dev</id>
-                                <phase>none</phase>
-                            </execution>
-                            <execution>
-                                <id>webpack build test</id>
-                                <phase>none</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>default-second</id>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.github.eirslett</groupId>
-                        <artifactId>frontend-maven-plugin</artifactId>
-
-                        <executions>
-                            <execution>
-                                <id>install node and npm</id>
-                                <phase>none</phase>
-                            </execution>
-                            <execution>
-                                <id>npm install</id>
-                                <phase>none</phase>
-                            </execution>
-                            <execution>
-                                <id>webpack build dev</id>
-                                <phase>none</phase>
-                            </execution>
-                            <execution>
-                                <id>webpack build test</id>
-                                <phase>none</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>integration-lite-first</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.github.eirslett</groupId>
-                        <artifactId>frontend-maven-plugin</artifactId>
-
-                        <executions>
-                            <execution>
-                                <id>install node and npm</id>
-                                <phase>none</phase>
-                            </execution>
-                            <execution>
-                                <id>npm install</id>
-                                <phase>none</phase>
-                            </execution>
-                            <execution>
-                                <id>webpack build dev</id>
-                                <phase>none</phase>
-                            </execution>
-                            <execution>
-                                <id>webpack build test</id>
-                                <phase>none</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>integration-lite-second</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.github.eirslett</groupId>
-                        <artifactId>frontend-maven-plugin</artifactId>
-
-                        <executions>
-                            <execution>
-                                <id>install node and npm</id>
-                                <phase>none</phase>
-                            </execution>
-                            <execution>
-                                <id>npm install</id>
-                                <phase>none</phase>
-                            </execution>
-                            <execution>
-                                <id>webpack build dev</id>
-                                <phase>none</phase>
-                            </execution>
-                            <execution>
-                                <id>webpack build test</id>
-                                <phase>none</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 
     <properties>
         <!-- Build properties -->
         <maven.version>3.0.0</maven.version>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
         <scala.version>2.12.6</scala.version>
         <node.version>v10.15.0</node.version>
         <npm.version>6.4.1</npm.version>
@@ -1168,34 +1077,36 @@
         <profile.tls />
 
         <!-- Dependency versions -->
-        <jhipster-dependencies.version>2.1.1</jhipster-dependencies.version>
+        <jhipster-dependencies.version>3.0.1</jhipster-dependencies.version>
         <!-- The spring-boot version should match the one managed by
         https://mvnrepository.com/artifact/io.github.jhipster/jhipster-dependencies/${jhipster-dependencies.version} -->
-        <spring-boot.version>2.7.8</spring-boot.version>
+        <spring-boot.version>2.7.5</spring-boot.version>
         <!-- The hibernate version should match the one managed by
         https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/${spring-boot.version} -->
-        <hibernate.version>5.2.17.Final</hibernate.version>
+        <hibernate.version>5.3.9.Final</hibernate.version>
         <!-- The javassist version should match the one managed by
         https://mvnrepository.com/artifact/org.hibernate/hibernate-core/${hibernate.version} -->
-        <javassist.version>3.22.0-GA</javassist.version>
+        <javassist.version>3.23.1-GA</javassist.version>
         <!-- The liquibase version should match the one managed by
         https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/${spring-boot.version} -->
-        <liquibase.version>3.5.5</liquibase.version>
+        <liquibase.version>3.6.3</liquibase.version>
         <liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
+        <spring.version>5.1.5.RELEASE</spring.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
-        <mapstruct.version>1.2.0.Final</mapstruct.version>
+        <jaxb-runtime.version>2.3.2</jaxb-runtime.version>
+        <mapstruct.version>1.3.0.Final</mapstruct.version>
 
         <!-- Plugin versions -->
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
-        <maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
+        <maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
         <maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
         <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
-        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.2.2</maven-war-plugin.version>
         <jib-maven-plugin.version>0.9.11</jib-maven-plugin.version>
-        <frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
+        <frontend-maven-plugin.version>1.7.6</frontend-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
         <scala-maven-plugin.version>3.4.2</scala-maven-plugin.version>
diff --git a/jhipster-5/bookstore-monolith/postcss.config.js b/jhipster-6/bookstore-monolith/postcss.config.js
similarity index 100%
rename from jhipster-5/bookstore-monolith/postcss.config.js
rename to jhipster-6/bookstore-monolith/postcss.config.js
diff --git a/jhipster-5/bookstore-monolith/proxy.conf.json b/jhipster-6/bookstore-monolith/proxy.conf.json
similarity index 100%
rename from jhipster-5/bookstore-monolith/proxy.conf.json
rename to jhipster-6/bookstore-monolith/proxy.conf.json
diff --git a/jhipster-5/bookstore-monolith/src/main/docker/.dockerignore b/jhipster-6/bookstore-monolith/src/main/docker/.dockerignore
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/docker/.dockerignore
rename to jhipster-6/bookstore-monolith/src/main/docker/.dockerignore
diff --git a/jhipster-5/bookstore-monolith/src/main/docker/Dockerfile b/jhipster-6/bookstore-monolith/src/main/docker/Dockerfile
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/docker/Dockerfile
rename to jhipster-6/bookstore-monolith/src/main/docker/Dockerfile
diff --git a/jhipster-5/bookstore-monolith/src/main/docker/app.yml b/jhipster-6/bookstore-monolith/src/main/docker/app.yml
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/docker/app.yml
rename to jhipster-6/bookstore-monolith/src/main/docker/app.yml
diff --git a/jhipster-5/bookstore-monolith/src/main/docker/entrypoint.sh b/jhipster-6/bookstore-monolith/src/main/docker/entrypoint.sh
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/docker/entrypoint.sh
rename to jhipster-6/bookstore-monolith/src/main/docker/entrypoint.sh
diff --git a/jhipster-6/bookstore-monolith/src/main/docker/grafana/provisioning/dashboards/JVM.json b/jhipster-6/bookstore-monolith/src/main/docker/grafana/provisioning/dashboards/JVM.json
new file mode 100644
index 0000000000..b299032c99
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/main/docker/grafana/provisioning/dashboards/JVM.json
@@ -0,0 +1,3778 @@
+{
+    "annotations": {
+        "list": [
+            {
+                "builtIn": 1,
+                "datasource": "-- Grafana --",
+                "enable": true,
+                "hide": true,
+                "iconColor": "rgba(0, 211, 255, 1)",
+                "limit": 100,
+                "name": "Annotations & Alerts",
+                "showIn": 0,
+                "type": "dashboard"
+            },
+            {
+                "datasource": "Prometheus",
+                "enable": true,
+                "expr": "resets(process_uptime_seconds{application=\"$application\", instance=\"$instance\"}[1m]) > 0",
+                "iconColor": "rgba(255, 96, 96, 1)",
+                "name": "Restart Detection",
+                "showIn": 0,
+                "step": "1m",
+                "tagKeys": "restart-tag",
+                "textFormat": "uptime reset",
+                "titleFormat": "Restart"
+            }
+        ]
+    },
+    "description": "Dashboard for Micrometer instrumented applications (Java, Spring Boot, Micronaut)",
+    "editable": true,
+    "gnetId": 4701,
+    "graphTooltip": 1,
+    "iteration": 1553765841423,
+    "links": [],
+    "panels": [
+        {
+            "content": "\n# Acknowledgments\n\nThank you to [Michael Weirauch](https://twitter.com/emwexx) for creating this dashboard: see original JVM (Micrometer) dashboard at [https://grafana.com/dashboards/4701](https://grafana.com/dashboards/4701)\n\n\n\n",
+            "gridPos": {
+                "h": 3,
+                "w": 24,
+                "x": 0,
+                "y": 0
+            },
+            "id": 141,
+            "links": [],
+            "mode": "markdown",
+            "timeFrom": null,
+            "timeShift": null,
+            "title": "Acknowledgments",
+            "type": "text"
+        },
+        {
+            "collapsed": false,
+            "gridPos": {
+                "h": 1,
+                "w": 24,
+                "x": 0,
+                "y": 3
+            },
+            "id": 125,
+            "panels": [],
+            "repeat": null,
+            "title": "Quick Facts",
+            "type": "row"
+        },
+        {
+            "cacheTimeout": null,
+            "colorBackground": false,
+            "colorValue": true,
+            "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+            "datasource": "Prometheus",
+            "decimals": 1,
+            "editable": true,
+            "error": false,
+            "format": "s",
+            "gauge": {
+                "maxValue": 100,
+                "minValue": 0,
+                "show": false,
+                "thresholdLabels": false,
+                "thresholdMarkers": true
+            },
+            "gridPos": {
+                "h": 3,
+                "w": 6,
+                "x": 0,
+                "y": 4
+            },
+            "height": "",
+            "id": 63,
+            "interval": null,
+            "links": [],
+            "mappingType": 1,
+            "mappingTypes": [
+                {
+                    "name": "value to text",
+                    "value": 1
+                },
+                {
+                    "name": "range to text",
+                    "value": 2
+                }
+            ],
+            "maxDataPoints": 100,
+            "nullPointMode": "connected",
+            "nullText": null,
+            "postfix": "",
+            "postfixFontSize": "50%",
+            "prefix": "",
+            "prefixFontSize": "70%",
+            "rangeMaps": [
+                {
+                    "from": "null",
+                    "text": "N/A",
+                    "to": "null"
+                }
+            ],
+            "sparkline": {
+                "fillColor": "rgba(31, 118, 189, 0.18)",
+                "full": false,
+                "lineColor": "rgb(31, 120, 193)",
+                "show": false
+            },
+            "tableColumn": "",
+            "targets": [
+                {
+                    "expr": "process_uptime_seconds{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 14400
+                }
+            ],
+            "thresholds": "",
+            "title": "Uptime",
+            "type": "singlestat",
+            "valueFontSize": "80%",
+            "valueMaps": [
+                {
+                    "op": "=",
+                    "text": "N/A",
+                    "value": "null"
+                }
+            ],
+            "valueName": "current"
+        },
+        {
+            "cacheTimeout": null,
+            "colorBackground": false,
+            "colorValue": true,
+            "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+            "datasource": "Prometheus",
+            "decimals": null,
+            "editable": true,
+            "error": false,
+            "format": "dateTimeAsIso",
+            "gauge": {
+                "maxValue": 100,
+                "minValue": 0,
+                "show": false,
+                "thresholdLabels": false,
+                "thresholdMarkers": true
+            },
+            "gridPos": {
+                "h": 3,
+                "w": 6,
+                "x": 6,
+                "y": 4
+            },
+            "height": "",
+            "id": 92,
+            "interval": null,
+            "links": [],
+            "mappingType": 1,
+            "mappingTypes": [
+                {
+                    "name": "value to text",
+                    "value": 1
+                },
+                {
+                    "name": "range to text",
+                    "value": 2
+                }
+            ],
+            "maxDataPoints": 100,
+            "nullPointMode": "connected",
+            "nullText": null,
+            "postfix": "",
+            "postfixFontSize": "50%",
+            "prefix": "",
+            "prefixFontSize": "70%",
+            "rangeMaps": [
+                {
+                    "from": "null",
+                    "text": "N/A",
+                    "to": "null"
+                }
+            ],
+            "sparkline": {
+                "fillColor": "rgba(31, 118, 189, 0.18)",
+                "full": false,
+                "lineColor": "rgb(31, 120, 193)",
+                "show": false
+            },
+            "tableColumn": "",
+            "targets": [
+                {
+                    "expr": "process_start_time_seconds{application=\"$application\", instance=\"$instance\"}*1000",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 14400
+                }
+            ],
+            "thresholds": "",
+            "title": "Start time",
+            "type": "singlestat",
+            "valueFontSize": "70%",
+            "valueMaps": [
+                {
+                    "op": "=",
+                    "text": "N/A",
+                    "value": "null"
+                }
+            ],
+            "valueName": "current"
+        },
+        {
+            "cacheTimeout": null,
+            "colorBackground": false,
+            "colorValue": true,
+            "colors": ["rgba(50, 172, 45, 0.97)", "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)"],
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "editable": true,
+            "error": false,
+            "format": "percent",
+            "gauge": {
+                "maxValue": 100,
+                "minValue": 0,
+                "show": false,
+                "thresholdLabels": false,
+                "thresholdMarkers": true
+            },
+            "gridPos": {
+                "h": 3,
+                "w": 6,
+                "x": 12,
+                "y": 4
+            },
+            "id": 65,
+            "interval": null,
+            "links": [],
+            "mappingType": 1,
+            "mappingTypes": [
+                {
+                    "name": "value to text",
+                    "value": 1
+                },
+                {
+                    "name": "range to text",
+                    "value": 2
+                }
+            ],
+            "maxDataPoints": 100,
+            "nullPointMode": "connected",
+            "nullText": null,
+            "postfix": "",
+            "postfixFontSize": "50%",
+            "prefix": "",
+            "prefixFontSize": "70%",
+            "rangeMaps": [
+                {
+                    "from": "null",
+                    "text": "N/A",
+                    "to": "null"
+                }
+            ],
+            "sparkline": {
+                "fillColor": "rgba(31, 118, 189, 0.18)",
+                "full": false,
+                "lineColor": "rgb(31, 120, 193)",
+                "show": false
+            },
+            "tableColumn": "",
+            "targets": [
+                {
+                    "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"})*100/sum(jvm_memory_max_bytes{application=\"$application\",instance=\"$instance\", area=\"heap\"})",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "",
+                    "refId": "A",
+                    "step": 14400
+                }
+            ],
+            "thresholds": "70,90",
+            "title": "Heap used",
+            "type": "singlestat",
+            "valueFontSize": "80%",
+            "valueMaps": [
+                {
+                    "op": "=",
+                    "text": "N/A",
+                    "value": "null"
+                }
+            ],
+            "valueName": "current"
+        },
+        {
+            "cacheTimeout": null,
+            "colorBackground": false,
+            "colorValue": true,
+            "colors": ["rgba(50, 172, 45, 0.97)", "rgba(237, 129, 40, 0.89)", "rgba(245, 54, 54, 0.9)"],
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "editable": true,
+            "error": false,
+            "format": "percent",
+            "gauge": {
+                "maxValue": 100,
+                "minValue": 0,
+                "show": false,
+                "thresholdLabels": false,
+                "thresholdMarkers": true
+            },
+            "gridPos": {
+                "h": 3,
+                "w": 6,
+                "x": 18,
+                "y": 4
+            },
+            "id": 75,
+            "interval": null,
+            "links": [],
+            "mappingType": 2,
+            "mappingTypes": [
+                {
+                    "name": "value to text",
+                    "value": 1
+                },
+                {
+                    "name": "range to text",
+                    "value": 2
+                }
+            ],
+            "maxDataPoints": 100,
+            "nullPointMode": "connected",
+            "nullText": null,
+            "postfix": "",
+            "postfixFontSize": "50%",
+            "prefix": "",
+            "prefixFontSize": "70%",
+            "rangeMaps": [
+                {
+                    "from": "null",
+                    "text": "N/A",
+                    "to": "null"
+                },
+                {
+                    "from": "-99999999999999999999999999999999",
+                    "text": "N/A",
+                    "to": "0"
+                }
+            ],
+            "sparkline": {
+                "fillColor": "rgba(31, 118, 189, 0.18)",
+                "full": false,
+                "lineColor": "rgb(31, 120, 193)",
+                "show": false
+            },
+            "tableColumn": "",
+            "targets": [
+                {
+                    "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"})*100/sum(jvm_memory_max_bytes{application=\"$application\",instance=\"$instance\", area=\"nonheap\"})",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "",
+                    "refId": "A",
+                    "step": 14400
+                }
+            ],
+            "thresholds": "70,90",
+            "title": "Non-Heap used",
+            "type": "singlestat",
+            "valueFontSize": "80%",
+            "valueMaps": [
+                {
+                    "op": "=",
+                    "text": "N/A",
+                    "value": "null"
+                },
+                {
+                    "op": "=",
+                    "text": "x",
+                    "value": ""
+                }
+            ],
+            "valueName": "current"
+        },
+        {
+            "collapsed": false,
+            "gridPos": {
+                "h": 1,
+                "w": 24,
+                "x": 0,
+                "y": 7
+            },
+            "id": 126,
+            "panels": [],
+            "repeat": null,
+            "title": "I/O Overview",
+            "type": "row"
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 1,
+            "gridPos": {
+                "h": 7,
+                "w": 8,
+                "x": 0,
+                "y": 8
+            },
+            "id": 111,
+            "legend": {
+                "avg": false,
+                "current": true,
+                "max": false,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "sum(rate(http_server_requests_seconds_count{application=\"$application\", instance=\"$instance\"}[1m]))",
+                    "format": "time_series",
+                    "intervalFactor": 1,
+                    "legendFormat": "HTTP",
+                    "refId": "A"
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Rate",
+            "tooltip": {
+                "shared": true,
+                "sort": 0,
+                "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "yaxes": [
+                {
+                    "decimals": null,
+                    "format": "ops",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": "0",
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {
+                "HTTP": "#890f02",
+                "HTTP - 5xx": "#bf1b00"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 1,
+            "gridPos": {
+                "h": 7,
+                "w": 8,
+                "x": 8,
+                "y": 8
+            },
+            "id": 112,
+            "legend": {
+                "avg": false,
+                "current": true,
+                "max": false,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "sum(rate(http_server_requests_seconds_count{application=\"$application\", instance=\"$instance\", status=~\"5..\"}[1m]))",
+                    "format": "time_series",
+                    "intervalFactor": 1,
+                    "legendFormat": "HTTP - 5xx",
+                    "refId": "A"
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Errors",
+            "tooltip": {
+                "shared": true,
+                "sort": 0,
+                "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "yaxes": [
+                {
+                    "decimals": null,
+                    "format": "ops",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": "0",
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 1,
+            "gridPos": {
+                "h": 7,
+                "w": 8,
+                "x": 16,
+                "y": 8
+            },
+            "id": 113,
+            "legend": {
+                "avg": false,
+                "current": true,
+                "max": false,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "sum(rate(http_server_requests_seconds_sum{application=\"$application\", instance=\"$instance\", status!~\"5..\"}[1m]))/sum(rate(http_server_requests_seconds_count{application=\"$application\", instance=\"$instance\", status!~\"5..\"}[1m]))",
+                    "format": "time_series",
+                    "hide": false,
+                    "intervalFactor": 1,
+                    "legendFormat": "HTTP - AVG",
+                    "refId": "A"
+                },
+                {
+                    "expr": "max(http_server_requests_seconds_max{application=\"$application\", instance=\"$instance\", status!~\"5..\"})",
+                    "format": "time_series",
+                    "hide": false,
+                    "intervalFactor": 1,
+                    "legendFormat": "HTTP - MAX",
+                    "refId": "B"
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Duration",
+            "tooltip": {
+                "shared": true,
+                "sort": 0,
+                "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "yaxes": [
+                {
+                    "format": "s",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": "0",
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "collapsed": false,
+            "gridPos": {
+                "h": 1,
+                "w": 24,
+                "x": 0,
+                "y": 15
+            },
+            "id": 127,
+            "panels": [],
+            "repeat": null,
+            "title": "JVM Memory",
+            "type": "row"
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 8,
+                "x": 0,
+                "y": 16
+            },
+            "id": 24,
+            "legend": {
+                "avg": false,
+                "current": true,
+                "max": true,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"})",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "used",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 2400
+                },
+                {
+                    "expr": "sum(jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"})",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "committed",
+                    "refId": "B",
+                    "step": 2400
+                },
+                {
+                    "expr": "sum(jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"})",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "max",
+                    "refId": "C",
+                    "step": 2400
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "JVM Heap",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["mbytes", "short"],
+            "yaxes": [
+                {
+                    "format": "bytes",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": 0,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 8,
+                "x": 8,
+                "y": 16
+            },
+            "id": 25,
+            "legend": {
+                "avg": false,
+                "current": true,
+                "max": true,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"})",
+                    "format": "time_series",
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "used",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 2400
+                },
+                {
+                    "expr": "sum(jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"})",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "committed",
+                    "refId": "B",
+                    "step": 2400
+                },
+                {
+                    "expr": "sum(jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"})",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "max",
+                    "refId": "C",
+                    "step": 2400
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "JVM Non-Heap",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["mbytes", "short"],
+            "yaxes": [
+                {
+                    "format": "bytes",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": 0,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 8,
+                "x": 16,
+                "y": 16
+            },
+            "id": 26,
+            "legend": {
+                "alignAsTable": false,
+                "avg": false,
+                "current": true,
+                "max": true,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "sum(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\"})",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "used",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 2400
+                },
+                {
+                    "expr": "sum(jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\"})",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "committed",
+                    "refId": "B",
+                    "step": 2400
+                },
+                {
+                    "expr": "sum(jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\"})",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "max",
+                    "refId": "C",
+                    "step": 2400
+                },
+                {
+                    "expr": "process_memory_vss_bytes{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "hide": true,
+                    "intervalFactor": 2,
+                    "legendFormat": "vss",
+                    "metric": "",
+                    "refId": "D",
+                    "step": 2400
+                },
+                {
+                    "expr": "process_memory_rss_bytes{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "rss",
+                    "refId": "E",
+                    "step": 2400
+                },
+                {
+                    "expr": "process_memory_pss_bytes{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "pss",
+                    "refId": "F",
+                    "step": 2400
+                },
+                {
+                    "expr": "process_memory_swap_bytes{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "swap",
+                    "refId": "G",
+                    "step": 2400
+                },
+                {
+                    "expr": "process_memory_swappss_bytes{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "swappss",
+                    "refId": "H",
+                    "step": 2400
+                },
+                {
+                    "expr": "process_memory_pss_bytes{application=\"$application\", instance=\"$instance\"} + process_memory_swap_bytes{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "phys (pss+swap)",
+                    "refId": "I",
+                    "step": 2400
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "JVM Total",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["mbytes", "short"],
+            "yaxes": [
+                {
+                    "format": "bytes",
+                    "label": "",
+                    "logBase": 1,
+                    "max": null,
+                    "min": 0,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "collapsed": false,
+            "gridPos": {
+                "h": 1,
+                "w": 24,
+                "x": 0,
+                "y": 23
+            },
+            "id": 128,
+            "panels": [],
+            "repeat": null,
+            "title": "JVM Misc",
+            "type": "row"
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 6,
+                "x": 0,
+                "y": 24
+            },
+            "id": 106,
+            "legend": {
+                "avg": false,
+                "current": true,
+                "max": true,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "system_cpu_usage{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "intervalFactor": 1,
+                    "legendFormat": "system",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 2400
+                },
+                {
+                    "expr": "process_cpu_usage{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "intervalFactor": 1,
+                    "legendFormat": "process",
+                    "refId": "B"
+                },
+                {
+                    "expr": "avg_over_time(process_cpu_usage{application=\"$application\", instance=\"$instance\"}[1h])",
+                    "format": "time_series",
+                    "hide": false,
+                    "intervalFactor": 1,
+                    "legendFormat": "process-1h",
+                    "refId": "C"
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "CPU",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["short", "short"],
+            "yaxes": [
+                {
+                    "decimals": 1,
+                    "format": "percentunit",
+                    "label": "",
+                    "logBase": 1,
+                    "max": "1",
+                    "min": 0,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 6,
+                "x": 6,
+                "y": 24
+            },
+            "id": 93,
+            "legend": {
+                "avg": false,
+                "current": true,
+                "max": true,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "system_load_average_1m{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "system-1m",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 2400
+                },
+                {
+                    "expr": "",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "refId": "B"
+                },
+                {
+                    "expr": "system_cpu_count{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "cpu",
+                    "refId": "C"
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Load",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["short", "short"],
+            "yaxes": [
+                {
+                    "decimals": 1,
+                    "format": "short",
+                    "label": "",
+                    "logBase": 1,
+                    "max": null,
+                    "min": 0,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 6,
+                "x": 12,
+                "y": 24
+            },
+            "id": 32,
+            "legend": {
+                "avg": false,
+                "current": true,
+                "max": true,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "jvm_threads_live{application=\"$application\", instance=\"$instance\"} or jvm_threads_live_threads{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "live",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 2400
+                },
+                {
+                    "expr": "jvm_threads_daemon{application=\"$application\", instance=\"$instance\"} or jvm_threads_daemon_threads{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "daemon",
+                    "metric": "",
+                    "refId": "B",
+                    "step": 2400
+                },
+                {
+                    "expr": "jvm_threads_peak{application=\"$application\", instance=\"$instance\"} or jvm_threads_peak_threads{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "peak",
+                    "refId": "C",
+                    "step": 2400
+                },
+                {
+                    "expr": "process_threads{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "process",
+                    "refId": "D",
+                    "step": 2400
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Threads",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["short", "short"],
+            "yaxes": [
+                {
+                    "decimals": 0,
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": 0,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {
+                "blocked": "#bf1b00",
+                "new": "#fce2de",
+                "runnable": "#7eb26d",
+                "terminated": "#511749",
+                "timed-waiting": "#c15c17",
+                "waiting": "#eab839"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 1,
+            "gridPos": {
+                "h": 7,
+                "w": 6,
+                "x": 18,
+                "y": 24
+            },
+            "id": 124,
+            "legend": {
+                "alignAsTable": false,
+                "avg": false,
+                "current": true,
+                "max": true,
+                "min": false,
+                "rightSide": false,
+                "show": true,
+                "total": false,
+                "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "jvm_threads_states_threads{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "{{state}}",
+                    "refId": "A"
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Thread States",
+            "tooltip": {
+                "shared": true,
+                "sort": 0,
+                "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "yaxes": [
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {
+                "debug": "#1F78C1",
+                "error": "#BF1B00",
+                "info": "#508642",
+                "trace": "#6ED0E0",
+                "warn": "#EAB839"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 18,
+                "x": 0,
+                "y": 31
+            },
+            "height": "",
+            "id": 91,
+            "legend": {
+                "alignAsTable": false,
+                "avg": false,
+                "current": true,
+                "hideEmpty": false,
+                "hideZero": false,
+                "max": true,
+                "min": false,
+                "rightSide": false,
+                "show": true,
+                "total": false,
+                "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": true,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+                {
+                    "alias": "error",
+                    "yaxis": 1
+                },
+                {
+                    "alias": "warn",
+                    "yaxis": 1
+                }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "increase(logback_events_total{application=\"$application\", instance=\"$instance\"}[1m])",
+                    "format": "time_series",
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "{{level}}",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 1200
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Log Events (1m)",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "individual"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["short", "short"],
+            "yaxes": [
+                {
+                    "decimals": 0,
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": "0",
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 6,
+                "x": 18,
+                "y": 31
+            },
+            "id": 61,
+            "legend": {
+                "avg": false,
+                "current": true,
+                "max": true,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "process_open_fds{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "intervalFactor": 2,
+                    "legendFormat": "open",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 2400
+                },
+                {
+                    "expr": "process_max_fds{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "intervalFactor": 2,
+                    "legendFormat": "max",
+                    "metric": "",
+                    "refId": "B",
+                    "step": 2400
+                },
+                {
+                    "expr": "process_files_open{application=\"$application\", instance=\"$instance\"} or process_files_open_files{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "open",
+                    "refId": "C"
+                },
+                {
+                    "expr": "process_files_max{application=\"$application\", instance=\"$instance\"} or process_files_max_files{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "max",
+                    "refId": "D"
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "File Descriptors",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["short", "short"],
+            "yaxes": [
+                {
+                    "decimals": 0,
+                    "format": "short",
+                    "label": null,
+                    "logBase": 10,
+                    "max": null,
+                    "min": 0,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "collapsed": false,
+            "gridPos": {
+                "h": 1,
+                "w": 24,
+                "x": 0,
+                "y": 38
+            },
+            "id": 129,
+            "panels": [],
+            "repeat": "persistence_counts",
+            "title": "JVM Memory Pools (Heap)",
+            "type": "row"
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 8,
+                "x": 0,
+                "y": 39
+            },
+            "id": 3,
+            "legend": {
+                "alignAsTable": false,
+                "avg": false,
+                "current": true,
+                "max": true,
+                "min": false,
+                "rightSide": false,
+                "show": true,
+                "total": false,
+                "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 3,
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "repeat": "jvm_memory_pool_heap",
+            "scopedVars": {
+                "jvm_memory_pool_heap": {
+                    "selected": false,
+                    "text": "PS Eden Space",
+                    "value": "PS Eden Space"
+                }
+            },
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_heap\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "used",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 1800
+                },
+                {
+                    "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_heap\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "commited",
+                    "metric": "",
+                    "refId": "B",
+                    "step": 1800
+                },
+                {
+                    "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_heap\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "max",
+                    "metric": "",
+                    "refId": "C",
+                    "step": 1800
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "$jvm_memory_pool_heap",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["mbytes", "short"],
+            "yaxes": [
+                {
+                    "format": "bytes",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": 0,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 8,
+                "x": 8,
+                "y": 39
+            },
+            "id": 134,
+            "legend": {
+                "alignAsTable": false,
+                "avg": false,
+                "current": true,
+                "max": true,
+                "min": false,
+                "rightSide": false,
+                "show": true,
+                "total": false,
+                "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 3,
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "repeat": null,
+            "repeatIteration": 1553765841423,
+            "repeatPanelId": 3,
+            "scopedVars": {
+                "jvm_memory_pool_heap": {
+                    "selected": false,
+                    "text": "PS Old Gen",
+                    "value": "PS Old Gen"
+                }
+            },
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_heap\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "used",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 1800
+                },
+                {
+                    "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_heap\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "commited",
+                    "metric": "",
+                    "refId": "B",
+                    "step": 1800
+                },
+                {
+                    "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_heap\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "max",
+                    "metric": "",
+                    "refId": "C",
+                    "step": 1800
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "$jvm_memory_pool_heap",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["mbytes", "short"],
+            "yaxes": [
+                {
+                    "format": "bytes",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": 0,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 8,
+                "x": 16,
+                "y": 39
+            },
+            "id": 135,
+            "legend": {
+                "alignAsTable": false,
+                "avg": false,
+                "current": true,
+                "max": true,
+                "min": false,
+                "rightSide": false,
+                "show": true,
+                "total": false,
+                "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 3,
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "repeat": null,
+            "repeatIteration": 1553765841423,
+            "repeatPanelId": 3,
+            "scopedVars": {
+                "jvm_memory_pool_heap": {
+                    "selected": false,
+                    "text": "PS Survivor Space",
+                    "value": "PS Survivor Space"
+                }
+            },
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_heap\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "used",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 1800
+                },
+                {
+                    "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_heap\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "commited",
+                    "metric": "",
+                    "refId": "B",
+                    "step": 1800
+                },
+                {
+                    "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_heap\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "max",
+                    "metric": "",
+                    "refId": "C",
+                    "step": 1800
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "$jvm_memory_pool_heap",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["mbytes", "short"],
+            "yaxes": [
+                {
+                    "format": "bytes",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": 0,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "collapsed": false,
+            "gridPos": {
+                "h": 1,
+                "w": 24,
+                "x": 0,
+                "y": 46
+            },
+            "id": 130,
+            "panels": [],
+            "repeat": null,
+            "title": "JVM Memory Pools (Non-Heap)",
+            "type": "row"
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 8,
+                "x": 0,
+                "y": 47
+            },
+            "id": 78,
+            "legend": {
+                "alignAsTable": false,
+                "avg": false,
+                "current": true,
+                "max": true,
+                "min": false,
+                "rightSide": false,
+                "show": true,
+                "total": false,
+                "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 3,
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "repeat": "jvm_memory_pool_nonheap",
+            "scopedVars": {
+                "jvm_memory_pool_nonheap": {
+                    "selected": false,
+                    "text": "Metaspace",
+                    "value": "Metaspace"
+                }
+            },
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_nonheap\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "used",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 1800
+                },
+                {
+                    "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_nonheap\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "commited",
+                    "metric": "",
+                    "refId": "B",
+                    "step": 1800
+                },
+                {
+                    "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_nonheap\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "max",
+                    "metric": "",
+                    "refId": "C",
+                    "step": 1800
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "$jvm_memory_pool_nonheap",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["mbytes", "short"],
+            "yaxes": [
+                {
+                    "format": "bytes",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": 0,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 8,
+                "x": 8,
+                "y": 47
+            },
+            "id": 136,
+            "legend": {
+                "alignAsTable": false,
+                "avg": false,
+                "current": true,
+                "max": true,
+                "min": false,
+                "rightSide": false,
+                "show": true,
+                "total": false,
+                "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 3,
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "repeat": null,
+            "repeatIteration": 1553765841423,
+            "repeatPanelId": 78,
+            "scopedVars": {
+                "jvm_memory_pool_nonheap": {
+                    "selected": false,
+                    "text": "Compressed Class Space",
+                    "value": "Compressed Class Space"
+                }
+            },
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_nonheap\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "used",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 1800
+                },
+                {
+                    "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_nonheap\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "commited",
+                    "metric": "",
+                    "refId": "B",
+                    "step": 1800
+                },
+                {
+                    "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_nonheap\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "max",
+                    "metric": "",
+                    "refId": "C",
+                    "step": 1800
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "$jvm_memory_pool_nonheap",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["mbytes", "short"],
+            "yaxes": [
+                {
+                    "format": "bytes",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": 0,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 8,
+                "x": 16,
+                "y": 47
+            },
+            "id": 137,
+            "legend": {
+                "alignAsTable": false,
+                "avg": false,
+                "current": true,
+                "max": true,
+                "min": false,
+                "rightSide": false,
+                "show": true,
+                "total": false,
+                "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 3,
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "repeat": null,
+            "repeatIteration": 1553765841423,
+            "repeatPanelId": 78,
+            "scopedVars": {
+                "jvm_memory_pool_nonheap": {
+                    "selected": false,
+                    "text": "Code Cache",
+                    "value": "Code Cache"
+                }
+            },
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_nonheap\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "used",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 1800
+                },
+                {
+                    "expr": "jvm_memory_committed_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_nonheap\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "commited",
+                    "metric": "",
+                    "refId": "B",
+                    "step": 1800
+                },
+                {
+                    "expr": "jvm_memory_max_bytes{application=\"$application\", instance=\"$instance\", id=\"$jvm_memory_pool_nonheap\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "max",
+                    "metric": "",
+                    "refId": "C",
+                    "step": 1800
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "$jvm_memory_pool_nonheap",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["mbytes", "short"],
+            "yaxes": [
+                {
+                    "format": "bytes",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": 0,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "collapsed": false,
+            "gridPos": {
+                "h": 1,
+                "w": 24,
+                "x": 0,
+                "y": 54
+            },
+            "id": 131,
+            "panels": [],
+            "repeat": null,
+            "title": "Garbage Collection",
+            "type": "row"
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 1,
+            "gridPos": {
+                "h": 7,
+                "w": 8,
+                "x": 0,
+                "y": 55
+            },
+            "id": 98,
+            "legend": {
+                "avg": false,
+                "current": false,
+                "max": false,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": false
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "rate(jvm_gc_pause_seconds_count{application=\"$application\", instance=\"$instance\"}[1m])",
+                    "format": "time_series",
+                    "hide": false,
+                    "intervalFactor": 2,
+                    "legendFormat": "{{action}} ({{cause}})",
+                    "refId": "A"
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Collections",
+            "tooltip": {
+                "shared": true,
+                "sort": 0,
+                "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "yaxes": [
+                {
+                    "format": "ops",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": "0",
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": "",
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 1,
+            "gridPos": {
+                "h": 7,
+                "w": 8,
+                "x": 8,
+                "y": 55
+            },
+            "id": 101,
+            "legend": {
+                "avg": false,
+                "current": false,
+                "max": false,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": false
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "rate(jvm_gc_pause_seconds_sum{application=\"$application\", instance=\"$instance\"}[1m])/rate(jvm_gc_pause_seconds_count{application=\"$application\", instance=\"$instance\"}[1m])",
+                    "format": "time_series",
+                    "hide": false,
+                    "instant": false,
+                    "intervalFactor": 1,
+                    "legendFormat": "avg {{action}} ({{cause}})",
+                    "refId": "A"
+                },
+                {
+                    "expr": "jvm_gc_pause_seconds_max{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "hide": false,
+                    "instant": false,
+                    "intervalFactor": 1,
+                    "legendFormat": "max {{action}} ({{cause}})",
+                    "refId": "B"
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Pause Durations",
+            "tooltip": {
+                "shared": true,
+                "sort": 0,
+                "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "yaxes": [
+                {
+                    "format": "s",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": "0",
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": "",
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 1,
+            "gridPos": {
+                "h": 7,
+                "w": 8,
+                "x": 16,
+                "y": 55
+            },
+            "id": 99,
+            "legend": {
+                "avg": false,
+                "current": false,
+                "max": false,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": false
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "rate(jvm_gc_memory_allocated_bytes_total{application=\"$application\", instance=\"$instance\"}[1m])",
+                    "format": "time_series",
+                    "interval": "",
+                    "intervalFactor": 1,
+                    "legendFormat": "allocated",
+                    "refId": "A"
+                },
+                {
+                    "expr": "rate(jvm_gc_memory_promoted_bytes_total{application=\"$application\", instance=\"$instance\"}[1m])",
+                    "format": "time_series",
+                    "interval": "",
+                    "intervalFactor": 1,
+                    "legendFormat": "promoted",
+                    "refId": "B"
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Allocated/Promoted",
+            "tooltip": {
+                "shared": true,
+                "sort": 0,
+                "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "yaxes": [
+                {
+                    "format": "bytes",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": "0",
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "collapsed": false,
+            "gridPos": {
+                "h": 1,
+                "w": 24,
+                "x": 0,
+                "y": 62
+            },
+            "id": 132,
+            "panels": [],
+            "repeat": null,
+            "title": "Classloading",
+            "type": "row"
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 12,
+                "x": 0,
+                "y": 63
+            },
+            "id": 37,
+            "legend": {
+                "avg": false,
+                "current": false,
+                "max": false,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": false
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "jvm_classes_loaded{application=\"$application\", instance=\"$instance\"} or jvm_classes_loaded_classes{application=\"$application\", instance=\"$instance\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "loaded",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 1200
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Classes loaded",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["short", "short"],
+            "yaxes": [
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": 0,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 12,
+                "x": 12,
+                "y": 63
+            },
+            "id": 38,
+            "legend": {
+                "avg": false,
+                "current": false,
+                "max": false,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": false
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "delta(jvm_classes_loaded{application=\"$application\",instance=\"$instance\"}[5m]) or delta(jvm_classes_loaded_classes{application=\"$application\",instance=\"$instance\"}[5m])",
+                    "format": "time_series",
+                    "hide": false,
+                    "interval": "",
+                    "intervalFactor": 2,
+                    "legendFormat": "delta",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 1200
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Class delta (5m)",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["ops", "short"],
+            "yaxes": [
+                {
+                    "decimals": null,
+                    "format": "short",
+                    "label": "",
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "collapsed": false,
+            "gridPos": {
+                "h": 1,
+                "w": 24,
+                "x": 0,
+                "y": 70
+            },
+            "id": 133,
+            "panels": [],
+            "repeat": null,
+            "title": "Buffer Pools",
+            "type": "row"
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 6,
+                "x": 0,
+                "y": 71
+            },
+            "id": 33,
+            "legend": {
+                "avg": false,
+                "current": false,
+                "max": false,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": false
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "jvm_buffer_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"direct\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "used",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 2400
+                },
+                {
+                    "expr": "jvm_buffer_total_capacity_bytes{application=\"$application\", instance=\"$instance\", id=\"direct\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "capacity",
+                    "metric": "",
+                    "refId": "B",
+                    "step": 2400
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Direct Buffers",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["short", "short"],
+            "yaxes": [
+                {
+                    "format": "bytes",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": 0,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 6,
+                "x": 6,
+                "y": 71
+            },
+            "id": 83,
+            "legend": {
+                "avg": false,
+                "current": false,
+                "max": false,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": false
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "jvm_buffer_count{application=\"$application\", instance=\"$instance\", id=\"direct\"} or jvm_buffer_count_buffers{application=\"$application\", instance=\"$instance\", id=\"direct\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "count",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 2400
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Direct Buffers",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["short", "short"],
+            "yaxes": [
+                {
+                    "decimals": 0,
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": 0,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 6,
+                "x": 12,
+                "y": 71
+            },
+            "id": 85,
+            "legend": {
+                "avg": false,
+                "current": false,
+                "max": false,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": false
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "jvm_buffer_memory_used_bytes{application=\"$application\", instance=\"$instance\", id=\"mapped\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "used",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 2400
+                },
+                {
+                    "expr": "jvm_buffer_total_capacity_bytes{application=\"$application\", instance=\"$instance\", id=\"mapped\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "capacity",
+                    "metric": "",
+                    "refId": "B",
+                    "step": 2400
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Mapped Buffers",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["short", "short"],
+            "yaxes": [
+                {
+                    "format": "bytes",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": 0,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        },
+        {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "grid": {
+                "leftLogBase": 1,
+                "leftMax": null,
+                "leftMin": null,
+                "rightLogBase": 1,
+                "rightMax": null,
+                "rightMin": null
+            },
+            "gridPos": {
+                "h": 7,
+                "w": 6,
+                "x": 18,
+                "y": 71
+            },
+            "id": 84,
+            "legend": {
+                "avg": false,
+                "current": false,
+                "max": false,
+                "min": false,
+                "show": true,
+                "total": false,
+                "values": false
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "paceLength": 10,
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+                {
+                    "expr": "jvm_buffer_count{application=\"$application\", instance=\"$instance\", id=\"mapped\"} or jvm_buffer_count_buffers{application=\"$application\", instance=\"$instance\", id=\"mapped\"}",
+                    "format": "time_series",
+                    "intervalFactor": 2,
+                    "legendFormat": "count",
+                    "metric": "",
+                    "refId": "A",
+                    "step": 2400
+                }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Mapped Buffers",
+            "tooltip": {
+                "msResolution": false,
+                "shared": true,
+                "sort": 0,
+                "value_type": "cumulative"
+            },
+            "type": "graph",
+            "x-axis": true,
+            "xaxis": {
+                "buckets": null,
+                "mode": "time",
+                "name": null,
+                "show": true,
+                "values": []
+            },
+            "y-axis": true,
+            "y_formats": ["short", "short"],
+            "yaxes": [
+                {
+                    "decimals": 0,
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": 0,
+                    "show": true
+                },
+                {
+                    "format": "short",
+                    "label": null,
+                    "logBase": 1,
+                    "max": null,
+                    "min": null,
+                    "show": true
+                }
+            ],
+            "yaxis": {
+                "align": false,
+                "alignLevel": null
+            }
+        }
+    ],
+    "refresh": "10s",
+    "schemaVersion": 18,
+    "style": "dark",
+    "tags": [],
+    "templating": {
+        "list": [
+            {
+                "allValue": null,
+                "current": {
+                    "text": "test",
+                    "value": "test"
+                },
+                "datasource": "Prometheus",
+                "definition": "",
+                "hide": 0,
+                "includeAll": false,
+                "label": "Application",
+                "multi": false,
+                "name": "application",
+                "options": [],
+                "query": "label_values(application)",
+                "refresh": 2,
+                "regex": "",
+                "skipUrlSync": false,
+                "sort": 0,
+                "tagValuesQuery": "",
+                "tags": [],
+                "tagsQuery": "",
+                "type": "query",
+                "useTags": false
+            },
+            {
+                "allFormat": "glob",
+                "allValue": null,
+                "current": {
+                    "text": "localhost:8080",
+                    "value": "localhost:8080"
+                },
+                "datasource": "Prometheus",
+                "definition": "",
+                "hide": 0,
+                "includeAll": false,
+                "label": "Instance",
+                "multi": false,
+                "multiFormat": "glob",
+                "name": "instance",
+                "options": [],
+                "query": "label_values(jvm_memory_used_bytes{application=\"$application\"}, instance)",
+                "refresh": 2,
+                "regex": "",
+                "skipUrlSync": false,
+                "sort": 0,
+                "tagValuesQuery": "",
+                "tags": [],
+                "tagsQuery": "",
+                "type": "query",
+                "useTags": false
+            },
+            {
+                "allFormat": "glob",
+                "allValue": null,
+                "current": {
+                    "text": "All",
+                    "value": "$__all"
+                },
+                "datasource": "Prometheus",
+                "definition": "",
+                "hide": 0,
+                "includeAll": true,
+                "label": "JVM Memory Pools Heap",
+                "multi": false,
+                "multiFormat": "glob",
+                "name": "jvm_memory_pool_heap",
+                "options": [],
+                "query": "label_values(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"heap\"},id)",
+                "refresh": 1,
+                "regex": "",
+                "skipUrlSync": false,
+                "sort": 1,
+                "tagValuesQuery": "",
+                "tags": [],
+                "tagsQuery": "",
+                "type": "query",
+                "useTags": false
+            },
+            {
+                "allFormat": "glob",
+                "allValue": null,
+                "current": {
+                    "text": "All",
+                    "value": "$__all"
+                },
+                "datasource": "Prometheus",
+                "definition": "",
+                "hide": 0,
+                "includeAll": true,
+                "label": "JVM Memory Pools Non-Heap",
+                "multi": false,
+                "multiFormat": "glob",
+                "name": "jvm_memory_pool_nonheap",
+                "options": [],
+                "query": "label_values(jvm_memory_used_bytes{application=\"$application\", instance=\"$instance\", area=\"nonheap\"},id)",
+                "refresh": 1,
+                "regex": "",
+                "skipUrlSync": false,
+                "sort": 2,
+                "tagValuesQuery": "",
+                "tags": [],
+                "tagsQuery": "",
+                "type": "query",
+                "useTags": false
+            }
+        ]
+    },
+    "time": {
+        "from": "now-30m",
+        "to": "now"
+    },
+    "timepicker": {
+        "now": true,
+        "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
+        "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
+    },
+    "timezone": "browser",
+    "title": "JVM (Micrometer)",
+    "uid": "Ud1CFe3iz",
+    "version": 1
+}
diff --git a/jhipster-6/bookstore-monolith/src/main/docker/grafana/provisioning/dashboards/dashboard.yml b/jhipster-6/bookstore-monolith/src/main/docker/grafana/provisioning/dashboards/dashboard.yml
new file mode 100644
index 0000000000..5b46e1f4ca
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/main/docker/grafana/provisioning/dashboards/dashboard.yml
@@ -0,0 +1,11 @@
+apiVersion: 1
+
+providers:
+    - name: 'Prometheus'
+      orgId: 1
+      folder: ''
+      type: file
+      disableDeletion: false
+      editable: true
+      options:
+          path: /etc/grafana/provisioning/dashboards
diff --git a/jhipster-6/bookstore-monolith/src/main/docker/grafana/provisioning/datasources/datasource.yml b/jhipster-6/bookstore-monolith/src/main/docker/grafana/provisioning/datasources/datasource.yml
new file mode 100644
index 0000000000..20506dab30
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/main/docker/grafana/provisioning/datasources/datasource.yml
@@ -0,0 +1,50 @@
+apiVersion: 1
+
+# list of datasources that should be deleted from the database
+deleteDatasources:
+    - name: Prometheus
+      orgId: 1
+
+# list of datasources to insert/update depending
+# whats available in the database
+datasources:
+    # <string, required> name of the datasource. Required
+    - name: Prometheus
+      # <string, required> datasource type. Required
+      type: prometheus
+      # <string, required> access mode. direct or proxy. Required
+      access: proxy
+      # <int> org id. will default to orgId 1 if not specified
+      orgId: 1
+      # <string> url
+      # On MacOS, replace localhost by host.docker.internal
+      url: http://localhost:9090
+      # <string> database password, if used
+      password:
+      # <string> database user, if used
+      user:
+      # <string> database name, if used
+      database:
+      # <bool> enable/disable basic auth
+      basicAuth: false
+      # <string> basic auth username
+      basicAuthUser: admin
+      # <string> basic auth password
+      basicAuthPassword: admin
+      # <bool> enable/disable with credentials headers
+      withCredentials:
+      # <bool> mark as default datasource. Max one per org
+      isDefault: true
+      # <map> fields that will be converted to json and stored in json_data
+      jsonData:
+          graphiteVersion: '1.1'
+          tlsAuth: false
+          tlsAuthWithCACert: false
+      # <string> json object of data that will be encrypted.
+      secureJsonData:
+          tlsCACert: '...'
+          tlsClientCert: '...'
+          tlsClientKey: '...'
+      version: 1
+      # <bool> allow users to edit datasources from the UI.
+      editable: true
diff --git a/jhipster-6/bookstore-monolith/src/main/docker/monitoring.yml b/jhipster-6/bookstore-monolith/src/main/docker/monitoring.yml
new file mode 100644
index 0000000000..fa75668445
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/main/docker/monitoring.yml
@@ -0,0 +1,26 @@
+version: '3'
+services:
+    bookstore-prometheus:
+        image: prom/prometheus:v2.9.2
+        volumes:
+            - ./prometheus/:/etc/prometheus/
+        command:
+            - '--config.file=/etc/prometheus/prometheus.yml'
+        ports:
+            - 9090:9090
+        # On MacOS, remove next line and replace localhost by host.docker.internal in prometheus/prometheus.yml and
+        # grafana/provisioning/datasources/datasource.yml
+        network_mode: 'host' # to test locally running service
+    bookstore-grafana:
+        image: grafana/grafana:6.1.4
+        volumes:
+            - ./grafana/provisioning/:/etc/grafana/provisioning/
+        environment:
+            - GF_SECURITY_ADMIN_PASSWORD=admin
+            - GF_USERS_ALLOW_SIGN_UP=false
+            - GF_INSTALL_PLUGINS=grafana-piechart-panel
+        ports:
+            - 3000:3000
+        # On MacOS, remove next line and replace localhost by host.docker.internal in prometheus/prometheus.yml and
+        # grafana/provisioning/datasources/datasource.yml
+        network_mode: 'host' # to test locally running service
diff --git a/jhipster-5/bookstore-monolith/src/main/docker/mysql.yml b/jhipster-6/bookstore-monolith/src/main/docker/mysql.yml
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/docker/mysql.yml
rename to jhipster-6/bookstore-monolith/src/main/docker/mysql.yml
diff --git a/jhipster-6/bookstore-monolith/src/main/docker/prometheus/prometheus.yml b/jhipster-6/bookstore-monolith/src/main/docker/prometheus/prometheus.yml
new file mode 100644
index 0000000000..73f4c959da
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/main/docker/prometheus/prometheus.yml
@@ -0,0 +1,26 @@
+# Sample global config for monitoring JHipster applications
+global:
+    scrape_interval: 15s # By default, scrape targets every 15 seconds.
+    evaluation_interval: 15s # By default, scrape targets every 15 seconds.
+    # scrape_timeout is set to the global default (10s).
+
+    # Attach these labels to any time series or alerts when communicating with
+    # external systems (federation, remote storage, Alertmanager).
+    external_labels:
+        monitor: 'jhipster'
+
+# A scrape configuration containing exactly one endpoint to scrape:
+# Here it's Prometheus itself.
+scrape_configs:
+    # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
+    - job_name: 'prometheus'
+
+      # Override the global default and scrape targets from this job every 5 seconds.
+      scrape_interval: 5s
+
+      # scheme defaults to 'http'.
+      metrics_path: /management/prometheus
+      static_configs:
+          - targets:
+                # On MacOS, replace localhost by host.docker.internal
+                - localhost:8080
diff --git a/jhipster-5/bookstore-monolith/src/main/docker/sonar.yml b/jhipster-6/bookstore-monolith/src/main/docker/sonar.yml
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/docker/sonar.yml
rename to jhipster-6/bookstore-monolith/src/main/docker/sonar.yml
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/ApplicationWebXml.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/ApplicationWebXml.java
similarity index 89%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/ApplicationWebXml.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/ApplicationWebXml.java
index ca65727e77..32f28a8e9e 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/ApplicationWebXml.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/ApplicationWebXml.java
@@ -1,6 +1,6 @@
-package com.baeldung.jhipster5;
+package com.baeldung.jhipster6;
 
-import com.baeldung.jhipster5.config.DefaultProfileUtil;
+import com.baeldung.jhipster6.config.DefaultProfileUtil;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/BookstoreApp.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/BookstoreApp.java
similarity index 96%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/BookstoreApp.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/BookstoreApp.java
index e7ca925228..278efb9270 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/BookstoreApp.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/BookstoreApp.java
@@ -1,7 +1,7 @@
-package com.baeldung.jhipster5;
+package com.baeldung.jhipster6;
 
-import com.baeldung.jhipster5.config.ApplicationProperties;
-import com.baeldung.jhipster5.config.DefaultProfileUtil;
+import com.baeldung.jhipster6.config.ApplicationProperties;
+import com.baeldung.jhipster6.config.DefaultProfileUtil;
 
 import io.github.jhipster.config.JHipsterConstants;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/aop/logging/LoggingAspect.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/aop/logging/LoggingAspect.java
similarity index 98%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/aop/logging/LoggingAspect.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/aop/logging/LoggingAspect.java
index 0379637061..1e5a47c12a 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/aop/logging/LoggingAspect.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/aop/logging/LoggingAspect.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.aop.logging;
+package com.baeldung.jhipster6.aop.logging;
 
 import io.github.jhipster.config.JHipsterConstants;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/ApplicationProperties.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/ApplicationProperties.java
similarity index 90%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/ApplicationProperties.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/ApplicationProperties.java
index 4ca3e9bd85..e9bf8bd1a8 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/ApplicationProperties.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/ApplicationProperties.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.config;
+package com.baeldung.jhipster6.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/AsyncConfiguration.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/AsyncConfiguration.java
similarity index 98%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/AsyncConfiguration.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/AsyncConfiguration.java
index 414fe152bf..a245402175 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/AsyncConfiguration.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/AsyncConfiguration.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.config;
+package com.baeldung.jhipster6.config;
 
 import io.github.jhipster.async.ExceptionHandlingAsyncTaskExecutor;
 import io.github.jhipster.config.JHipsterProperties;
@@ -46,7 +46,7 @@ public class AsyncConfiguration implements AsyncConfigurer, SchedulingConfigurer
     public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
         return new SimpleAsyncUncaughtExceptionHandler();
     }
-    
+
     @Override
     public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
         taskRegistrar.setScheduler(scheduledTaskExecutor());
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/CloudDatabaseConfiguration.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/CloudDatabaseConfiguration.java
similarity index 95%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/CloudDatabaseConfiguration.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/CloudDatabaseConfiguration.java
index 887a1bae89..3d57db6559 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/CloudDatabaseConfiguration.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/CloudDatabaseConfiguration.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.config;
+package com.baeldung.jhipster6.config;
 
 import io.github.jhipster.config.JHipsterConstants;
 
@@ -16,7 +16,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 public class CloudDatabaseConfiguration extends AbstractCloudConfig {
 
     private final Logger log = LoggerFactory.getLogger(CloudDatabaseConfiguration.class);
-    
+
     private static final String CLOUD_CONFIGURATION_HIKARI_PREFIX = "spring.datasource.hikari";
 
     @Bean
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/Constants.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/Constants.java
similarity index 89%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/Constants.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/Constants.java
index dd8f717f98..b5d6eba051 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/Constants.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/Constants.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.config;
+package com.baeldung.jhipster6.config;
 
 /**
  * Application constants.
@@ -11,7 +11,7 @@ public final class Constants {
     public static final String SYSTEM_ACCOUNT = "system";
     public static final String ANONYMOUS_USER = "anonymoususer";
     public static final String DEFAULT_LANGUAGE = "en";
-    
+
     private Constants() {
     }
 }
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/DatabaseConfiguration.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/DatabaseConfiguration.java
similarity index 97%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/DatabaseConfiguration.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/DatabaseConfiguration.java
index 007b1d6431..2aa8ae2e82 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/DatabaseConfiguration.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/DatabaseConfiguration.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.config;
+package com.baeldung.jhipster6.config;
 
 import io.github.jhipster.config.JHipsterConstants;
 import io.github.jhipster.config.h2.H2ConfigurationHelper;
@@ -42,7 +42,7 @@ public class DatabaseConfiguration {
         log.debug("H2 database is available on port {}", port);
         return H2ConfigurationHelper.createServer(port);
     }
-	
+
     private String getValidPortForH2() {
         int port = Integer.parseInt(env.getProperty("server.port"));
         if (port < 10000) {
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/DateTimeFormatConfiguration.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/DateTimeFormatConfiguration.java
similarity index 94%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/DateTimeFormatConfiguration.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/DateTimeFormatConfiguration.java
index 4415ce0b1e..eeb4b55491 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/DateTimeFormatConfiguration.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/DateTimeFormatConfiguration.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.config;
+package com.baeldung.jhipster6.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.format.FormatterRegistry;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/DefaultProfileUtil.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/DefaultProfileUtil.java
similarity index 97%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/DefaultProfileUtil.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/DefaultProfileUtil.java
index 2cfe16a1ae..02b3ce9db0 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/DefaultProfileUtil.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/DefaultProfileUtil.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.config;
+package com.baeldung.jhipster6.config;
 
 import io.github.jhipster.config.JHipsterConstants;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/JacksonConfiguration.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/JacksonConfiguration.java
similarity index 97%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/JacksonConfiguration.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/JacksonConfiguration.java
index 119cd5f0c6..68fb92ef2e 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/JacksonConfiguration.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/JacksonConfiguration.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.config;
+package com.baeldung.jhipster6.config;
 
 import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/LiquibaseConfiguration.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/LiquibaseConfiguration.java
similarity index 98%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/LiquibaseConfiguration.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/LiquibaseConfiguration.java
index 4b2a7b1e66..2f82a1f447 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/LiquibaseConfiguration.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/LiquibaseConfiguration.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.config;
+package com.baeldung.jhipster6.config;
 
 import javax.sql.DataSource;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/LocaleConfiguration.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/LocaleConfiguration.java
similarity index 96%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/LocaleConfiguration.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/LocaleConfiguration.java
index 256c6b77b9..d73198e5bb 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/LocaleConfiguration.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/LocaleConfiguration.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.config;
+package com.baeldung.jhipster6.config;
 
 import io.github.jhipster.config.locale.AngularCookieLocaleResolver;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/LoggingAspectConfiguration.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/LoggingAspectConfiguration.java
similarity index 81%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/LoggingAspectConfiguration.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/LoggingAspectConfiguration.java
index 25d7ba3792..1638234a89 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/LoggingAspectConfiguration.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/LoggingAspectConfiguration.java
@@ -1,6 +1,6 @@
-package com.baeldung.jhipster5.config;
+package com.baeldung.jhipster6.config;
 
-import com.baeldung.jhipster5.aop.logging.LoggingAspect;
+import com.baeldung.jhipster6.aop.logging.LoggingAspect;
 
 import io.github.jhipster.config.JHipsterConstants;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/LoggingConfiguration.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/LoggingConfiguration.java
similarity index 99%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/LoggingConfiguration.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/LoggingConfiguration.java
index 9402a1bc36..893a16876f 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/LoggingConfiguration.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/LoggingConfiguration.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.config;
+package com.baeldung.jhipster6.config;
 
 import java.net.InetSocketAddress;
 import java.util.Iterator;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/SecurityConfiguration.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/SecurityConfiguration.java
similarity index 94%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/SecurityConfiguration.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/SecurityConfiguration.java
index f07944271e..f42ba55c20 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/SecurityConfiguration.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/SecurityConfiguration.java
@@ -1,7 +1,10 @@
-package com.baeldung.jhipster5.config;
+package com.baeldung.jhipster6.config;
 
-import com.baeldung.jhipster5.security.*;
-import com.baeldung.jhipster5.security.jwt.*;
+import com.baeldung.jhipster6.security.*;
+import com.baeldung.jhipster6.security.jwt.*;
+import com.baeldung.jhipster6.security.AuthoritiesConstants;
+import com.baeldung.jhipster6.security.jwt.JWTConfigurer;
+import com.baeldung.jhipster6.security.jwt.TokenProvider;
 
 import org.springframework.beans.factory.BeanInitializationException;
 import org.springframework.context.annotation.Bean;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/WebConfigurer.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/WebConfigurer.java
similarity index 79%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/WebConfigurer.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/WebConfigurer.java
index 26cfc92487..8bed192c9f 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/WebConfigurer.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/WebConfigurer.java
@@ -1,20 +1,18 @@
-package com.baeldung.jhipster5.config;
+package com.baeldung.jhipster6.config;
 
 import io.github.jhipster.config.JHipsterConstants;
 import io.github.jhipster.config.JHipsterProperties;
-import io.github.jhipster.config.h2.H2ConfigurationHelper;
 import io.github.jhipster.web.filter.CachingHttpHeadersFilter;
-import io.undertow.UndertowOptions;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
 import org.springframework.boot.web.server.*;
 import org.springframework.boot.web.servlet.ServletContextInitializer;
 import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
+import org.springframework.core.env.Profiles;
 import org.springframework.http.MediaType;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
@@ -42,7 +40,6 @@ public class WebConfigurer implements ServletContextInitializer, WebServerFactor
     private final JHipsterProperties jHipsterProperties;
 
     public WebConfigurer(Environment env, JHipsterProperties jHipsterProperties) {
-
         this.env = env;
         this.jHipsterProperties = jHipsterProperties;
     }
@@ -53,12 +50,9 @@ public class WebConfigurer implements ServletContextInitializer, WebServerFactor
             log.info("Web application configuration, using profiles: {}", (Object[]) env.getActiveProfiles());
         }
         EnumSet<DispatcherType> disps = EnumSet.of(DispatcherType.REQUEST, DispatcherType.FORWARD, DispatcherType.ASYNC);
-        if (env.acceptsProfiles(JHipsterConstants.SPRING_PROFILE_PRODUCTION)) {
+        if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_PRODUCTION))) {
             initCachingHttpHeadersFilter(servletContext, disps);
         }
-        if (env.acceptsProfiles(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT)) {
-            initH2Console(servletContext);
-        }
         log.info("Web application fully configured");
     }
 
@@ -70,20 +64,6 @@ public class WebConfigurer implements ServletContextInitializer, WebServerFactor
         setMimeMappings(server);
         // When running in an IDE or with ./mvnw spring-boot:run, set location of the static web assets.
         setLocationForStaticAssets(server);
-
-        /*
-         * Enable HTTP/2 for Undertow - https://twitter.com/ankinson/status/829256167700492288
-         * HTTP/2 requires HTTPS, so HTTP requests will fallback to HTTP/1.1.
-         * See the JHipsterProperties class and your application-*.yml configuration files
-         * for more information.
-         */
-        if (jHipsterProperties.getHttp().getVersion().equals(JHipsterProperties.Http.Version.V_2_0) &&
-            server instanceof UndertowServletWebServerFactory) {
-
-            ((UndertowServletWebServerFactory) server)
-                .addBuilderCustomizers(builder ->
-                    builder.setServerOption(UndertowOptions.ENABLE_HTTP2, true));
-        }
     }
 
     private void setMimeMappings(WebServerFactory server) {
@@ -103,7 +83,7 @@ public class WebConfigurer implements ServletContextInitializer, WebServerFactor
             ConfigurableServletWebServerFactory servletWebServer = (ConfigurableServletWebServerFactory) server;
             File root;
             String prefixPath = resolvePathPrefix();
-            root = new File(prefixPath + "target/www/");
+            root = new File(prefixPath + "target/classes/static/");
             if (root.exists() && root.isDirectory()) {
                 servletWebServer.setDocumentRoot(root);
             }
@@ -134,7 +114,7 @@ public class WebConfigurer implements ServletContextInitializer, WebServerFactor
      * Initializes the caching HTTP Headers Filter.
      */
     private void initCachingHttpHeadersFilter(ServletContext servletContext,
-                                              EnumSet<DispatcherType> disps) {
+        EnumSet<DispatcherType> disps) {
         log.debug("Registering Caching HTTP Headers Filter");
         FilterRegistration.Dynamic cachingHttpHeadersFilter =
             servletContext.addFilter("cachingHttpHeadersFilter",
@@ -159,12 +139,4 @@ public class WebConfigurer implements ServletContextInitializer, WebServerFactor
         return new CorsFilter(source);
     }
 
-    /**
-     * Initializes H2 console.
-     */
-    private void initH2Console(ServletContext servletContext) {
-        log.debug("Initialize H2 console");
-        H2ConfigurationHelper.initH2Console(servletContext);
-    }
-
 }
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/audit/AuditEventConverter.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/audit/AuditEventConverter.java
similarity index 96%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/audit/AuditEventConverter.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/audit/AuditEventConverter.java
index 6dd87bb82d..fee87ffb96 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/audit/AuditEventConverter.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/audit/AuditEventConverter.java
@@ -1,6 +1,6 @@
-package com.baeldung.jhipster5.config.audit;
+package com.baeldung.jhipster6.config.audit;
 
-import com.baeldung.jhipster5.domain.PersistentAuditEvent;
+import com.baeldung.jhipster6.domain.PersistentAuditEvent;
 
 import org.springframework.boot.actuate.audit.AuditEvent;
 import org.springframework.security.web.authentication.WebAuthenticationDetails;
diff --git a/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/audit/package-info.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/audit/package-info.java
new file mode 100644
index 0000000000..ce7911db40
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/audit/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Audit specific code.
+ */
+package com.baeldung.jhipster6.config.audit;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/package-info.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/package-info.java
similarity index 55%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/package-info.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/package-info.java
index 868155ce9f..2f6261950a 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/config/package-info.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/config/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Spring Framework configuration files.
  */
-package com.baeldung.jhipster5.config;
+package com.baeldung.jhipster6.config;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/domain/AbstractAuditingEntity.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/domain/AbstractAuditingEntity.java
similarity index 98%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/domain/AbstractAuditingEntity.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/domain/AbstractAuditingEntity.java
index 861674ccc9..b3881af03b 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/domain/AbstractAuditingEntity.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/domain/AbstractAuditingEntity.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.domain;
+package com.baeldung.jhipster6.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.hibernate.envers.Audited;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/domain/Authority.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/domain/Authority.java
similarity index 96%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/domain/Authority.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/domain/Authority.java
index fbd4596fc7..81d2b930cb 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/domain/Authority.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/domain/Authority.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.domain;
+package com.baeldung.jhipster6.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/domain/Book.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/domain/Book.java
similarity index 98%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/domain/Book.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/domain/Book.java
index 16771d9e09..14c5ec3396 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/domain/Book.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/domain/Book.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.domain;
+package com.baeldung.jhipster6.domain;
 
 
 
@@ -17,7 +17,7 @@ import java.util.Objects;
 public class Book implements Serializable {
 
     private static final long serialVersionUID = 1L;
-    
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/domain/PersistentAuditEvent.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/domain/PersistentAuditEvent.java
similarity index 98%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/domain/PersistentAuditEvent.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/domain/PersistentAuditEvent.java
index 15e2eeda5a..f953eeded9 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/domain/PersistentAuditEvent.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/domain/PersistentAuditEvent.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.domain;
+package com.baeldung.jhipster6.domain;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/domain/User.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/domain/User.java
similarity index 98%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/domain/User.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/domain/User.java
index ff12d1ca9c..d1ff6c33fa 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/domain/User.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/domain/User.java
@@ -1,6 +1,6 @@
-package com.baeldung.jhipster5.domain;
+package com.baeldung.jhipster6.domain;
 
-import com.baeldung.jhipster5.config.Constants;
+import com.baeldung.jhipster6.config.Constants;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.apache.commons.lang3.StringUtils;
diff --git a/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/domain/package-info.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/domain/package-info.java
new file mode 100644
index 0000000000..9063a204d5
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/domain/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * JPA domain objects.
+ */
+package com.baeldung.jhipster6.domain;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/repository/AuthorityRepository.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/repository/AuthorityRepository.java
similarity index 69%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/repository/AuthorityRepository.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/repository/AuthorityRepository.java
index 310735eb57..335631195d 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/repository/AuthorityRepository.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/repository/AuthorityRepository.java
@@ -1,6 +1,6 @@
-package com.baeldung.jhipster5.repository;
+package com.baeldung.jhipster6.repository;
 
-import com.baeldung.jhipster5.domain.Authority;
+import com.baeldung.jhipster6.domain.Authority;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/repository/BookRepository.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/repository/BookRepository.java
similarity index 75%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/repository/BookRepository.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/repository/BookRepository.java
index ebd3117e65..0863d1b89b 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/repository/BookRepository.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/repository/BookRepository.java
@@ -1,6 +1,6 @@
-package com.baeldung.jhipster5.repository;
+package com.baeldung.jhipster6.repository;
 
-import com.baeldung.jhipster5.domain.Book;
+import com.baeldung.jhipster6.domain.Book;
 import org.springframework.data.jpa.repository.*;
 import org.springframework.stereotype.Repository;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/repository/CustomAuditEventRepository.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/repository/CustomAuditEventRepository.java
similarity index 94%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/repository/CustomAuditEventRepository.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/repository/CustomAuditEventRepository.java
index faa788ff5f..4e17cfff2b 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/repository/CustomAuditEventRepository.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/repository/CustomAuditEventRepository.java
@@ -1,8 +1,8 @@
-package com.baeldung.jhipster5.repository;
+package com.baeldung.jhipster6.repository;
 
-import com.baeldung.jhipster5.config.Constants;
-import com.baeldung.jhipster5.config.audit.AuditEventConverter;
-import com.baeldung.jhipster5.domain.PersistentAuditEvent;
+import com.baeldung.jhipster6.config.Constants;
+import com.baeldung.jhipster6.config.audit.AuditEventConverter;
+import com.baeldung.jhipster6.domain.PersistentAuditEvent;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/repository/PersistenceAuditEventRepository.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/repository/PersistenceAuditEventRepository.java
similarity index 89%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/repository/PersistenceAuditEventRepository.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/repository/PersistenceAuditEventRepository.java
index 2eb6f3b847..ca0025321e 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/repository/PersistenceAuditEventRepository.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/repository/PersistenceAuditEventRepository.java
@@ -1,6 +1,6 @@
-package com.baeldung.jhipster5.repository;
+package com.baeldung.jhipster6.repository;
 
-import com.baeldung.jhipster5.domain.PersistentAuditEvent;
+import com.baeldung.jhipster6.domain.PersistentAuditEvent;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/repository/UserRepository.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/repository/UserRepository.java
similarity index 93%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/repository/UserRepository.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/repository/UserRepository.java
index 42a5588b22..27fd5fc359 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/repository/UserRepository.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/repository/UserRepository.java
@@ -1,6 +1,6 @@
-package com.baeldung.jhipster5.repository;
+package com.baeldung.jhipster6.repository;
 
-import com.baeldung.jhipster5.domain.User;
+import com.baeldung.jhipster6.domain.User;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
diff --git a/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/repository/package-info.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/repository/package-info.java
new file mode 100644
index 0000000000..949ee586b7
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/repository/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Spring Data JPA repositories.
+ */
+package com.baeldung.jhipster6.repository;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/AuthoritiesConstants.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/AuthoritiesConstants.java
similarity index 88%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/AuthoritiesConstants.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/AuthoritiesConstants.java
index 6ecf44394f..3f1709a6d9 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/AuthoritiesConstants.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/AuthoritiesConstants.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.security;
+package com.baeldung.jhipster6.security;
 
 /**
  * Constants for Spring Security authorities.
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/CustomAuthenticationManager.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/CustomAuthenticationManager.java
similarity index 93%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/CustomAuthenticationManager.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/CustomAuthenticationManager.java
index 0a7dd66b24..092adf1b06 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/CustomAuthenticationManager.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/CustomAuthenticationManager.java
@@ -1,10 +1,10 @@
-package com.baeldung.jhipster5.security;
+package com.baeldung.jhipster6.security;
 
-import com.baeldung.jhipster5.domain.User;
-import com.baeldung.jhipster5.security.dto.LoginRequest;
-import com.baeldung.jhipster5.security.dto.LoginResponse;
-import com.baeldung.jhipster5.service.UserService;
-import com.baeldung.jhipster5.service.dto.UserDTO;
+import com.baeldung.jhipster6.domain.User;
+import com.baeldung.jhipster6.security.dto.LoginRequest;
+import com.baeldung.jhipster6.security.dto.LoginResponse;
+import com.baeldung.jhipster6.service.UserService;
+import com.baeldung.jhipster6.service.dto.UserDTO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/DomainUserDetailsService.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/DomainUserDetailsService.java
similarity index 94%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/DomainUserDetailsService.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/DomainUserDetailsService.java
index d0014096df..3102604ee4 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/DomainUserDetailsService.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/DomainUserDetailsService.java
@@ -1,7 +1,8 @@
-package com.baeldung.jhipster5.security;
+package com.baeldung.jhipster6.security;
+
+import com.baeldung.jhipster6.domain.User;
+import com.baeldung.jhipster6.repository.UserRepository;
 
-import com.baeldung.jhipster5.domain.User;
-import com.baeldung.jhipster5.repository.UserRepository;
 import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/SecurityUtils.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/SecurityUtils.java
similarity index 98%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/SecurityUtils.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/SecurityUtils.java
index 462bb8abc9..a4a1982b3c 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/SecurityUtils.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/SecurityUtils.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.security;
+package com.baeldung.jhipster6.security;
 
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/SpringSecurityAuditorAware.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/SpringSecurityAuditorAware.java
similarity index 83%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/SpringSecurityAuditorAware.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/SpringSecurityAuditorAware.java
index c1d6405ae3..aff636c13c 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/SpringSecurityAuditorAware.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/SpringSecurityAuditorAware.java
@@ -1,6 +1,6 @@
-package com.baeldung.jhipster5.security;
+package com.baeldung.jhipster6.security;
 
-import com.baeldung.jhipster5.config.Constants;
+import com.baeldung.jhipster6.config.Constants;
 
 import java.util.Optional;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/UserNotActivatedException.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/UserNotActivatedException.java
similarity index 92%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/UserNotActivatedException.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/UserNotActivatedException.java
index 4b2d91983c..a1f71f5408 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/UserNotActivatedException.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/UserNotActivatedException.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.security;
+package com.baeldung.jhipster6.security;
 
 import org.springframework.security.core.AuthenticationException;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/dto/LoginRequest.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/dto/LoginRequest.java
similarity index 91%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/dto/LoginRequest.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/dto/LoginRequest.java
index f45c23fa39..1de2638577 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/dto/LoginRequest.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/dto/LoginRequest.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.security.dto;
+package com.baeldung.jhipster6.security.dto;
 
 /**
  * Simple DTO representing a login request to a remote service.
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/dto/LoginResponse.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/dto/LoginResponse.java
similarity index 95%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/dto/LoginResponse.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/dto/LoginResponse.java
index ad1fe37a2f..6063180569 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/dto/LoginResponse.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/dto/LoginResponse.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.security.dto;
+package com.baeldung.jhipster6.security.dto;
 
 /**
  * Simple DTO representing the response of logging in using a remote service.
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/jwt/JWTConfigurer.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/jwt/JWTConfigurer.java
similarity index 94%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/jwt/JWTConfigurer.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/jwt/JWTConfigurer.java
index 944255e37d..570f6c8d9d 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/jwt/JWTConfigurer.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/jwt/JWTConfigurer.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.security.jwt;
+package com.baeldung.jhipster6.security.jwt;
 
 import org.springframework.security.config.annotation.SecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/jwt/JWTFilter.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/jwt/JWTFilter.java
similarity index 97%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/jwt/JWTFilter.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/jwt/JWTFilter.java
index cf1060282c..4e921a2f6e 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/jwt/JWTFilter.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/jwt/JWTFilter.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.security.jwt;
+package com.baeldung.jhipster6.security.jwt;
 
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/jwt/TokenProvider.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/jwt/TokenProvider.java
similarity index 99%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/jwt/TokenProvider.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/jwt/TokenProvider.java
index 248d45e050..20f46c06e9 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/jwt/TokenProvider.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/jwt/TokenProvider.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.security.jwt;
+package com.baeldung.jhipster6.security.jwt;
 
 import java.nio.charset.StandardCharsets;
 import java.security.Key;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/package-info.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/package-info.java
similarity index 50%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/package-info.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/package-info.java
index 4759050c56..3fc05c27e7 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/security/package-info.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/security/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Spring Security configuration.
  */
-package com.baeldung.jhipster5.security;
+package com.baeldung.jhipster6.security;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/AuditEventService.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/AuditEventService.java
similarity index 90%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/AuditEventService.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/AuditEventService.java
index 852eb951c9..4d008e096e 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/AuditEventService.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/AuditEventService.java
@@ -1,7 +1,8 @@
-package com.baeldung.jhipster5.service;
+package com.baeldung.jhipster6.service;
+
+import com.baeldung.jhipster6.config.audit.AuditEventConverter;
+import com.baeldung.jhipster6.repository.PersistenceAuditEventRepository;
 
-import com.baeldung.jhipster5.config.audit.AuditEventConverter;
-import com.baeldung.jhipster5.repository.PersistenceAuditEventRepository;
 import org.springframework.boot.actuate.audit.AuditEvent;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/BookService.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/BookService.java
similarity index 91%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/BookService.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/BookService.java
index 6422d1a424..00fe847527 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/BookService.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/BookService.java
@@ -1,6 +1,6 @@
-package com.baeldung.jhipster5.service;
+package com.baeldung.jhipster6.service;
 
-import com.baeldung.jhipster5.service.dto.BookDTO;
+import com.baeldung.jhipster6.service.dto.BookDTO;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/MailService.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/MailService.java
similarity index 97%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/MailService.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/MailService.java
index b15a7faff2..807cf8b5d6 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/MailService.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/MailService.java
@@ -1,6 +1,6 @@
-package com.baeldung.jhipster5.service;
+package com.baeldung.jhipster6.service;
 
-import com.baeldung.jhipster5.domain.User;
+import com.baeldung.jhipster6.domain.User;
 
 import io.github.jhipster.config.JHipsterProperties;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/UserService.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/UserService.java
similarity index 92%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/UserService.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/UserService.java
index 82d028f3ca..9c43332070 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/UserService.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/UserService.java
@@ -1,15 +1,18 @@
-package com.baeldung.jhipster5.service;
+package com.baeldung.jhipster6.service;
 
-import com.baeldung.jhipster5.config.Constants;
-import com.baeldung.jhipster5.domain.Authority;
-import com.baeldung.jhipster5.domain.User;
-import com.baeldung.jhipster5.repository.AuthorityRepository;
-import com.baeldung.jhipster5.repository.UserRepository;
-import com.baeldung.jhipster5.security.AuthoritiesConstants;
-import com.baeldung.jhipster5.security.SecurityUtils;
-import com.baeldung.jhipster5.service.dto.UserDTO;
-import com.baeldung.jhipster5.service.util.RandomUtil;
-import com.baeldung.jhipster5.web.rest.errors.*;
+import com.baeldung.jhipster6.config.Constants;
+import com.baeldung.jhipster6.domain.Authority;
+import com.baeldung.jhipster6.domain.User;
+import com.baeldung.jhipster6.repository.AuthorityRepository;
+import com.baeldung.jhipster6.repository.UserRepository;
+import com.baeldung.jhipster6.security.AuthoritiesConstants;
+import com.baeldung.jhipster6.security.SecurityUtils;
+import com.baeldung.jhipster6.service.dto.UserDTO;
+import com.baeldung.jhipster6.service.util.RandomUtil;
+import com.baeldung.jhipster6.web.rest.errors.*;
+import com.baeldung.jhipster6.web.rest.errors.EmailAlreadyUsedException;
+import com.baeldung.jhipster6.web.rest.errors.InvalidPasswordException;
+import com.baeldung.jhipster6.web.rest.errors.LoginAlreadyUsedException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/dto/BookDTO.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/dto/BookDTO.java
similarity index 98%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/dto/BookDTO.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/dto/BookDTO.java
index 5aa550e989..6334af6c21 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/dto/BookDTO.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/dto/BookDTO.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.service.dto;
+package com.baeldung.jhipster6.service.dto;
 import java.time.LocalDate;
 import javax.validation.constraints.*;
 import java.io.Serializable;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/dto/PasswordChangeDTO.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/dto/PasswordChangeDTO.java
similarity index 94%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/dto/PasswordChangeDTO.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/dto/PasswordChangeDTO.java
index 0711c97f44..1439b6e58d 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/dto/PasswordChangeDTO.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/dto/PasswordChangeDTO.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.service.dto;
+package com.baeldung.jhipster6.service.dto;
 
 /**
  * A DTO representing a password change required data - current and new password.
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/dto/UserDTO.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/dto/UserDTO.java
similarity index 96%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/dto/UserDTO.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/dto/UserDTO.java
index 9142b3825e..2dd38f9c0f 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/dto/UserDTO.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/dto/UserDTO.java
@@ -1,9 +1,9 @@
-package com.baeldung.jhipster5.service.dto;
+package com.baeldung.jhipster6.service.dto;
 
-import com.baeldung.jhipster5.config.Constants;
+import com.baeldung.jhipster6.config.Constants;
 
-import com.baeldung.jhipster5.domain.Authority;
-import com.baeldung.jhipster5.domain.User;
+import com.baeldung.jhipster6.domain.Authority;
+import com.baeldung.jhipster6.domain.User;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
diff --git a/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/dto/package-info.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/dto/package-info.java
new file mode 100644
index 0000000000..c536320584
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/dto/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Data Transfer Objects.
+ */
+package com.baeldung.jhipster6.service.dto;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/impl/BookServiceImpl.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/impl/BookServiceImpl.java
similarity index 88%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/impl/BookServiceImpl.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/impl/BookServiceImpl.java
index 23cd59584c..0012489c5e 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/impl/BookServiceImpl.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/impl/BookServiceImpl.java
@@ -1,11 +1,12 @@
-package com.baeldung.jhipster5.service.impl;
+package com.baeldung.jhipster6.service.impl;
+
+import com.baeldung.jhipster6.service.BookService;
+import com.baeldung.jhipster6.domain.Book;
+import com.baeldung.jhipster6.repository.BookRepository;
+import com.baeldung.jhipster6.service.dto.BookDTO;
+import com.baeldung.jhipster6.service.mapper.BookMapper;
+import com.baeldung.jhipster6.web.rest.errors.BadRequestAlertException;
 
-import com.baeldung.jhipster5.service.BookService;
-import com.baeldung.jhipster5.domain.Book;
-import com.baeldung.jhipster5.repository.BookRepository;
-import com.baeldung.jhipster5.service.dto.BookDTO;
-import com.baeldung.jhipster5.service.mapper.BookMapper;
-import com.baeldung.jhipster5.web.rest.errors.BadRequestAlertException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/mapper/BookMapper.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/mapper/BookMapper.java
similarity index 67%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/mapper/BookMapper.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/mapper/BookMapper.java
index cd24c7088e..64350fb4ed 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/mapper/BookMapper.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/mapper/BookMapper.java
@@ -1,7 +1,8 @@
-package com.baeldung.jhipster5.service.mapper;
+package com.baeldung.jhipster6.service.mapper;
 
-import com.baeldung.jhipster5.domain.*;
-import com.baeldung.jhipster5.service.dto.BookDTO;
+import com.baeldung.jhipster6.domain.*;
+import com.baeldung.jhipster6.service.dto.BookDTO;
+import com.baeldung.jhipster6.domain.Book;
 
 import org.mapstruct.*;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/mapper/EntityMapper.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/mapper/EntityMapper.java
similarity index 87%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/mapper/EntityMapper.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/mapper/EntityMapper.java
index 68af78179d..6ca8d89480 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/mapper/EntityMapper.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/mapper/EntityMapper.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.service.mapper;
+package com.baeldung.jhipster6.service.mapper;
 
 import java.util.List;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/mapper/UserMapper.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/mapper/UserMapper.java
similarity index 92%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/mapper/UserMapper.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/mapper/UserMapper.java
index 485c03813e..8b2b4cfba0 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/mapper/UserMapper.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/mapper/UserMapper.java
@@ -1,8 +1,8 @@
-package com.baeldung.jhipster5.service.mapper;
+package com.baeldung.jhipster6.service.mapper;
 
-import com.baeldung.jhipster5.domain.Authority;
-import com.baeldung.jhipster5.domain.User;
-import com.baeldung.jhipster5.service.dto.UserDTO;
+import com.baeldung.jhipster6.domain.Authority;
+import com.baeldung.jhipster6.domain.User;
+import com.baeldung.jhipster6.service.dto.UserDTO;
 
 import org.springframework.stereotype.Service;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/mapper/package-info.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/mapper/package-info.java
similarity index 63%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/mapper/package-info.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/mapper/package-info.java
index 7d402321e7..6ce6ec42fb 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/mapper/package-info.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/mapper/package-info.java
@@ -1,4 +1,4 @@
 /**
  * MapStruct mappers for mapping domain objects and Data Transfer Objects.
  */
-package com.baeldung.jhipster5.service.mapper;
+package com.baeldung.jhipster6.service.mapper;
diff --git a/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/package-info.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/package-info.java
new file mode 100644
index 0000000000..4f9584c45e
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Service layer beans.
+ */
+package com.baeldung.jhipster6.service;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/util/RandomUtil.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/util/RandomUtil.java
similarity index 94%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/util/RandomUtil.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/util/RandomUtil.java
index 97e4d9c672..74b8b178c2 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/service/util/RandomUtil.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/util/RandomUtil.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.service.util;
+package com.baeldung.jhipster6.service.util;
 
 import org.apache.commons.lang3.RandomStringUtils;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/AccountResource.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/AccountResource.java
similarity index 87%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/AccountResource.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/AccountResource.java
index 2109e93999..3603df148b 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/AccountResource.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/AccountResource.java
@@ -1,16 +1,21 @@
-package com.baeldung.jhipster5.web.rest;
+package com.baeldung.jhipster6.web.rest;
 
 
-import com.baeldung.jhipster5.domain.User;
-import com.baeldung.jhipster5.repository.UserRepository;
-import com.baeldung.jhipster5.security.SecurityUtils;
-import com.baeldung.jhipster5.service.MailService;
-import com.baeldung.jhipster5.service.UserService;
-import com.baeldung.jhipster5.service.dto.PasswordChangeDTO;
-import com.baeldung.jhipster5.service.dto.UserDTO;
-import com.baeldung.jhipster5.web.rest.errors.*;
-import com.baeldung.jhipster5.web.rest.vm.KeyAndPasswordVM;
-import com.baeldung.jhipster5.web.rest.vm.ManagedUserVM;
+import com.baeldung.jhipster6.domain.User;
+import com.baeldung.jhipster6.repository.UserRepository;
+import com.baeldung.jhipster6.security.SecurityUtils;
+import com.baeldung.jhipster6.service.MailService;
+import com.baeldung.jhipster6.service.UserService;
+import com.baeldung.jhipster6.service.dto.PasswordChangeDTO;
+import com.baeldung.jhipster6.service.dto.UserDTO;
+import com.baeldung.jhipster6.web.rest.errors.*;
+import com.baeldung.jhipster6.web.rest.errors.EmailAlreadyUsedException;
+import com.baeldung.jhipster6.web.rest.errors.EmailNotFoundException;
+import com.baeldung.jhipster6.web.rest.errors.InternalServerErrorException;
+import com.baeldung.jhipster6.web.rest.errors.InvalidPasswordException;
+import com.baeldung.jhipster6.web.rest.errors.LoginAlreadyUsedException;
+import com.baeldung.jhipster6.web.rest.vm.KeyAndPasswordVM;
+import com.baeldung.jhipster6.web.rest.vm.ManagedUserVM;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/AuditResource.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/AuditResource.java
similarity index 94%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/AuditResource.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/AuditResource.java
index d0182d5d9d..ebcdc42f64 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/AuditResource.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/AuditResource.java
@@ -1,7 +1,7 @@
-package com.baeldung.jhipster5.web.rest;
+package com.baeldung.jhipster6.web.rest;
 
-import com.baeldung.jhipster5.service.AuditEventService;
-import com.baeldung.jhipster5.web.rest.util.PaginationUtil;
+import com.baeldung.jhipster6.service.AuditEventService;
+import com.baeldung.jhipster6.web.rest.util.PaginationUtil;
 
 import io.github.jhipster.web.util.ResponseUtil;
 import org.springframework.boot.actuate.audit.AuditEvent;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/BookResource.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/BookResource.java
similarity index 94%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/BookResource.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/BookResource.java
index 0360ea05ed..584216b51d 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/BookResource.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/BookResource.java
@@ -1,8 +1,8 @@
-package com.baeldung.jhipster5.web.rest;
-import com.baeldung.jhipster5.service.BookService;
-import com.baeldung.jhipster5.web.rest.errors.BadRequestAlertException;
-import com.baeldung.jhipster5.web.rest.util.HeaderUtil;
-import com.baeldung.jhipster5.service.dto.BookDTO;
+package com.baeldung.jhipster6.web.rest;
+import com.baeldung.jhipster6.service.BookService;
+import com.baeldung.jhipster6.web.rest.errors.BadRequestAlertException;
+import com.baeldung.jhipster6.web.rest.util.HeaderUtil;
+import com.baeldung.jhipster6.service.dto.BookDTO;
 import io.github.jhipster.web.util.ResponseUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/ClientForwardController.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/ClientForwardController.java
new file mode 100644
index 0000000000..a524d90fc0
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/ClientForwardController.java
@@ -0,0 +1,17 @@
+package com.baeldung.jhipster6.web.rest;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class ClientForwardController {
+
+    /**
+     * Forwards any unmapped paths (except those containing a period) to the client {@code index.html}.
+     * @return forward to client {@code index.html}.
+     */
+    @GetMapping(value = "/**/{path:[^\\.]*}")
+    public String forward() {
+        return "forward:/";
+    }
+}
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/LogsResource.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/LogsResource.java
similarity index 91%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/LogsResource.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/LogsResource.java
index f35b5f2d5c..76d71d23d0 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/LogsResource.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/LogsResource.java
@@ -1,6 +1,6 @@
-package com.baeldung.jhipster5.web.rest;
+package com.baeldung.jhipster6.web.rest;
 
-import com.baeldung.jhipster5.web.rest.vm.LoggerVM;
+import com.baeldung.jhipster6.web.rest.vm.LoggerVM;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.LoggerContext;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/UserJWTController.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/UserJWTController.java
similarity index 91%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/UserJWTController.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/UserJWTController.java
index aeea587089..1bb647d2ef 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/UserJWTController.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/UserJWTController.java
@@ -1,8 +1,8 @@
-package com.baeldung.jhipster5.web.rest;
+package com.baeldung.jhipster6.web.rest;
 
-import com.baeldung.jhipster5.security.jwt.JWTFilter;
-import com.baeldung.jhipster5.security.jwt.TokenProvider;
-import com.baeldung.jhipster5.web.rest.vm.LoginVM;
+import com.baeldung.jhipster6.security.jwt.JWTFilter;
+import com.baeldung.jhipster6.security.jwt.TokenProvider;
+import com.baeldung.jhipster6.web.rest.vm.LoginVM;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/UserResource.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/UserResource.java
similarity index 91%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/UserResource.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/UserResource.java
index a95acf6759..36fa8f319c 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/UserResource.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/UserResource.java
@@ -1,17 +1,17 @@
-package com.baeldung.jhipster5.web.rest;
+package com.baeldung.jhipster6.web.rest;
 
-import com.baeldung.jhipster5.config.Constants;
-import com.baeldung.jhipster5.domain.User;
-import com.baeldung.jhipster5.repository.UserRepository;
-import com.baeldung.jhipster5.security.AuthoritiesConstants;
-import com.baeldung.jhipster5.service.MailService;
-import com.baeldung.jhipster5.service.UserService;
-import com.baeldung.jhipster5.service.dto.UserDTO;
-import com.baeldung.jhipster5.web.rest.errors.BadRequestAlertException;
-import com.baeldung.jhipster5.web.rest.errors.EmailAlreadyUsedException;
-import com.baeldung.jhipster5.web.rest.errors.LoginAlreadyUsedException;
-import com.baeldung.jhipster5.web.rest.util.HeaderUtil;
-import com.baeldung.jhipster5.web.rest.util.PaginationUtil;
+import com.baeldung.jhipster6.config.Constants;
+import com.baeldung.jhipster6.domain.User;
+import com.baeldung.jhipster6.repository.UserRepository;
+import com.baeldung.jhipster6.security.AuthoritiesConstants;
+import com.baeldung.jhipster6.service.MailService;
+import com.baeldung.jhipster6.service.UserService;
+import com.baeldung.jhipster6.service.dto.UserDTO;
+import com.baeldung.jhipster6.web.rest.errors.BadRequestAlertException;
+import com.baeldung.jhipster6.web.rest.errors.EmailAlreadyUsedException;
+import com.baeldung.jhipster6.web.rest.errors.LoginAlreadyUsedException;
+import com.baeldung.jhipster6.web.rest.util.HeaderUtil;
+import com.baeldung.jhipster6.web.rest.util.PaginationUtil;
 import io.github.jhipster.web.util.ResponseUtil;
 
 import org.slf4j.Logger;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/BadRequestAlertException.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/BadRequestAlertException.java
similarity index 96%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/BadRequestAlertException.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/BadRequestAlertException.java
index c4c403351a..a2e71a28bf 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/BadRequestAlertException.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/BadRequestAlertException.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.web.rest.errors;
+package com.baeldung.jhipster6.web.rest.errors;
 
 import org.zalando.problem.AbstractThrowableProblem;
 import org.zalando.problem.Status;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/CustomParameterizedException.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/CustomParameterizedException.java
similarity index 97%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/CustomParameterizedException.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/CustomParameterizedException.java
index 8c3df82b83..31add5c588 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/CustomParameterizedException.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/CustomParameterizedException.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.web.rest.errors;
+package com.baeldung.jhipster6.web.rest.errors;
 
 import org.zalando.problem.AbstractThrowableProblem;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/EmailAlreadyUsedException.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/EmailAlreadyUsedException.java
similarity index 86%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/EmailAlreadyUsedException.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/EmailAlreadyUsedException.java
index b3dcc0279e..01e358b76c 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/EmailAlreadyUsedException.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/EmailAlreadyUsedException.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.web.rest.errors;
+package com.baeldung.jhipster6.web.rest.errors;
 
 public class EmailAlreadyUsedException extends BadRequestAlertException {
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/EmailNotFoundException.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/EmailNotFoundException.java
similarity index 88%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/EmailNotFoundException.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/EmailNotFoundException.java
index b93081cacb..51a7857f32 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/EmailNotFoundException.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/EmailNotFoundException.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.web.rest.errors;
+package com.baeldung.jhipster6.web.rest.errors;
 
 import org.zalando.problem.AbstractThrowableProblem;
 import org.zalando.problem.Status;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/ErrorConstants.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/ErrorConstants.java
similarity index 96%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/ErrorConstants.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/ErrorConstants.java
index 06be9254a9..b6a256dda0 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/ErrorConstants.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/ErrorConstants.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.web.rest.errors;
+package com.baeldung.jhipster6.web.rest.errors;
 
 import java.net.URI;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/ExceptionTranslator.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/ExceptionTranslator.java
similarity index 97%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/ExceptionTranslator.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/ExceptionTranslator.java
index 3f7cc6b565..d9e5697c77 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/ExceptionTranslator.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/ExceptionTranslator.java
@@ -1,6 +1,6 @@
-package com.baeldung.jhipster5.web.rest.errors;
+package com.baeldung.jhipster6.web.rest.errors;
 
-import com.baeldung.jhipster5.web.rest.util.HeaderUtil;
+import com.baeldung.jhipster6.web.rest.util.HeaderUtil;
 
 import org.springframework.dao.ConcurrencyFailureException;
 import org.springframework.http.ResponseEntity;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/FieldErrorVM.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/FieldErrorVM.java
similarity index 92%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/FieldErrorVM.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/FieldErrorVM.java
index 349f548850..7c2504a3fc 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/FieldErrorVM.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/FieldErrorVM.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.web.rest.errors;
+package com.baeldung.jhipster6.web.rest.errors;
 
 import java.io.Serializable;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/InternalServerErrorException.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/InternalServerErrorException.java
similarity index 90%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/InternalServerErrorException.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/InternalServerErrorException.java
index 13e128237b..844f315bfd 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/InternalServerErrorException.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/InternalServerErrorException.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.web.rest.errors;
+package com.baeldung.jhipster6.web.rest.errors;
 
 import org.zalando.problem.AbstractThrowableProblem;
 import org.zalando.problem.Status;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/InvalidPasswordException.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/InvalidPasswordException.java
similarity index 88%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/InvalidPasswordException.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/InvalidPasswordException.java
index 6bb91247ff..02d4b4da01 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/InvalidPasswordException.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/InvalidPasswordException.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.web.rest.errors;
+package com.baeldung.jhipster6.web.rest.errors;
 
 import org.zalando.problem.AbstractThrowableProblem;
 import org.zalando.problem.Status;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/LoginAlreadyUsedException.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/LoginAlreadyUsedException.java
similarity index 85%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/LoginAlreadyUsedException.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/LoginAlreadyUsedException.java
index 987a94193d..fabd4d153d 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/LoginAlreadyUsedException.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/LoginAlreadyUsedException.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.web.rest.errors;
+package com.baeldung.jhipster6.web.rest.errors;
 
 public class LoginAlreadyUsedException extends BadRequestAlertException {
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/package-info.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/package-info.java
similarity index 75%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/package-info.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/package-info.java
index 7f57af4429..b791df1268 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/errors/package-info.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/errors/package-info.java
@@ -3,4 +3,4 @@
  *
  * More information on https://github.com/zalando/problem-spring-web
  */
-package com.baeldung.jhipster5.web.rest.errors;
+package com.baeldung.jhipster6.web.rest.errors;
diff --git a/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/package-info.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/package-info.java
new file mode 100644
index 0000000000..f5d106c277
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Spring MVC REST controllers.
+ */
+package com.baeldung.jhipster6.web.rest;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/util/HeaderUtil.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/util/HeaderUtil.java
similarity index 97%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/util/HeaderUtil.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/util/HeaderUtil.java
index 91fdd68261..8546b97956 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/util/HeaderUtil.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/util/HeaderUtil.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.web.rest.util;
+package com.baeldung.jhipster6.web.rest.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/util/PaginationUtil.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/util/PaginationUtil.java
similarity index 97%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/util/PaginationUtil.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/util/PaginationUtil.java
index 9928dbe171..7c28d93486 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/util/PaginationUtil.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/util/PaginationUtil.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.web.rest.util;
+package com.baeldung.jhipster6.web.rest.util;
 
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpHeaders;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/vm/KeyAndPasswordVM.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/vm/KeyAndPasswordVM.java
similarity index 91%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/vm/KeyAndPasswordVM.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/vm/KeyAndPasswordVM.java
index 840fa02cfc..b2b1f91b0a 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/vm/KeyAndPasswordVM.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/vm/KeyAndPasswordVM.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.web.rest.vm;
+package com.baeldung.jhipster6.web.rest.vm;
 
 /**
  * View Model object for storing the user's key and password.
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/vm/LoggerVM.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/vm/LoggerVM.java
similarity index 95%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/vm/LoggerVM.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/vm/LoggerVM.java
index 952e7df298..d7ca167edf 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/vm/LoggerVM.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/vm/LoggerVM.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.web.rest.vm;
+package com.baeldung.jhipster6.web.rest.vm;
 
 import ch.qos.logback.classic.Logger;
 
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/vm/LoginVM.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/vm/LoginVM.java
similarity index 96%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/vm/LoginVM.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/vm/LoginVM.java
index 8fc119ab69..40ede22b3a 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/vm/LoginVM.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/vm/LoginVM.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.web.rest.vm;
+package com.baeldung.jhipster6.web.rest.vm;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/vm/ManagedUserVM.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/vm/ManagedUserVM.java
similarity index 88%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/vm/ManagedUserVM.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/vm/ManagedUserVM.java
index 314577c456..2746ca6de0 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/vm/ManagedUserVM.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/vm/ManagedUserVM.java
@@ -1,6 +1,6 @@
-package com.baeldung.jhipster5.web.rest.vm;
+package com.baeldung.jhipster6.web.rest.vm;
 
-import com.baeldung.jhipster5.service.dto.UserDTO;
+import com.baeldung.jhipster6.service.dto.UserDTO;
 import javax.validation.constraints.Size;
 
 /**
diff --git a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/vm/package-info.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/vm/package-info.java
similarity index 57%
rename from jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/vm/package-info.java
rename to jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/vm/package-info.java
index ff58799037..af0defc392 100644
--- a/jhipster-5/bookstore-monolith/src/main/java/com/baeldung/jhipster5/web/rest/vm/package-info.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/web/rest/vm/package-info.java
@@ -1,4 +1,4 @@
 /**
  * View Models used by Spring MVC REST controllers.
  */
-package com.baeldung.jhipster5.web.rest.vm;
+package com.baeldung.jhipster6.web.rest.vm;
diff --git a/jhipster-5/bookstore-monolith/src/main/jib/entrypoint.sh b/jhipster-6/bookstore-monolith/src/main/jib/entrypoint.sh
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/jib/entrypoint.sh
rename to jhipster-6/bookstore-monolith/src/main/jib/entrypoint.sh
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/.h2.server.properties b/jhipster-6/bookstore-monolith/src/main/resources/.h2.server.properties
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/resources/.h2.server.properties
rename to jhipster-6/bookstore-monolith/src/main/resources/.h2.server.properties
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/banner.txt b/jhipster-6/bookstore-monolith/src/main/resources/banner.txt
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/resources/banner.txt
rename to jhipster-6/bookstore-monolith/src/main/resources/banner.txt
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/config/application-dev.yml b/jhipster-6/bookstore-monolith/src/main/resources/config/application-dev.yml
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/resources/config/application-dev.yml
rename to jhipster-6/bookstore-monolith/src/main/resources/config/application-dev.yml
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/config/application-prod.yml b/jhipster-6/bookstore-monolith/src/main/resources/config/application-prod.yml
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/resources/config/application-prod.yml
rename to jhipster-6/bookstore-monolith/src/main/resources/config/application-prod.yml
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/config/application-tls.yml b/jhipster-6/bookstore-monolith/src/main/resources/config/application-tls.yml
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/resources/config/application-tls.yml
rename to jhipster-6/bookstore-monolith/src/main/resources/config/application-tls.yml
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/config/application.yml b/jhipster-6/bookstore-monolith/src/main/resources/config/application.yml
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/resources/config/application.yml
rename to jhipster-6/bookstore-monolith/src/main/resources/config/application.yml
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/config/liquibase/authorities.csv b/jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/authorities.csv
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/resources/config/liquibase/authorities.csv
rename to jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/authorities.csv
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml b/jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
rename to jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/config/liquibase/changelog/20190319124041_added_entity_Book.xml b/jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/changelog/20190319124041_added_entity_Book.xml
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/resources/config/liquibase/changelog/20190319124041_added_entity_Book.xml
rename to jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/changelog/20190319124041_added_entity_Book.xml
diff --git a/jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/data/authority.csv b/jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/data/authority.csv
new file mode 100644
index 0000000000..af5c6dfa18
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/data/authority.csv
@@ -0,0 +1,3 @@
+name
+ROLE_ADMIN
+ROLE_USER
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/config/liquibase/users.csv b/jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/data/user.csv
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/resources/config/liquibase/users.csv
rename to jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/data/user.csv
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/config/liquibase/users_authorities.csv b/jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/data/user_authority.csv
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/resources/config/liquibase/users_authorities.csv
rename to jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/data/user_authority.csv
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/config/liquibase/master.xml b/jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/master.xml
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/resources/config/liquibase/master.xml
rename to jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/master.xml
diff --git a/jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/users.csv b/jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/users.csv
new file mode 100644
index 0000000000..b25922b699
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/users.csv
@@ -0,0 +1,5 @@
+id;login;password_hash;first_name;last_name;email;image_url;activated;lang_key;created_by;last_modified_by
+1;system;$2a$10$mE.qmcV0mFU5NcKh73TZx.z4ueI/.bDWbj0T1BYyqP481kGGarKLG;System;System;system@localhost;;true;en;system;system
+2;anonymoususer;$2a$10$j8S5d7Sr7.8VTOYNviDPOeWX8KcYILUVJBsYV83Y5NtECayypx9lO;Anonymous;User;anonymous@localhost;;true;en;system;system
+3;admin;$2a$10$gSAhZrxMllrbgj/kkK9UceBPpChGWJA7SYIb1Mqo.n5aNLq1/oRrC;Administrator;Administrator;admin@localhost;;true;en;system;system
+4;user;$2a$10$VEjxo0jq2YG9Rbk2HmX9S.k1uZBGYUHdUcid3g/vfiEl7lwWgOH/K;User;User;user@localhost;;true;en;system;system
diff --git a/jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/users_authorities.csv b/jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/users_authorities.csv
new file mode 100644
index 0000000000..06c5feeeea
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/main/resources/config/liquibase/users_authorities.csv
@@ -0,0 +1,6 @@
+user_id;authority_name
+1;ROLE_ADMIN
+1;ROLE_USER
+3;ROLE_ADMIN
+3;ROLE_USER
+4;ROLE_USER
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/config/tls/keystore.p12 b/jhipster-6/bookstore-monolith/src/main/resources/config/tls/keystore.p12
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/resources/config/tls/keystore.p12
rename to jhipster-6/bookstore-monolith/src/main/resources/config/tls/keystore.p12
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/i18n/messages.properties b/jhipster-6/bookstore-monolith/src/main/resources/i18n/messages.properties
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/resources/i18n/messages.properties
rename to jhipster-6/bookstore-monolith/src/main/resources/i18n/messages.properties
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/logback-spring.xml b/jhipster-6/bookstore-monolith/src/main/resources/logback-spring.xml
similarity index 98%
rename from jhipster-5/bookstore-monolith/src/main/resources/logback-spring.xml
rename to jhipster-6/bookstore-monolith/src/main/resources/logback-spring.xml
index 4aa548af35..b0e2d9aa95 100644
--- a/jhipster-5/bookstore-monolith/src/main/resources/logback-spring.xml
+++ b/jhipster-6/bookstore-monolith/src/main/resources/logback-spring.xml
@@ -30,9 +30,9 @@
     <logger name="javax.activation" level="WARN"/>
     <logger name="javax.mail" level="WARN"/>
     <logger name="javax.management.remote" level="WARN"/>
-    <logger name="javax.xml.bind" level="WARN"/>
+    <logger name="jakarta.xml.bind" level="WARN"/>
     <logger name="ch.qos.logback" level="WARN"/>
-    
+
     <logger name="com.ryantenney" level="WARN"/>
     <logger name="com.sun" level="WARN"/>
     <logger name="com.zaxxer" level="WARN"/>
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/templates/error.html b/jhipster-6/bookstore-monolith/src/main/resources/templates/error.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/resources/templates/error.html
rename to jhipster-6/bookstore-monolith/src/main/resources/templates/error.html
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/templates/mail/activationEmail.html b/jhipster-6/bookstore-monolith/src/main/resources/templates/mail/activationEmail.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/resources/templates/mail/activationEmail.html
rename to jhipster-6/bookstore-monolith/src/main/resources/templates/mail/activationEmail.html
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/templates/mail/creationEmail.html b/jhipster-6/bookstore-monolith/src/main/resources/templates/mail/creationEmail.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/resources/templates/mail/creationEmail.html
rename to jhipster-6/bookstore-monolith/src/main/resources/templates/mail/creationEmail.html
diff --git a/jhipster-5/bookstore-monolith/src/main/resources/templates/mail/passwordResetEmail.html b/jhipster-6/bookstore-monolith/src/main/resources/templates/mail/passwordResetEmail.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/resources/templates/mail/passwordResetEmail.html
rename to jhipster-6/bookstore-monolith/src/main/resources/templates/mail/passwordResetEmail.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/404.html b/jhipster-6/bookstore-monolith/src/main/webapp/404.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/404.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/404.html
diff --git a/jhipster-6/bookstore-monolith/src/main/webapp/WEB-INF/web.xml b/jhipster-6/bookstore-monolith/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..f1611b515a
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app
+    xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+    version="3.0">
+
+    <mime-mapping>
+        <extension>html</extension>
+        <mime-type>text/html;charset=utf-8</mime-type>
+    </mime-mapping>
+
+</web-app>
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/account.module.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/account.module.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/account.module.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/account.module.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/account.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/account.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/account.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/account.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/activate/activate.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/activate/activate.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/activate/activate.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/activate/activate.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/activate/activate.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/activate/activate.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/activate/activate.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/activate/activate.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/activate/activate.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/activate/activate.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/activate/activate.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/activate/activate.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/activate/activate.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/activate/activate.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/activate/activate.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/activate/activate.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/index.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/index.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/index.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/index.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/password/password-strength-bar.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/password/password-strength-bar.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/password/password-strength-bar.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/password/password-strength-bar.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/password/password-strength-bar.scss b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/password/password-strength-bar.scss
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/password/password-strength-bar.scss
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/password/password-strength-bar.scss
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/password/password.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/password/password.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/password/password.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/password/password.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/password/password.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/password/password.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/password/password.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/password/password.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/password/password.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/password/password.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/password/password.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/password/password.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/password/password.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/password/password.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/password/password.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/password/password.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/register/register.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/register/register.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/register/register.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/register/register.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/register/register.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/register/register.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/register/register.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/register/register.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/register/register.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/register/register.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/register/register.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/register/register.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/register/register.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/register/register.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/register/register.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/register/register.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/settings/settings.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/settings/settings.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/settings/settings.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/settings/settings.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/settings/settings.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/settings/settings.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/settings/settings.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/settings/settings.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/account/settings/settings.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/account/settings/settings.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/account/settings/settings.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/account/settings/settings.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/admin.module.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/admin.module.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/admin.module.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/admin.module.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/admin.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/admin.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/admin.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/admin.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/audits/audit-data.model.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/audits/audit-data.model.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/audits/audit-data.model.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/audits/audit-data.model.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/audits/audit.model.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/audits/audit.model.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/audits/audit.model.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/audits/audit.model.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/audits/audits.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/audits/audits.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/audits/audits.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/audits/audits.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/audits/audits.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/audits/audits.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/audits/audits.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/audits/audits.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/audits/audits.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/audits/audits.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/audits/audits.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/audits/audits.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/audits/audits.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/audits/audits.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/audits/audits.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/audits/audits.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/configuration/configuration.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/configuration/configuration.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/configuration/configuration.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/configuration/configuration.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/configuration/configuration.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/configuration/configuration.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/configuration/configuration.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/configuration/configuration.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/configuration/configuration.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/configuration/configuration.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/configuration/configuration.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/configuration/configuration.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/configuration/configuration.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/configuration/configuration.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/configuration/configuration.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/configuration/configuration.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/docs/docs.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/docs/docs.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/docs/docs.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/docs/docs.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/docs/docs.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/docs/docs.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/docs/docs.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/docs/docs.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/docs/docs.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/docs/docs.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/docs/docs.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/docs/docs.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/health/health-modal.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/health/health-modal.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/health/health-modal.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/health/health-modal.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/health/health-modal.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/health/health-modal.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/health/health-modal.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/health/health-modal.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/health/health.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/health/health.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/health/health.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/health/health.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/health/health.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/health/health.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/health/health.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/health/health.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/health/health.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/health/health.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/health/health.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/health/health.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/health/health.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/health/health.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/health/health.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/health/health.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/index.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/index.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/index.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/index.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/logs/log.model.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/logs/log.model.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/logs/log.model.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/logs/log.model.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/logs/logs.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/logs/logs.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/logs/logs.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/logs/logs.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/logs/logs.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/logs/logs.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/logs/logs.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/logs/logs.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/logs/logs.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/logs/logs.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/logs/logs.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/logs/logs.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/logs/logs.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/logs/logs.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/logs/logs.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/logs/logs.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/metrics/metrics.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/metrics/metrics.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/metrics/metrics.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/metrics/metrics.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/metrics/metrics.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/metrics/metrics.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/metrics/metrics.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/metrics/metrics.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/metrics/metrics.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/metrics/metrics.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/metrics/metrics.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/metrics/metrics.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/metrics/metrics.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/metrics/metrics.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/metrics/metrics.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/metrics/metrics.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-detail.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-detail.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-detail.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-detail.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-detail.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-detail.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-detail.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-detail.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-update.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-update.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-update.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-update.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-update.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-update.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-update.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management-update.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/admin/user-management/user-management.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/app-routing.module.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/app-routing.module.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/app-routing.module.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/app-routing.module.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/app.constants.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/app.constants.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/app.constants.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/app.constants.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/app.main.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/app.main.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/app.main.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/app.main.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/app.module.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/app.module.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/app.module.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/app.module.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/blocks/config/prod.config.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/blocks/config/prod.config.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/blocks/config/prod.config.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/blocks/config/prod.config.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/blocks/config/uib-pagination.config.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/blocks/config/uib-pagination.config.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/blocks/config/uib-pagination.config.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/blocks/config/uib-pagination.config.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/blocks/interceptor/auth.interceptor.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/blocks/interceptor/auth.interceptor.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/blocks/interceptor/auth.interceptor.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/blocks/interceptor/auth.interceptor.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/blocks/interceptor/errorhandler.interceptor.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/blocks/interceptor/notification.interceptor.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/core/auth/account.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/core/auth/account.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/core/auth/account.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/core/auth/account.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/core/auth/auth-jwt.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/core/auth/auth-jwt.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/core/auth/auth-jwt.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/core/auth/auth-jwt.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/core/auth/csrf.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/core/auth/csrf.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/core/auth/csrf.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/core/auth/csrf.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/core/auth/state-storage.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/core/auth/state-storage.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/core/auth/state-storage.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/core/auth/state-storage.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/core/auth/user-route-access-service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/core/auth/user-route-access-service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/core/auth/user-route-access-service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/core/auth/user-route-access-service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/core/core.module.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/core/core.module.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/core/core.module.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/core/core.module.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/core/index.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/core/index.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/core/index.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/core/index.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/core/login/login-modal.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/core/login/login-modal.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/core/login/login-modal.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/core/login/login-modal.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/core/login/login.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/core/login/login.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/core/login/login.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/core/login/login.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/core/user/account.model.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/core/user/account.model.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/core/user/account.model.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/core/user/account.model.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/core/user/user.model.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/core/user/user.model.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/core/user/user.model.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/core/user/user.model.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/core/user/user.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/core/user/user.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/core/user/user.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/core/user/user.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book-delete-dialog.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book-delete-dialog.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book-delete-dialog.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book-delete-dialog.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book-delete-dialog.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book-delete-dialog.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book-delete-dialog.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book-delete-dialog.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book-detail.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book-detail.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book-detail.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book-detail.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book-detail.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book-detail.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book-detail.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book-detail.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book-update.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book-update.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book-update.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book-update.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book-update.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book-update.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book-update.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book-update.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book.module.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book.module.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book.module.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book.module.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/book.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/book.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/index.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/index.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/entities/book/index.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/entities/book/index.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/entities/entity.module.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/entities/entity.module.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/entities/entity.module.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/entities/entity.module.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/home/home.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/home/home.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/home/home.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/home/home.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/home/home.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/home/home.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/home/home.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/home/home.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/home/home.module.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/home/home.module.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/home/home.module.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/home/home.module.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/home/home.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/home/home.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/home/home.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/home/home.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/home/home.scss b/jhipster-6/bookstore-monolith/src/main/webapp/app/home/home.scss
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/home/home.scss
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/home/home.scss
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/home/index.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/home/index.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/home/index.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/home/index.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/error/error.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/error/error.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/error/error.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/error/error.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/error/error.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/error/error.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/error/error.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/error/error.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/error/error.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/error/error.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/error/error.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/error/error.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/footer/footer.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/footer/footer.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/footer/footer.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/footer/footer.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/footer/footer.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/footer/footer.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/footer/footer.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/footer/footer.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/index.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/index.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/index.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/index.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/main/main.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/main/main.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/main/main.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/main/main.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/main/main.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/main/main.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/main/main.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/main/main.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/navbar/navbar.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/navbar/navbar.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/navbar/navbar.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/navbar/navbar.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/navbar/navbar.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/navbar/navbar.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/navbar/navbar.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/navbar/navbar.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/navbar/navbar.route.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/navbar/navbar.route.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/navbar/navbar.route.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/navbar/navbar.route.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/navbar/navbar.scss b/jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/navbar/navbar.scss
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/navbar/navbar.scss
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/navbar/navbar.scss
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/profiles/page-ribbon.scss b/jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/profiles/page-ribbon.scss
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/profiles/page-ribbon.scss
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/profiles/page-ribbon.scss
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/profiles/profile-info.model.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/profiles/profile-info.model.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/profiles/profile-info.model.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/profiles/profile-info.model.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/profiles/profile.service.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/profiles/profile.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/layouts/profiles/profile.service.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/layouts/profiles/profile.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/polyfills.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/polyfills.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/polyfills.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/polyfills.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/shared/alert/alert-error.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/shared/alert/alert-error.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/shared/alert/alert-error.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/shared/alert/alert-error.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/shared/alert/alert.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/shared/alert/alert.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/shared/alert/alert.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/shared/alert/alert.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/shared/auth/has-any-authority.directive.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/shared/auth/has-any-authority.directive.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/shared/auth/has-any-authority.directive.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/shared/auth/has-any-authority.directive.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/shared/constants/error.constants.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/shared/constants/error.constants.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/shared/constants/error.constants.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/shared/constants/error.constants.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/shared/constants/input.constants.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/shared/constants/input.constants.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/shared/constants/input.constants.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/shared/constants/input.constants.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/shared/constants/pagination.constants.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/shared/constants/pagination.constants.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/shared/constants/pagination.constants.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/shared/constants/pagination.constants.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/shared/index.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/shared/index.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/shared/index.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/shared/index.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/shared/login/login.component.html b/jhipster-6/bookstore-monolith/src/main/webapp/app/shared/login/login.component.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/shared/login/login.component.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/shared/login/login.component.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/shared/login/login.component.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/shared/login/login.component.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/shared/login/login.component.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/shared/login/login.component.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/shared/model/book.model.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/shared/model/book.model.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/shared/model/book.model.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/shared/model/book.model.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/shared/shared-common.module.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/shared/shared-common.module.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/shared/shared-common.module.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/shared/shared-common.module.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/shared/shared-libs.module.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/shared/shared-libs.module.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/shared/shared-libs.module.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/shared/shared-libs.module.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/shared/shared.module.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/shared/shared.module.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/shared/shared.module.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/shared/shared.module.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/shared/util/datepicker-adapter.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/shared/util/datepicker-adapter.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/shared/util/datepicker-adapter.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/shared/util/datepicker-adapter.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/shared/util/request-util.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/shared/util/request-util.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/shared/util/request-util.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/shared/util/request-util.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/app/vendor.ts b/jhipster-6/bookstore-monolith/src/main/webapp/app/vendor.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/app/vendor.ts
rename to jhipster-6/bookstore-monolith/src/main/webapp/app/vendor.ts
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/css/loading.css b/jhipster-6/bookstore-monolith/src/main/webapp/content/css/loading.css
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/css/loading.css
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/css/loading.css
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0.svg b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0.svg
old mode 100755
new mode 100644
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0.svg
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0.svg
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0_head-192.png b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0_head-192.png
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0_head-192.png
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0_head-192.png
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0_head-256.png b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0_head-256.png
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0_head-256.png
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0_head-256.png
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0_head-384.png b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0_head-384.png
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0_head-384.png
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0_head-384.png
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0_head-512.png b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0_head-512.png
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0_head-512.png
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_0_head-512.png
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1.svg b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1.svg
old mode 100755
new mode 100644
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1.svg
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1.svg
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1_head-192.png b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1_head-192.png
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1_head-192.png
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1_head-192.png
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1_head-256.png b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1_head-256.png
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1_head-256.png
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1_head-256.png
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1_head-384.png b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1_head-384.png
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1_head-384.png
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1_head-384.png
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1_head-512.png b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1_head-512.png
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1_head-512.png
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_1_head-512.png
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2.svg b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2.svg
old mode 100755
new mode 100644
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2.svg
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2.svg
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2_head-192.png b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2_head-192.png
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2_head-192.png
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2_head-192.png
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2_head-256.png b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2_head-256.png
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2_head-256.png
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2_head-256.png
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2_head-384.png b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2_head-384.png
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2_head-384.png
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2_head-384.png
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2_head-512.png b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2_head-512.png
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2_head-512.png
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_2_head-512.png
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3.svg b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3.svg
old mode 100755
new mode 100644
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3.svg
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3.svg
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3_head-192.png b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3_head-192.png
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3_head-192.png
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3_head-192.png
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3_head-256.png b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3_head-256.png
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3_head-256.png
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3_head-256.png
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3_head-384.png b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3_head-384.png
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3_head-384.png
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3_head-384.png
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3_head-512.png b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3_head-512.png
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3_head-512.png
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/jhipster_family_member_3_head-512.png
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/images/logo-jhipster.png b/jhipster-6/bookstore-monolith/src/main/webapp/content/images/logo-jhipster.png
old mode 100755
new mode 100644
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/images/logo-jhipster.png
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/images/logo-jhipster.png
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/scss/_bootstrap-variables.scss b/jhipster-6/bookstore-monolith/src/main/webapp/content/scss/_bootstrap-variables.scss
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/scss/_bootstrap-variables.scss
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/scss/_bootstrap-variables.scss
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/scss/global.scss b/jhipster-6/bookstore-monolith/src/main/webapp/content/scss/global.scss
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/scss/global.scss
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/scss/global.scss
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/content/scss/vendor.scss b/jhipster-6/bookstore-monolith/src/main/webapp/content/scss/vendor.scss
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/content/scss/vendor.scss
rename to jhipster-6/bookstore-monolith/src/main/webapp/content/scss/vendor.scss
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/favicon.ico b/jhipster-6/bookstore-monolith/src/main/webapp/favicon.ico
old mode 100755
new mode 100644
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/favicon.ico
rename to jhipster-6/bookstore-monolith/src/main/webapp/favicon.ico
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/index.html b/jhipster-6/bookstore-monolith/src/main/webapp/index.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/index.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/index.html
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/manifest.webapp b/jhipster-6/bookstore-monolith/src/main/webapp/manifest.webapp
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/manifest.webapp
rename to jhipster-6/bookstore-monolith/src/main/webapp/manifest.webapp
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/robots.txt b/jhipster-6/bookstore-monolith/src/main/webapp/robots.txt
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/robots.txt
rename to jhipster-6/bookstore-monolith/src/main/webapp/robots.txt
diff --git a/jhipster-5/bookstore-monolith/src/main/webapp/swagger-ui/index.html b/jhipster-6/bookstore-monolith/src/main/webapp/swagger-ui/index.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/main/webapp/swagger-ui/index.html
rename to jhipster-6/bookstore-monolith/src/main/webapp/swagger-ui/index.html
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/config/WebConfigurerUnitTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/config/WebConfigurerUnitTest.java
similarity index 73%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/config/WebConfigurerUnitTest.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/config/WebConfigurerUnitTest.java
index 764d6b3587..44452caac9 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/config/WebConfigurerUnitTest.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/config/WebConfigurerUnitTest.java
@@ -1,26 +1,19 @@
-package com.baeldung.jhipster5.config;
+package com.baeldung.jhipster6.config;
 
 import io.github.jhipster.config.JHipsterConstants;
 import io.github.jhipster.config.JHipsterProperties;
 import io.github.jhipster.web.filter.CachingHttpHeadersFilter;
-import io.undertow.Undertow;
-import io.undertow.Undertow.Builder;
-import io.undertow.UndertowOptions;
-import org.apache.commons.io.FilenameUtils;
-
 import org.h2.server.web.WebServlet;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpHeaders;
 import org.springframework.mock.env.MockEnvironment;
 import org.springframework.mock.web.MockServletContext;
-import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.xnio.OptionMap;
 
 import javax.servlet.*;
+
 import java.util.*;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -33,9 +26,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 /**
- * Unit tests for the WebConfigurer class.
- *
- * @see WebConfigurer
+ * Unit tests for the {@link WebConfigurer} class.
  */
 public class WebConfigurerUnitTest {
 
@@ -47,7 +38,7 @@ public class WebConfigurerUnitTest {
 
     private JHipsterProperties props;
 
-    @Before
+    @BeforeEach
     public void setup() {
         servletContext = spy(new MockServletContext());
         doReturn(mock(FilterRegistration.Dynamic.class))
@@ -78,35 +69,19 @@ public class WebConfigurerUnitTest {
         verify(servletContext, never()).addFilter(eq("cachingHttpHeadersFilter"), any(CachingHttpHeadersFilter.class));
         verify(servletContext).addServlet(eq("H2Console"), any(WebServlet.class));
     }
-
-    @Test
-    public void testCustomizeServletContainer() {
-        env.setActiveProfiles(JHipsterConstants.SPRING_PROFILE_PRODUCTION);
-        UndertowServletWebServerFactory container = new UndertowServletWebServerFactory();
-        webConfigurer.customize(container);
-        assertThat(container.getMimeMappings().get("abs")).isEqualTo("audio/x-mpeg");
-        assertThat(container.getMimeMappings().get("html")).isEqualTo("text/html;charset=utf-8");
-        assertThat(container.getMimeMappings().get("json")).isEqualTo("text/html;charset=utf-8");
-        if (container.getDocumentRoot() != null) {
-            assertThat(container.getDocumentRoot().getPath()).isEqualTo(FilenameUtils.separatorsToSystem("target/www"));
-        }
-
-        Builder builder = Undertow.builder();
-        container.getBuilderCustomizers().forEach(c -> c.customize(builder));
-        OptionMap.Builder serverOptions = (OptionMap.Builder) ReflectionTestUtils.getField(builder, "serverOptions");
-        assertThat(serverOptions.getMap().get(UndertowOptions.ENABLE_HTTP2)).isNull();
-    }
-
-    @Test
-    public void testUndertowHttp2Enabled() {
-        props.getHttp().setVersion(JHipsterProperties.Http.Version.V_2_0);
-        UndertowServletWebServerFactory container = new UndertowServletWebServerFactory();
-        webConfigurer.customize(container);
-        Builder builder = Undertow.builder();
-        container.getBuilderCustomizers().forEach(c -> c.customize(builder));
-        OptionMap.Builder serverOptions = (OptionMap.Builder) ReflectionTestUtils.getField(builder, "serverOptions");
-        assertThat(serverOptions.getMap().get(UndertowOptions.ENABLE_HTTP2)).isTrue();
-    }
+//
+//    @Test
+//    public void testCustomizeServletContainer() {
+//        env.setActiveProfiles(JHipsterConstants.SPRING_PROFILE_PRODUCTION);
+//        UndertowServletWebServerFactory container = new UndertowServletWebServerFactory();
+//        webConfigurer.customize(container);
+//        assertThat(container.getMimeMappings().get("abs")).isEqualTo("audio/x-mpeg");
+//        assertThat(container.getMimeMappings().get("html")).isEqualTo("text/html;charset=utf-8");
+//        assertThat(container.getMimeMappings().get("json")).isEqualTo("text/html;charset=utf-8");
+//        if (container.getDocumentRoot() != null) {
+//            assertThat(container.getDocumentRoot()).isEqualTo(new File("target/classes/static/"));
+//        }
+//    }
 
     @Test
     public void testCorsFilterOnApiPath() throws Exception {
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/config/WebConfigurerUnitTestController.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/config/WebConfigurerUnitTestController.java
similarity index 89%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/config/WebConfigurerUnitTestController.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/config/WebConfigurerUnitTestController.java
index ee72e1c80e..271d18278e 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/config/WebConfigurerUnitTestController.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/config/WebConfigurerUnitTestController.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.config;
+package com.baeldung.jhipster6.config;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/config/timezone/HibernateTimeZoneIT.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/config/timezone/HibernateTimeZoneIT.java
new file mode 100644
index 0000000000..2e506edab4
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/config/timezone/HibernateTimeZoneIT.java
@@ -0,0 +1,174 @@
+package com.baeldung.jhipster6.config.timezone;
+
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.repository.timezone.DateTimeWrapper;
+import com.baeldung.jhipster6.repository.timezone.DateTimeWrapperRepository;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.support.rowset.SqlRowSet;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.*;
+import java.time.format.DateTimeFormatter;
+
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Integration tests for the UTC Hibernate configuration.
+ */
+@SpringBootTest(classes = BookstoreApp.class)
+public class HibernateTimeZoneIT {
+
+    @Autowired
+    private DateTimeWrapperRepository dateTimeWrapperRepository;
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    private DateTimeWrapper dateTimeWrapper;
+    private DateTimeFormatter dateTimeFormatter;
+    private DateTimeFormatter timeFormatter;
+    private DateTimeFormatter dateFormatter;
+
+    @BeforeEach
+    public void setup() {
+        dateTimeWrapper = new DateTimeWrapper();
+        dateTimeWrapper.setInstant(Instant.parse("2014-11-12T05:50:00.0Z"));
+        dateTimeWrapper.setLocalDateTime(LocalDateTime.parse("2014-11-12T07:50:00.0"));
+        dateTimeWrapper.setOffsetDateTime(OffsetDateTime.parse("2011-12-14T08:30:00.0Z"));
+        dateTimeWrapper.setZonedDateTime(ZonedDateTime.parse("2011-12-14T08:30:00.0Z"));
+        dateTimeWrapper.setLocalTime(LocalTime.parse("14:30:00"));
+        dateTimeWrapper.setOffsetTime(OffsetTime.parse("14:30:00+02:00"));
+        dateTimeWrapper.setLocalDate(LocalDate.parse("2016-09-10"));
+
+        dateTimeFormatter = DateTimeFormatter
+            .ofPattern("yyyy-MM-dd HH:mm:ss.S")
+            .withZone(ZoneId.of("UTC"));
+
+        timeFormatter = DateTimeFormatter
+            .ofPattern("HH:mm:ss")
+            .withZone(ZoneId.of("UTC"));
+
+        dateFormatter = DateTimeFormatter
+            .ofPattern("yyyy-MM-dd");
+    }
+
+    @Test
+    @Transactional
+    public void storeInstantWithUtcConfigShouldBeStoredOnGMTTimeZone() {
+        dateTimeWrapperRepository.saveAndFlush(dateTimeWrapper);
+
+        String request = generateSqlRequest("instant", dateTimeWrapper.getId());
+        SqlRowSet resultSet = jdbcTemplate.queryForRowSet(request);
+        String expectedValue = dateTimeFormatter.format(dateTimeWrapper.getInstant());
+
+        assertThatDateStoredValueIsEqualToInsertDateValueOnGMTTimeZone(resultSet, expectedValue);
+    }
+
+    @Test
+    @Transactional
+    public void storeLocalDateTimeWithUtcConfigShouldBeStoredOnGMTTimeZone() {
+        dateTimeWrapperRepository.saveAndFlush(dateTimeWrapper);
+
+        String request = generateSqlRequest("local_date_time", dateTimeWrapper.getId());
+        SqlRowSet resultSet = jdbcTemplate.queryForRowSet(request);
+        String expectedValue = dateTimeWrapper
+            .getLocalDateTime()
+            .atZone(ZoneId.systemDefault())
+            .format(dateTimeFormatter);
+
+        assertThatDateStoredValueIsEqualToInsertDateValueOnGMTTimeZone(resultSet, expectedValue);
+    }
+
+    @Test
+    @Transactional
+    public void storeOffsetDateTimeWithUtcConfigShouldBeStoredOnGMTTimeZone() {
+        dateTimeWrapperRepository.saveAndFlush(dateTimeWrapper);
+
+        String request = generateSqlRequest("offset_date_time", dateTimeWrapper.getId());
+        SqlRowSet resultSet = jdbcTemplate.queryForRowSet(request);
+        String expectedValue = dateTimeWrapper
+            .getOffsetDateTime()
+            .format(dateTimeFormatter);
+
+        assertThatDateStoredValueIsEqualToInsertDateValueOnGMTTimeZone(resultSet, expectedValue);
+    }
+
+    @Test
+    @Transactional
+    public void storeZoneDateTimeWithUtcConfigShouldBeStoredOnGMTTimeZone() {
+        dateTimeWrapperRepository.saveAndFlush(dateTimeWrapper);
+
+        String request = generateSqlRequest("zoned_date_time", dateTimeWrapper.getId());
+        SqlRowSet resultSet = jdbcTemplate.queryForRowSet(request);
+        String expectedValue = dateTimeWrapper
+            .getZonedDateTime()
+            .format(dateTimeFormatter);
+
+        assertThatDateStoredValueIsEqualToInsertDateValueOnGMTTimeZone(resultSet, expectedValue);
+    }
+
+    @Test
+    @Transactional
+    public void storeLocalTimeWithUtcConfigShouldBeStoredOnGMTTimeZoneAccordingToHis1stJan1970Value() {
+        dateTimeWrapperRepository.saveAndFlush(dateTimeWrapper);
+
+        String request = generateSqlRequest("local_time", dateTimeWrapper.getId());
+        SqlRowSet resultSet = jdbcTemplate.queryForRowSet(request);
+        String expectedValue = dateTimeWrapper
+            .getLocalTime()
+            .atDate(LocalDate.of(1970, Month.JANUARY, 1))
+            .atZone(ZoneId.systemDefault())
+            .format(timeFormatter);
+
+        assertThatDateStoredValueIsEqualToInsertDateValueOnGMTTimeZone(resultSet, expectedValue);
+    }
+
+    @Test
+    @Transactional
+    public void storeOffsetTimeWithUtcConfigShouldBeStoredOnGMTTimeZoneAccordingToHis1stJan1970Value() {
+        dateTimeWrapperRepository.saveAndFlush(dateTimeWrapper);
+
+        String request = generateSqlRequest("offset_time", dateTimeWrapper.getId());
+        SqlRowSet resultSet = jdbcTemplate.queryForRowSet(request);
+        String expectedValue = dateTimeWrapper
+            .getOffsetTime()
+            .toLocalTime()
+            .atDate(LocalDate.of(1970, Month.JANUARY, 1))
+            .atZone(ZoneId.systemDefault())
+            .format(timeFormatter);
+
+        assertThatDateStoredValueIsEqualToInsertDateValueOnGMTTimeZone(resultSet, expectedValue);
+    }
+
+    @Test
+    @Transactional
+    public void storeLocalDateWithUtcConfigShouldBeStoredWithoutTransformation() {
+        dateTimeWrapperRepository.saveAndFlush(dateTimeWrapper);
+
+        String request = generateSqlRequest("local_date", dateTimeWrapper.getId());
+        SqlRowSet resultSet = jdbcTemplate.queryForRowSet(request);
+        String expectedValue = dateTimeWrapper
+            .getLocalDate()
+            .format(dateFormatter);
+
+        assertThatDateStoredValueIsEqualToInsertDateValueOnGMTTimeZone(resultSet, expectedValue);
+    }
+
+    private String generateSqlRequest(String fieldName, long id) {
+        return format("SELECT %s FROM jhi_date_time_wrapper where id=%d", fieldName, id);
+    }
+
+    private void assertThatDateStoredValueIsEqualToInsertDateValueOnGMTTimeZone(SqlRowSet sqlRowSet, String expectedValue) {
+        while (sqlRowSet.next()) {
+            String dbValue = sqlRowSet.getString(1);
+
+            assertThat(dbValue).isNotNull();
+            assertThat(dbValue).isEqualTo(expectedValue);
+        }
+    }
+}
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/config/timezone/HibernateTimeZoneIntegrationTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/config/timezone/HibernateTimeZoneIntegrationTest.java
similarity index 96%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/config/timezone/HibernateTimeZoneIntegrationTest.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/config/timezone/HibernateTimeZoneIntegrationTest.java
index fba77e037e..f0bf619ae4 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/config/timezone/HibernateTimeZoneIntegrationTest.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/config/timezone/HibernateTimeZoneIntegrationTest.java
@@ -1,8 +1,9 @@
-package com.baeldung.jhipster5.config.timezone;
+package com.baeldung.jhipster6.config.timezone;
+
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.repository.timezone.DateTimeWrapper;
+import com.baeldung.jhipster6.repository.timezone.DateTimeWrapperRepository;
 
-import com.baeldung.jhipster5.BookstoreApp;
-import com.baeldung.jhipster5.repository.timezone.DateTimeWrapper;
-import com.baeldung.jhipster5.repository.timezone.DateTimeWrapperRepository;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/repository/CustomAuditEventRepositoryIT.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/repository/CustomAuditEventRepositoryIT.java
new file mode 100644
index 0000000000..a1f27a21da
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/repository/CustomAuditEventRepositoryIT.java
@@ -0,0 +1,163 @@
+package com.baeldung.jhipster6.repository;
+
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.config.Constants;
+import com.baeldung.jhipster6.config.audit.AuditEventConverter;
+import com.baeldung.jhipster6.domain.PersistentAuditEvent;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.audit.AuditEvent;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpSession;
+import org.springframework.security.web.authentication.WebAuthenticationDetails;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.http.HttpSession;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Integration tests for {@link CustomAuditEventRepository}.
+ */
+@SpringBootTest(classes = BookstoreApp.class)
+@Transactional
+public class CustomAuditEventRepositoryIT {
+
+    @Autowired
+    private PersistenceAuditEventRepository persistenceAuditEventRepository;
+
+    @Autowired
+    private AuditEventConverter auditEventConverter;
+
+    private CustomAuditEventRepository customAuditEventRepository;
+
+    private PersistentAuditEvent testUserEvent;
+
+    private PersistentAuditEvent testOtherUserEvent;
+
+    private PersistentAuditEvent testOldUserEvent;
+
+    @BeforeEach
+    public void setup() {
+        customAuditEventRepository = new CustomAuditEventRepository(persistenceAuditEventRepository, auditEventConverter);
+        persistenceAuditEventRepository.deleteAll();
+        Instant oneHourAgo = Instant.now().minusSeconds(3600);
+
+        testUserEvent = new PersistentAuditEvent();
+        testUserEvent.setPrincipal("test-user");
+        testUserEvent.setAuditEventType("test-type");
+        testUserEvent.setAuditEventDate(oneHourAgo);
+        Map<String, String> data = new HashMap<>();
+        data.put("test-key", "test-value");
+        testUserEvent.setData(data);
+
+        testOldUserEvent = new PersistentAuditEvent();
+        testOldUserEvent.setPrincipal("test-user");
+        testOldUserEvent.setAuditEventType("test-type");
+        testOldUserEvent.setAuditEventDate(oneHourAgo.minusSeconds(10000));
+
+        testOtherUserEvent = new PersistentAuditEvent();
+        testOtherUserEvent.setPrincipal("other-test-user");
+        testOtherUserEvent.setAuditEventType("test-type");
+        testOtherUserEvent.setAuditEventDate(oneHourAgo);
+    }
+
+    @Test
+    public void addAuditEvent() {
+        Map<String, Object> data = new HashMap<>();
+        data.put("test-key", "test-value");
+        AuditEvent event = new AuditEvent("test-user", "test-type", data);
+        customAuditEventRepository.add(event);
+        List<PersistentAuditEvent> persistentAuditEvents = persistenceAuditEventRepository.findAll();
+        assertThat(persistentAuditEvents).hasSize(1);
+        PersistentAuditEvent persistentAuditEvent = persistentAuditEvents.get(0);
+        assertThat(persistentAuditEvent.getPrincipal()).isEqualTo(event.getPrincipal());
+        assertThat(persistentAuditEvent.getAuditEventType()).isEqualTo(event.getType());
+        assertThat(persistentAuditEvent.getData()).containsKey("test-key");
+        assertThat(persistentAuditEvent.getData().get("test-key")).isEqualTo("test-value");
+        assertThat(persistentAuditEvent.getAuditEventDate().truncatedTo(ChronoUnit.MILLIS))
+            .isEqualTo(event.getTimestamp().truncatedTo(ChronoUnit.MILLIS));
+    }
+
+    @Test
+    public void addAuditEventTruncateLargeData() {
+        Map<String, Object> data = new HashMap<>();
+        StringBuilder largeData = new StringBuilder();
+        for (int i = 0; i < CustomAuditEventRepository.EVENT_DATA_COLUMN_MAX_LENGTH + 10; i++) {
+            largeData.append("a");
+        }
+        data.put("test-key", largeData);
+        AuditEvent event = new AuditEvent("test-user", "test-type", data);
+        customAuditEventRepository.add(event);
+        List<PersistentAuditEvent> persistentAuditEvents = persistenceAuditEventRepository.findAll();
+        assertThat(persistentAuditEvents).hasSize(1);
+        PersistentAuditEvent persistentAuditEvent = persistentAuditEvents.get(0);
+        assertThat(persistentAuditEvent.getPrincipal()).isEqualTo(event.getPrincipal());
+        assertThat(persistentAuditEvent.getAuditEventType()).isEqualTo(event.getType());
+        assertThat(persistentAuditEvent.getData()).containsKey("test-key");
+        String actualData = persistentAuditEvent.getData().get("test-key");
+        assertThat(actualData.length()).isEqualTo(CustomAuditEventRepository.EVENT_DATA_COLUMN_MAX_LENGTH);
+        assertThat(actualData).isSubstringOf(largeData);
+        assertThat(persistentAuditEvent.getAuditEventDate().truncatedTo(ChronoUnit.MILLIS))
+            .isEqualTo(event.getTimestamp().truncatedTo(ChronoUnit.MILLIS));
+    }
+
+    @Test
+    public void testAddEventWithWebAuthenticationDetails() {
+        HttpSession session = new MockHttpSession(null, "test-session-id");
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        request.setSession(session);
+        request.setRemoteAddr("1.2.3.4");
+        WebAuthenticationDetails details = new WebAuthenticationDetails(request);
+        Map<String, Object> data = new HashMap<>();
+        data.put("test-key", details);
+        AuditEvent event = new AuditEvent("test-user", "test-type", data);
+        customAuditEventRepository.add(event);
+        List<PersistentAuditEvent> persistentAuditEvents = persistenceAuditEventRepository.findAll();
+        assertThat(persistentAuditEvents).hasSize(1);
+        PersistentAuditEvent persistentAuditEvent = persistentAuditEvents.get(0);
+        assertThat(persistentAuditEvent.getData().get("remoteAddress")).isEqualTo("1.2.3.4");
+        assertThat(persistentAuditEvent.getData().get("sessionId")).isEqualTo("test-session-id");
+    }
+
+    @Test
+    public void testAddEventWithNullData() {
+        Map<String, Object> data = new HashMap<>();
+        data.put("test-key", null);
+        AuditEvent event = new AuditEvent("test-user", "test-type", data);
+        customAuditEventRepository.add(event);
+        List<PersistentAuditEvent> persistentAuditEvents = persistenceAuditEventRepository.findAll();
+        assertThat(persistentAuditEvents).hasSize(1);
+        PersistentAuditEvent persistentAuditEvent = persistentAuditEvents.get(0);
+        assertThat(persistentAuditEvent.getData().get("test-key")).isEqualTo("null");
+    }
+
+    @Test
+    public void addAuditEventWithAnonymousUser() {
+        Map<String, Object> data = new HashMap<>();
+        data.put("test-key", "test-value");
+        AuditEvent event = new AuditEvent(Constants.ANONYMOUS_USER, "test-type", data);
+        customAuditEventRepository.add(event);
+        List<PersistentAuditEvent> persistentAuditEvents = persistenceAuditEventRepository.findAll();
+        assertThat(persistentAuditEvents).hasSize(0);
+    }
+
+    @Test
+    public void addAuditEventWithAuthorizationFailureType() {
+        Map<String, Object> data = new HashMap<>();
+        data.put("test-key", "test-value");
+        AuditEvent event = new AuditEvent("test-user", "AUTHORIZATION_FAILURE", data);
+        customAuditEventRepository.add(event);
+        List<PersistentAuditEvent> persistentAuditEvents = persistenceAuditEventRepository.findAll();
+        assertThat(persistentAuditEvents).hasSize(0);
+    }
+
+}
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/repository/CustomAuditEventRepositoryIntegrationTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/repository/CustomAuditEventRepositoryIntegrationTest.java
similarity index 93%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/repository/CustomAuditEventRepositoryIntegrationTest.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/repository/CustomAuditEventRepositoryIntegrationTest.java
index 948bf43f87..89ed2d4649 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/repository/CustomAuditEventRepositoryIntegrationTest.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/repository/CustomAuditEventRepositoryIntegrationTest.java
@@ -1,9 +1,10 @@
-package com.baeldung.jhipster5.repository;
+package com.baeldung.jhipster6.repository;
+
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.config.Constants;
+import com.baeldung.jhipster6.config.audit.AuditEventConverter;
+import com.baeldung.jhipster6.domain.PersistentAuditEvent;
 
-import com.baeldung.jhipster5.BookstoreApp;
-import com.baeldung.jhipster5.config.Constants;
-import com.baeldung.jhipster5.config.audit.AuditEventConverter;
-import com.baeldung.jhipster5.domain.PersistentAuditEvent;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -23,7 +24,6 @@ import java.util.List;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static com.baeldung.jhipster5.repository.CustomAuditEventRepository.EVENT_DATA_COLUMN_MAX_LENGTH;
 
 /**
  * Test class for the CustomAuditEventRepository class.
@@ -94,7 +94,7 @@ public class CustomAuditEventRepositoryIntegrationTest {
     public void addAuditEventTruncateLargeData() {
         Map<String, Object> data = new HashMap<>();
         StringBuilder largeData = new StringBuilder();
-        for (int i = 0; i < EVENT_DATA_COLUMN_MAX_LENGTH + 10; i++) {
+        for (int i = 0; i < CustomAuditEventRepository.EVENT_DATA_COLUMN_MAX_LENGTH + 10; i++) {
             largeData.append("a");
         }
         data.put("test-key", largeData);
@@ -107,7 +107,7 @@ public class CustomAuditEventRepositoryIntegrationTest {
         assertThat(persistentAuditEvent.getAuditEventType()).isEqualTo(event.getType());
         assertThat(persistentAuditEvent.getData()).containsKey("test-key");
         String actualData = persistentAuditEvent.getData().get("test-key");
-        assertThat(actualData.length()).isEqualTo(EVENT_DATA_COLUMN_MAX_LENGTH);
+        assertThat(actualData.length()).isEqualTo(CustomAuditEventRepository.EVENT_DATA_COLUMN_MAX_LENGTH);
         assertThat(actualData).isSubstringOf(largeData);
         assertThat(persistentAuditEvent.getAuditEventDate()).isEqualTo(event.getTimestamp());
     }
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/repository/timezone/DateTimeWrapper.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/repository/timezone/DateTimeWrapper.java
similarity index 98%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/repository/timezone/DateTimeWrapper.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/repository/timezone/DateTimeWrapper.java
index 473a8e782e..0d03a44cf8 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/repository/timezone/DateTimeWrapper.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/repository/timezone/DateTimeWrapper.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.repository.timezone;
+package com.baeldung.jhipster6.repository.timezone;
 
 import javax.persistence.*;
 import java.io.Serializable;
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/repository/timezone/DateTimeWrapperRepository.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/repository/timezone/DateTimeWrapperRepository.java
similarity index 84%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/repository/timezone/DateTimeWrapperRepository.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/repository/timezone/DateTimeWrapperRepository.java
index 9c3831879f..5923db6ca0 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/repository/timezone/DateTimeWrapperRepository.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/repository/timezone/DateTimeWrapperRepository.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.repository.timezone;
+package com.baeldung.jhipster6.repository.timezone;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
diff --git a/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/DomainUserDetailsServiceIT.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/DomainUserDetailsServiceIT.java
new file mode 100644
index 0000000000..3e641dfad7
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/DomainUserDetailsServiceIT.java
@@ -0,0 +1,125 @@
+package com.baeldung.jhipster6.security;
+
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.domain.User;
+import com.baeldung.jhipster6.repository.UserRepository;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Locale;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+/**
+ * Integrations tests for {@link DomainUserDetailsService}.
+ */
+@SpringBootTest(classes = BookstoreApp.class)
+@Transactional
+public class DomainUserDetailsServiceIT {
+
+    private static final String USER_ONE_LOGIN = "test-user-one";
+    private static final String USER_ONE_EMAIL = "test-user-one@localhost";
+    private static final String USER_TWO_LOGIN = "test-user-two";
+    private static final String USER_TWO_EMAIL = "test-user-two@localhost";
+    private static final String USER_THREE_LOGIN = "test-user-three";
+    private static final String USER_THREE_EMAIL = "test-user-three@localhost";
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private UserDetailsService domainUserDetailsService;
+
+    private User userOne;
+    private User userTwo;
+    private User userThree;
+
+    @BeforeEach
+    public void init() {
+        userOne = new User();
+        userOne.setLogin(USER_ONE_LOGIN);
+        userOne.setPassword(RandomStringUtils.random(60));
+        userOne.setActivated(true);
+        userOne.setEmail(USER_ONE_EMAIL);
+        userOne.setFirstName("userOne");
+        userOne.setLastName("doe");
+        userOne.setLangKey("en");
+        userRepository.save(userOne);
+
+        userTwo = new User();
+        userTwo.setLogin(USER_TWO_LOGIN);
+        userTwo.setPassword(RandomStringUtils.random(60));
+        userTwo.setActivated(true);
+        userTwo.setEmail(USER_TWO_EMAIL);
+        userTwo.setFirstName("userTwo");
+        userTwo.setLastName("doe");
+        userTwo.setLangKey("en");
+        userRepository.save(userTwo);
+
+        userThree = new User();
+        userThree.setLogin(USER_THREE_LOGIN);
+        userThree.setPassword(RandomStringUtils.random(60));
+        userThree.setActivated(false);
+        userThree.setEmail(USER_THREE_EMAIL);
+        userThree.setFirstName("userThree");
+        userThree.setLastName("doe");
+        userThree.setLangKey("en");
+        userRepository.save(userThree);
+    }
+
+    @Test
+    @Transactional
+    public void assertThatUserCanBeFoundByLogin() {
+        UserDetails userDetails = domainUserDetailsService.loadUserByUsername(USER_ONE_LOGIN);
+        assertThat(userDetails).isNotNull();
+        assertThat(userDetails.getUsername()).isEqualTo(USER_ONE_LOGIN);
+    }
+
+    @Test
+    @Transactional
+    public void assertThatUserCanBeFoundByLoginIgnoreCase() {
+        UserDetails userDetails = domainUserDetailsService.loadUserByUsername(USER_ONE_LOGIN.toUpperCase(Locale.ENGLISH));
+        assertThat(userDetails).isNotNull();
+        assertThat(userDetails.getUsername()).isEqualTo(USER_ONE_LOGIN);
+    }
+
+    @Test
+    @Transactional
+    public void assertThatUserCanBeFoundByEmail() {
+        UserDetails userDetails = domainUserDetailsService.loadUserByUsername(USER_TWO_EMAIL);
+        assertThat(userDetails).isNotNull();
+        assertThat(userDetails.getUsername()).isEqualTo(USER_TWO_LOGIN);
+    }
+
+    @Test
+    @Transactional
+    public void assertThatUserCanNotBeFoundByEmailIgnoreCase() {
+        assertThatExceptionOfType(UsernameNotFoundException.class).isThrownBy(
+            () -> domainUserDetailsService.loadUserByUsername(USER_TWO_EMAIL.toUpperCase(Locale.ENGLISH)));
+    }
+
+    @Test
+    @Transactional
+    public void assertThatEmailIsPrioritizedOverLogin() {
+        UserDetails userDetails = domainUserDetailsService.loadUserByUsername(USER_ONE_EMAIL);
+        assertThat(userDetails).isNotNull();
+        assertThat(userDetails.getUsername()).isEqualTo(USER_ONE_LOGIN);
+    }
+
+    @Test
+    @Transactional
+    public void assertThatUserNotActivatedExceptionIsThrownForNotActivatedUsers() {
+        assertThatExceptionOfType(UserNotActivatedException.class).isThrownBy(
+            () -> domainUserDetailsService.loadUserByUsername(USER_THREE_LOGIN));
+    }
+
+}
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/security/DomainUserDetailsServiceIntegrationTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/DomainUserDetailsServiceIntegrationTest.java
similarity index 95%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/security/DomainUserDetailsServiceIntegrationTest.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/DomainUserDetailsServiceIntegrationTest.java
index 11757f6516..bf30067406 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/security/DomainUserDetailsServiceIntegrationTest.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/DomainUserDetailsServiceIntegrationTest.java
@@ -1,8 +1,8 @@
-package com.baeldung.jhipster5.security;
+package com.baeldung.jhipster6.security;
 
-import com.baeldung.jhipster5.BookstoreApp;
-import com.baeldung.jhipster5.domain.User;
-import com.baeldung.jhipster5.repository.UserRepository;
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.domain.User;
+import com.baeldung.jhipster6.repository.UserRepository;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Before;
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/security/MockAuthenticationManager.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/MockAuthenticationManager.java
similarity index 98%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/security/MockAuthenticationManager.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/MockAuthenticationManager.java
index bdcdba7644..0b32072010 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/security/MockAuthenticationManager.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/MockAuthenticationManager.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.security;
+package com.baeldung.jhipster6.security;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/security/SecurityUtilsUnitTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/SecurityUtilsUnitTest.java
similarity index 98%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/security/SecurityUtilsUnitTest.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/SecurityUtilsUnitTest.java
index b2736badd6..b017acd022 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/security/SecurityUtilsUnitTest.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/SecurityUtilsUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.security;
+package com.baeldung.jhipster6.security;
 
 import org.junit.Test;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
diff --git a/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/jwt/JWTFilter2UnitTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/jwt/JWTFilter2UnitTest.java
new file mode 100644
index 0000000000..11a64993e9
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/jwt/JWTFilter2UnitTest.java
@@ -0,0 +1,116 @@
+package com.baeldung.jhipster6.security.jwt;
+
+import com.baeldung.jhipster6.security.AuthoritiesConstants;
+
+import io.github.jhipster.config.JHipsterProperties;
+import io.jsonwebtoken.io.Decoders;
+import io.jsonwebtoken.security.Keys;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.http.HttpStatus;
+import org.springframework.mock.web.MockFilterChain;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.util.Collections;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class JWTFilter2UnitTest {
+
+    private TokenProvider tokenProvider;
+
+    private JWTFilter jwtFilter;
+
+    @Before
+    public void setup() {
+        JHipsterProperties jHipsterProperties = new JHipsterProperties();
+        tokenProvider = new TokenProvider(jHipsterProperties);
+        ReflectionTestUtils.setField(tokenProvider, "key",
+            Keys.hmacShaKeyFor(Decoders.BASE64
+                .decode("fd54a45s65fds737b9aafcb3412e07ed99b267f33413274720ddbb7f6c5e64e9f14075f2d7ed041592f0b7657baf8")));
+
+        ReflectionTestUtils.setField(tokenProvider, "tokenValidityInMilliseconds", 60000);
+        jwtFilter = new JWTFilter(tokenProvider);
+        SecurityContextHolder.getContext().setAuthentication(null);
+    }
+
+    @Test
+    public void testJWTFilter() throws Exception {
+        UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(
+            "test-user",
+            "test-password",
+            Collections.singletonList(new SimpleGrantedAuthority(AuthoritiesConstants.USER))
+        );
+        String jwt = tokenProvider.createToken(authentication, false);
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        request.addHeader(JWTFilter.AUTHORIZATION_HEADER, "Bearer " + jwt);
+        request.setRequestURI("/api/test");
+        MockHttpServletResponse response = new MockHttpServletResponse();
+        MockFilterChain filterChain = new MockFilterChain();
+        jwtFilter.doFilter(request, response, filterChain);
+        assertThat(response.getStatus()).isEqualTo(HttpStatus.OK.value());
+        assertThat(SecurityContextHolder.getContext().getAuthentication().getName()).isEqualTo("test-user");
+        assertThat(SecurityContextHolder.getContext().getAuthentication().getCredentials().toString()).isEqualTo(jwt);
+    }
+
+    @Test
+    public void testJWTFilterInvalidToken() throws Exception {
+        String jwt = "wrong_jwt";
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        request.addHeader(JWTFilter.AUTHORIZATION_HEADER, "Bearer " + jwt);
+        request.setRequestURI("/api/test");
+        MockHttpServletResponse response = new MockHttpServletResponse();
+        MockFilterChain filterChain = new MockFilterChain();
+        jwtFilter.doFilter(request, response, filterChain);
+        assertThat(response.getStatus()).isEqualTo(HttpStatus.OK.value());
+        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
+    }
+
+    @Test
+    public void testJWTFilterMissingAuthorization() throws Exception {
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        request.setRequestURI("/api/test");
+        MockHttpServletResponse response = new MockHttpServletResponse();
+        MockFilterChain filterChain = new MockFilterChain();
+        jwtFilter.doFilter(request, response, filterChain);
+        assertThat(response.getStatus()).isEqualTo(HttpStatus.OK.value());
+        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
+    }
+
+    @Test
+    public void testJWTFilterMissingToken() throws Exception {
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        request.addHeader(JWTFilter.AUTHORIZATION_HEADER, "Bearer ");
+        request.setRequestURI("/api/test");
+        MockHttpServletResponse response = new MockHttpServletResponse();
+        MockFilterChain filterChain = new MockFilterChain();
+        jwtFilter.doFilter(request, response, filterChain);
+        assertThat(response.getStatus()).isEqualTo(HttpStatus.OK.value());
+        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
+    }
+
+    @Test
+    public void testJWTFilterWrongScheme() throws Exception {
+        UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(
+            "test-user",
+            "test-password",
+            Collections.singletonList(new SimpleGrantedAuthority(AuthoritiesConstants.USER))
+        );
+        String jwt = tokenProvider.createToken(authentication, false);
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        request.addHeader(JWTFilter.AUTHORIZATION_HEADER, "Basic " + jwt);
+        request.setRequestURI("/api/test");
+        MockHttpServletResponse response = new MockHttpServletResponse();
+        MockFilterChain filterChain = new MockFilterChain();
+        jwtFilter.doFilter(request, response, filterChain);
+        assertThat(response.getStatus()).isEqualTo(HttpStatus.OK.value());
+        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
+    }
+
+}
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/security/jwt/JWTFilterUnitTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/jwt/JWTFilterUnitTest.java
similarity index 96%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/security/jwt/JWTFilterUnitTest.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/jwt/JWTFilterUnitTest.java
index 2be8e6809a..13633c901c 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/security/jwt/JWTFilterUnitTest.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/jwt/JWTFilterUnitTest.java
@@ -1,12 +1,13 @@
-package com.baeldung.jhipster5.security.jwt;
+package com.baeldung.jhipster6.security.jwt;
+
+import com.baeldung.jhipster6.security.AuthoritiesConstants;
 
-import com.baeldung.jhipster5.security.AuthoritiesConstants;
 import io.github.jhipster.config.JHipsterProperties;
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.security.Keys;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 import org.springframework.mock.web.MockFilterChain;
 import org.springframework.mock.web.MockHttpServletRequest;
@@ -26,7 +27,7 @@ public class JWTFilterUnitTest {
 
     private JWTFilter jwtFilter;
 
-    @Before
+    @BeforeEach
     public void setup() {
         JHipsterProperties jHipsterProperties = new JHipsterProperties();
         tokenProvider = new TokenProvider(jHipsterProperties);
diff --git a/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/jwt/TokenProvider2UnitTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/jwt/TokenProvider2UnitTest.java
new file mode 100644
index 0000000000..311deb3fd7
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/jwt/TokenProvider2UnitTest.java
@@ -0,0 +1,111 @@
+package com.baeldung.jhipster6.security.jwt;
+
+import com.baeldung.jhipster6.security.AuthoritiesConstants;
+
+import java.security.Key;
+import java.util.*;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import io.github.jhipster.config.JHipsterProperties;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import io.jsonwebtoken.io.Decoders;
+import io.jsonwebtoken.security.Keys;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TokenProvider2UnitTest {
+
+    private final long ONE_MINUTE = 60000;
+    private Key key;
+    private JHipsterProperties jHipsterProperties;
+    private TokenProvider tokenProvider;
+
+    @Before
+    public void setup() {
+        jHipsterProperties = Mockito.mock(JHipsterProperties.class);
+        tokenProvider = new TokenProvider(jHipsterProperties);
+        key = Keys.hmacShaKeyFor(Decoders.BASE64
+            .decode("fd54a45s65fds737b9aafcb3412e07ed99b267f33413274720ddbb7f6c5e64e9f14075f2d7ed041592f0b7657baf8"));
+
+        ReflectionTestUtils.setField(tokenProvider, "key", key);
+        ReflectionTestUtils.setField(tokenProvider, "tokenValidityInMilliseconds", ONE_MINUTE);
+    }
+
+    @Test
+    public void testReturnFalseWhenJWThasInvalidSignature() {
+        boolean isTokenValid = tokenProvider.validateToken(createTokenWithDifferentSignature());
+
+        assertThat(isTokenValid).isEqualTo(false);
+    }
+
+    @Test
+    public void testReturnFalseWhenJWTisMalformed() {
+        Authentication authentication = createAuthentication();
+        String token = tokenProvider.createToken(authentication, false);
+        String invalidToken = token.substring(1);
+        boolean isTokenValid = tokenProvider.validateToken(invalidToken);
+
+        assertThat(isTokenValid).isEqualTo(false);
+    }
+
+    @Test
+    public void testReturnFalseWhenJWTisExpired() {
+        ReflectionTestUtils.setField(tokenProvider, "tokenValidityInMilliseconds", -ONE_MINUTE);
+
+        Authentication authentication = createAuthentication();
+        String token = tokenProvider.createToken(authentication, false);
+
+        boolean isTokenValid = tokenProvider.validateToken(token);
+
+        assertThat(isTokenValid).isEqualTo(false);
+    }
+
+    @Test
+    public void testReturnFalseWhenJWTisUnsupported() {
+        String unsupportedToken = createUnsupportedToken();
+
+        boolean isTokenValid = tokenProvider.validateToken(unsupportedToken);
+
+        assertThat(isTokenValid).isEqualTo(false);
+    }
+
+    @Test
+    public void testReturnFalseWhenJWTisInvalid() {
+        boolean isTokenValid = tokenProvider.validateToken("");
+
+        assertThat(isTokenValid).isEqualTo(false);
+    }
+
+    private Authentication createAuthentication() {
+        Collection<GrantedAuthority> authorities = new ArrayList<>();
+        authorities.add(new SimpleGrantedAuthority(AuthoritiesConstants.ANONYMOUS));
+        return new UsernamePasswordAuthenticationToken("anonymous", "anonymous", authorities);
+    }
+
+    private String createUnsupportedToken() {
+        return Jwts.builder()
+            .setPayload("payload")
+            .signWith(key, SignatureAlgorithm.HS512)
+            .compact();
+    }
+
+    private String createTokenWithDifferentSignature() {
+        Key otherKey = Keys.hmacShaKeyFor(Decoders.BASE64
+            .decode("Xfd54a45s65fds737b9aafcb3412e07ed99b267f33413274720ddbb7f6c5e64e9f14075f2d7ed041592f0b7657baf8"));
+
+        return Jwts.builder()
+            .setSubject("anonymous")
+            .signWith(otherKey, SignatureAlgorithm.HS512)
+            .setExpiration(new Date(new Date().getTime() + ONE_MINUTE))
+            .compact();
+    }
+}
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/security/jwt/TokenProviderUnitTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/jwt/TokenProviderUnitTest.java
similarity index 89%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/security/jwt/TokenProviderUnitTest.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/jwt/TokenProviderUnitTest.java
index 18da2eb875..3d14352c79 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/security/jwt/TokenProviderUnitTest.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/security/jwt/TokenProviderUnitTest.java
@@ -1,13 +1,12 @@
-package com.baeldung.jhipster5.security.jwt;
+package com.baeldung.jhipster6.security.jwt;
 
-import com.baeldung.jhipster5.security.AuthoritiesConstants;
+import com.baeldung.jhipster6.security.AuthoritiesConstants;
 
 import java.security.Key;
 import java.util.*;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
@@ -24,15 +23,14 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class TokenProviderUnitTest {
 
-    private final long ONE_MINUTE = 60000;
+    private static final long ONE_MINUTE = 60000;
+
     private Key key;
-    private JHipsterProperties jHipsterProperties;
     private TokenProvider tokenProvider;
 
-    @Before
+    @BeforeEach
     public void setup() {
-        jHipsterProperties = Mockito.mock(JHipsterProperties.class);
-        tokenProvider = new TokenProvider(jHipsterProperties);
+        tokenProvider = new TokenProvider( new JHipsterProperties());
         key = Keys.hmacShaKeyFor(Decoders.BASE64
             .decode("fd54a45s65fds737b9aafcb3412e07ed99b267f33413274720ddbb7f6c5e64e9f14075f2d7ed041592f0b7657baf8"));
 
diff --git a/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/service/MailServiceIT.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/service/MailServiceIT.java
new file mode 100644
index 0000000000..602ff4319d
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/service/MailServiceIT.java
@@ -0,0 +1,189 @@
+package com.baeldung.jhipster6.service;
+
+import com.baeldung.jhipster6.config.Constants;
+
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.domain.User;
+
+import io.github.jhipster.config.JHipsterProperties;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.MessageSource;
+import org.springframework.mail.MailSendException;
+import org.springframework.mail.javamail.JavaMailSenderImpl;
+import org.thymeleaf.spring5.SpringTemplateEngine;
+
+import javax.mail.Multipart;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+import java.io.ByteArrayOutputStream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+/**
+ * Integration tests for {@link MailService}.
+ */
+@SpringBootTest(classes = BookstoreApp.class)
+public class MailServiceIT {
+
+    @Autowired
+    private JHipsterProperties jHipsterProperties;
+
+    @Autowired
+    private MessageSource messageSource;
+
+    @Autowired
+    private SpringTemplateEngine templateEngine;
+
+    @Spy
+    private JavaMailSenderImpl javaMailSender;
+
+    @Captor
+    private ArgumentCaptor<MimeMessage> messageCaptor;
+
+    private MailService mailService;
+
+    @BeforeEach
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        doNothing().when(javaMailSender).send(any(MimeMessage.class));
+        mailService = new MailService(jHipsterProperties, javaMailSender, messageSource, templateEngine);
+    }
+
+    @Test
+    public void testSendEmail() throws Exception {
+        mailService.sendEmail("john.doe@example.com", "testSubject", "testContent", false, false);
+        verify(javaMailSender).send(messageCaptor.capture());
+        MimeMessage message = messageCaptor.getValue();
+        assertThat(message.getSubject()).isEqualTo("testSubject");
+        assertThat(message.getAllRecipients()[0].toString()).isEqualTo("john.doe@example.com");
+        assertThat(message.getFrom()[0].toString()).isEqualTo("test@localhost");
+        assertThat(message.getContent()).isInstanceOf(String.class);
+        assertThat(message.getContent().toString()).isEqualTo("testContent");
+        assertThat(message.getDataHandler().getContentType()).isEqualTo("text/plain; charset=UTF-8");
+    }
+
+    @Test
+    public void testSendHtmlEmail() throws Exception {
+        mailService.sendEmail("john.doe@example.com", "testSubject", "testContent", false, true);
+        verify(javaMailSender).send(messageCaptor.capture());
+        MimeMessage message = messageCaptor.getValue();
+        assertThat(message.getSubject()).isEqualTo("testSubject");
+        assertThat(message.getAllRecipients()[0].toString()).isEqualTo("john.doe@example.com");
+        assertThat(message.getFrom()[0].toString()).isEqualTo("test@localhost");
+        assertThat(message.getContent()).isInstanceOf(String.class);
+        assertThat(message.getContent().toString()).isEqualTo("testContent");
+        assertThat(message.getDataHandler().getContentType()).isEqualTo("text/html;charset=UTF-8");
+    }
+
+    @Test
+    public void testSendMultipartEmail() throws Exception {
+        mailService.sendEmail("john.doe@example.com", "testSubject", "testContent", true, false);
+        verify(javaMailSender).send(messageCaptor.capture());
+        MimeMessage message = messageCaptor.getValue();
+        MimeMultipart mp = (MimeMultipart) message.getContent();
+        MimeBodyPart part = (MimeBodyPart) ((MimeMultipart) mp.getBodyPart(0).getContent()).getBodyPart(0);
+        ByteArrayOutputStream aos = new ByteArrayOutputStream();
+        part.writeTo(aos);
+        assertThat(message.getSubject()).isEqualTo("testSubject");
+        assertThat(message.getAllRecipients()[0].toString()).isEqualTo("john.doe@example.com");
+        assertThat(message.getFrom()[0].toString()).isEqualTo("test@localhost");
+        assertThat(message.getContent()).isInstanceOf(Multipart.class);
+        assertThat(aos.toString()).isEqualTo("\r\ntestContent");
+        assertThat(part.getDataHandler().getContentType()).isEqualTo("text/plain; charset=UTF-8");
+    }
+
+    @Test
+    public void testSendMultipartHtmlEmail() throws Exception {
+        mailService.sendEmail("john.doe@example.com", "testSubject", "testContent", true, true);
+        verify(javaMailSender).send(messageCaptor.capture());
+        MimeMessage message = messageCaptor.getValue();
+        MimeMultipart mp = (MimeMultipart) message.getContent();
+        MimeBodyPart part = (MimeBodyPart) ((MimeMultipart) mp.getBodyPart(0).getContent()).getBodyPart(0);
+        ByteArrayOutputStream aos = new ByteArrayOutputStream();
+        part.writeTo(aos);
+        assertThat(message.getSubject()).isEqualTo("testSubject");
+        assertThat(message.getAllRecipients()[0].toString()).isEqualTo("john.doe@example.com");
+        assertThat(message.getFrom()[0].toString()).isEqualTo("test@localhost");
+        assertThat(message.getContent()).isInstanceOf(Multipart.class);
+        assertThat(aos.toString()).isEqualTo("\r\ntestContent");
+        assertThat(part.getDataHandler().getContentType()).isEqualTo("text/html;charset=UTF-8");
+    }
+
+    @Test
+    public void testSendEmailFromTemplate() throws Exception {
+        User user = new User();
+        user.setLogin("john");
+        user.setEmail("john.doe@example.com");
+        user.setLangKey("en");
+        mailService.sendEmailFromTemplate(user, "mail/testEmail", "email.test.title");
+        verify(javaMailSender).send(messageCaptor.capture());
+        MimeMessage message = messageCaptor.getValue();
+        assertThat(message.getSubject()).isEqualTo("test title");
+        assertThat(message.getAllRecipients()[0].toString()).isEqualTo(user.getEmail());
+        assertThat(message.getFrom()[0].toString()).isEqualTo("test@localhost");
+        assertThat(message.getContent().toString()).isEqualToNormalizingNewlines("<html>test title, http://127.0.0.1:8080, john</html>\n");
+        assertThat(message.getDataHandler().getContentType()).isEqualTo("text/html;charset=UTF-8");
+    }
+
+    @Test
+    public void testSendActivationEmail() throws Exception {
+        User user = new User();
+        user.setLangKey(Constants.DEFAULT_LANGUAGE);
+        user.setLogin("john");
+        user.setEmail("john.doe@example.com");
+        mailService.sendActivationEmail(user);
+        verify(javaMailSender).send(messageCaptor.capture());
+        MimeMessage message = messageCaptor.getValue();
+        assertThat(message.getAllRecipients()[0].toString()).isEqualTo(user.getEmail());
+        assertThat(message.getFrom()[0].toString()).isEqualTo("test@localhost");
+        assertThat(message.getContent().toString()).isNotEmpty();
+        assertThat(message.getDataHandler().getContentType()).isEqualTo("text/html;charset=UTF-8");
+    }
+
+    @Test
+    public void testCreationEmail() throws Exception {
+        User user = new User();
+        user.setLangKey(Constants.DEFAULT_LANGUAGE);
+        user.setLogin("john");
+        user.setEmail("john.doe@example.com");
+        mailService.sendCreationEmail(user);
+        verify(javaMailSender).send(messageCaptor.capture());
+        MimeMessage message = messageCaptor.getValue();
+        assertThat(message.getAllRecipients()[0].toString()).isEqualTo(user.getEmail());
+        assertThat(message.getFrom()[0].toString()).isEqualTo("test@localhost");
+        assertThat(message.getContent().toString()).isNotEmpty();
+        assertThat(message.getDataHandler().getContentType()).isEqualTo("text/html;charset=UTF-8");
+    }
+
+    @Test
+    public void testSendPasswordResetMail() throws Exception {
+        User user = new User();
+        user.setLangKey(Constants.DEFAULT_LANGUAGE);
+        user.setLogin("john");
+        user.setEmail("john.doe@example.com");
+        mailService.sendPasswordResetMail(user);
+        verify(javaMailSender).send(messageCaptor.capture());
+        MimeMessage message = messageCaptor.getValue();
+        assertThat(message.getAllRecipients()[0].toString()).isEqualTo(user.getEmail());
+        assertThat(message.getFrom()[0].toString()).isEqualTo("test@localhost");
+        assertThat(message.getContent().toString()).isNotEmpty();
+        assertThat(message.getDataHandler().getContentType()).isEqualTo("text/html;charset=UTF-8");
+    }
+
+    @Test
+    public void testSendEmailWithException() throws Exception {
+        doThrow(MailSendException.class).when(javaMailSender).send(any(MimeMessage.class));
+        mailService.sendEmail("john.doe@example.com", "testSubject", "testContent", false, false);
+    }
+
+}
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/service/MailServiceIntegrationTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/service/MailServiceIntegrationTest.java
similarity index 98%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/service/MailServiceIntegrationTest.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/service/MailServiceIntegrationTest.java
index 72592e1239..af04430ee7 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/service/MailServiceIntegrationTest.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/service/MailServiceIntegrationTest.java
@@ -1,8 +1,9 @@
-package com.baeldung.jhipster5.service;
-import com.baeldung.jhipster5.config.Constants;
+package com.baeldung.jhipster6.service;
+import com.baeldung.jhipster6.config.Constants;
+
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.domain.User;
 
-import com.baeldung.jhipster5.BookstoreApp;
-import com.baeldung.jhipster5.domain.User;
 import io.github.jhipster.config.JHipsterProperties;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/service/UserServiceIT.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/service/UserServiceIT.java
new file mode 100644
index 0000000000..5c624b166d
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/service/UserServiceIT.java
@@ -0,0 +1,200 @@
+package com.baeldung.jhipster6.service;
+
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.config.Constants;
+import com.baeldung.jhipster6.domain.User;
+import com.baeldung.jhipster6.repository.UserRepository;
+import com.baeldung.jhipster6.service.dto.UserDTO;
+import com.baeldung.jhipster6.service.util.RandomUtil;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.auditing.AuditingHandler;
+import org.springframework.data.auditing.DateTimeProvider;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.time.LocalDateTime;
+import java.util.Optional;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+/**
+ * Integration tests for {@link UserService}.
+ */
+@SpringBootTest(classes = BookstoreApp.class)
+@Transactional
+public class UserServiceIT {
+
+    private static final String DEFAULT_LOGIN = "johndoe";
+
+    private static final String DEFAULT_EMAIL = "johndoe@localhost";
+
+    private static final String DEFAULT_FIRSTNAME = "john";
+
+    private static final String DEFAULT_LASTNAME = "doe";
+
+    private static final String DEFAULT_IMAGEURL = "http://placehold.it/50x50";
+
+    private static final String DEFAULT_LANGKEY = "en";
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private AuditingHandler auditingHandler;
+
+    @Mock
+    private DateTimeProvider dateTimeProvider;
+
+    private User user;
+
+    @BeforeEach
+    public void init() {
+        user = new User();
+        user.setLogin(DEFAULT_LOGIN);
+        user.setPassword(RandomStringUtils.random(60));
+        user.setActivated(true);
+        user.setEmail(DEFAULT_EMAIL);
+        user.setFirstName(DEFAULT_FIRSTNAME);
+        user.setLastName(DEFAULT_LASTNAME);
+        user.setImageUrl(DEFAULT_IMAGEURL);
+        user.setLangKey(DEFAULT_LANGKEY);
+
+        when(dateTimeProvider.getNow()).thenReturn(Optional.of(LocalDateTime.now()));
+        auditingHandler.setDateTimeProvider(dateTimeProvider);
+    }
+
+    @Test
+    @Transactional
+    public void assertThatUserMustExistToResetPassword() {
+        userRepository.saveAndFlush(user);
+        Optional<User> maybeUser = userService.requestPasswordReset("invalid.login@localhost");
+        assertThat(maybeUser).isNotPresent();
+
+        maybeUser = userService.requestPasswordReset(user.getEmail());
+        assertThat(maybeUser).isPresent();
+        assertThat(maybeUser.orElse(null).getEmail()).isEqualTo(user.getEmail());
+        assertThat(maybeUser.orElse(null).getResetDate()).isNotNull();
+        assertThat(maybeUser.orElse(null).getResetKey()).isNotNull();
+    }
+
+    @Test
+    @Transactional
+    public void assertThatOnlyActivatedUserCanRequestPasswordReset() {
+        user.setActivated(false);
+        userRepository.saveAndFlush(user);
+
+        Optional<User> maybeUser = userService.requestPasswordReset(user.getLogin());
+        assertThat(maybeUser).isNotPresent();
+        userRepository.delete(user);
+    }
+
+    @Test
+    @Transactional
+    public void assertThatResetKeyMustNotBeOlderThan24Hours() {
+        Instant daysAgo = Instant.now().minus(25, ChronoUnit.HOURS);
+        String resetKey = RandomUtil.generateResetKey();
+        user.setActivated(true);
+        user.setResetDate(daysAgo);
+        user.setResetKey(resetKey);
+        userRepository.saveAndFlush(user);
+
+        Optional<User> maybeUser = userService.completePasswordReset("johndoe2", user.getResetKey());
+        assertThat(maybeUser).isNotPresent();
+        userRepository.delete(user);
+    }
+
+    @Test
+    @Transactional
+    public void assertThatResetKeyMustBeValid() {
+        Instant daysAgo = Instant.now().minus(25, ChronoUnit.HOURS);
+        user.setActivated(true);
+        user.setResetDate(daysAgo);
+        user.setResetKey("1234");
+        userRepository.saveAndFlush(user);
+
+        Optional<User> maybeUser = userService.completePasswordReset("johndoe2", user.getResetKey());
+        assertThat(maybeUser).isNotPresent();
+        userRepository.delete(user);
+    }
+
+    @Test
+    @Transactional
+    public void assertThatUserCanResetPassword() {
+        String oldPassword = user.getPassword();
+        Instant daysAgo = Instant.now().minus(2, ChronoUnit.HOURS);
+        String resetKey = RandomUtil.generateResetKey();
+        user.setActivated(true);
+        user.setResetDate(daysAgo);
+        user.setResetKey(resetKey);
+        userRepository.saveAndFlush(user);
+
+        Optional<User> maybeUser = userService.completePasswordReset("johndoe2", user.getResetKey());
+        assertThat(maybeUser).isPresent();
+        assertThat(maybeUser.orElse(null).getResetDate()).isNull();
+        assertThat(maybeUser.orElse(null).getResetKey()).isNull();
+        assertThat(maybeUser.orElse(null).getPassword()).isNotEqualTo(oldPassword);
+
+        userRepository.delete(user);
+    }
+
+    @Test
+    @Transactional
+    public void testFindNotActivatedUsersByCreationDateBefore() {
+        Instant now = Instant.now();
+        when(dateTimeProvider.getNow()).thenReturn(Optional.of(now.minus(4, ChronoUnit.DAYS)));
+        user.setActivated(false);
+        User dbUser = userRepository.saveAndFlush(user);
+        dbUser.setCreatedDate(now.minus(4, ChronoUnit.DAYS));
+        userRepository.saveAndFlush(user);
+        List<User> users = userRepository.findAllByActivatedIsFalseAndCreatedDateBefore(now.minus(3, ChronoUnit.DAYS));
+        assertThat(users).isNotEmpty();
+        userService.removeNotActivatedUsers();
+        users = userRepository.findAllByActivatedIsFalseAndCreatedDateBefore(now.minus(3, ChronoUnit.DAYS));
+        assertThat(users).isEmpty();
+    }
+
+    @Test
+    @Transactional
+    public void assertThatAnonymousUserIsNotGet() {
+        user.setLogin(Constants.ANONYMOUS_USER);
+        if (!userRepository.findOneByLogin(Constants.ANONYMOUS_USER).isPresent()) {
+            userRepository.saveAndFlush(user);
+        }
+        final PageRequest pageable = PageRequest.of(0, (int) userRepository.count());
+        final Page<UserDTO> allManagedUsers = userService.getAllManagedUsers(pageable);
+        assertThat(allManagedUsers.getContent().stream()
+            .noneMatch(user -> Constants.ANONYMOUS_USER.equals(user.getLogin())))
+            .isTrue();
+    }
+
+
+    @Test
+    @Transactional
+    public void testRemoveNotActivatedUsers() {
+        // custom "now" for audit to use as creation date
+        when(dateTimeProvider.getNow()).thenReturn(Optional.of(Instant.now().minus(30, ChronoUnit.DAYS)));
+
+        user.setActivated(false);
+        userRepository.saveAndFlush(user);
+
+        Assertions.assertThat(userRepository.findOneByLogin(DEFAULT_LOGIN)).isPresent();
+        userService.removeNotActivatedUsers();
+        Assertions.assertThat(userRepository.findOneByLogin(DEFAULT_LOGIN)).isNotPresent();
+    }
+
+}
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/service/UserServiceIntegrationTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/service/UserServiceIntegrationTest.java
similarity index 92%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/service/UserServiceIntegrationTest.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/service/UserServiceIntegrationTest.java
index ca3608462d..b8e8a9e1aa 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/service/UserServiceIntegrationTest.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/service/UserServiceIntegrationTest.java
@@ -1,13 +1,14 @@
-package com.baeldung.jhipster5.service;
+package com.baeldung.jhipster6.service;
 
-import com.baeldung.jhipster5.BookstoreApp;
-import com.baeldung.jhipster5.config.Constants;
-import com.baeldung.jhipster5.domain.User;
-import com.baeldung.jhipster5.repository.UserRepository;
-import com.baeldung.jhipster5.service.dto.UserDTO;
-import com.baeldung.jhipster5.service.util.RandomUtil;
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.config.Constants;
+import com.baeldung.jhipster6.domain.User;
+import com.baeldung.jhipster6.repository.UserRepository;
+import com.baeldung.jhipster6.service.dto.UserDTO;
+import com.baeldung.jhipster6.service.util.RandomUtil;
 
 import org.apache.commons.lang3.RandomStringUtils;
+import org.assertj.core.api.Assertions;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -184,9 +185,9 @@ public class UserServiceIntegrationTest {
         user.setActivated(false);
         userRepository.saveAndFlush(user);
 
-        assertThat(userRepository.findOneByLogin("johndoe")).isPresent();
+        Assertions.assertThat(userRepository.findOneByLogin("johndoe")).isPresent();
         userService.removeNotActivatedUsers();
-        assertThat(userRepository.findOneByLogin("johndoe")).isNotPresent();
+        Assertions.assertThat(userRepository.findOneByLogin("johndoe")).isNotPresent();
     }
 
 }
diff --git a/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/service/mapper/UserMapperIT.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/service/mapper/UserMapperIT.java
new file mode 100644
index 0000000000..cca2dc7d92
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/service/mapper/UserMapperIT.java
@@ -0,0 +1,143 @@
+package com.baeldung.jhipster6.service.mapper;
+
+
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.domain.User;
+import com.baeldung.jhipster6.service.dto.UserDTO;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Integration tests for {@link UserMapper}.
+ */
+@SpringBootTest(classes = BookstoreApp.class)
+public class UserMapperIT {
+
+    private static final String DEFAULT_LOGIN = "johndoe";
+    private static final Long DEFAULT_ID = 1L;
+
+    @Autowired
+    private UserMapper userMapper;
+
+    private User user;
+    private UserDTO userDto;
+
+    @BeforeEach
+    public void init() {
+        user = new User();
+        user.setLogin(DEFAULT_LOGIN);
+        user.setPassword(RandomStringUtils.random(60));
+        user.setActivated(true);
+        user.setEmail("johndoe@localhost");
+        user.setFirstName("john");
+        user.setLastName("doe");
+        user.setImageUrl("image_url");
+        user.setLangKey("en");
+
+        userDto = new UserDTO(user);
+    }
+
+    @Test
+    public void usersToUserDTOsShouldMapOnlyNonNullUsers() {
+        List<User> users = new ArrayList<>();
+        users.add(user);
+        users.add(null);
+
+        List<UserDTO> userDTOS = userMapper.usersToUserDTOs(users);
+
+        assertThat(userDTOS).isNotEmpty();
+        assertThat(userDTOS).size().isEqualTo(1);
+    }
+
+    @Test
+    public void userDTOsToUsersShouldMapOnlyNonNullUsers() {
+        List<UserDTO> usersDto = new ArrayList<>();
+        usersDto.add(userDto);
+        usersDto.add(null);
+
+        List<User> users = userMapper.userDTOsToUsers(usersDto);
+
+        assertThat(users).isNotEmpty();
+        assertThat(users).size().isEqualTo(1);
+    }
+
+    @Test
+    public void userDTOsToUsersWithAuthoritiesStringShouldMapToUsersWithAuthoritiesDomain() {
+        Set<String> authoritiesAsString = new HashSet<>();
+        authoritiesAsString.add("ADMIN");
+        userDto.setAuthorities(authoritiesAsString);
+
+        List<UserDTO> usersDto = new ArrayList<>();
+        usersDto.add(userDto);
+
+        List<User> users = userMapper.userDTOsToUsers(usersDto);
+
+        assertThat(users).isNotEmpty();
+        assertThat(users).size().isEqualTo(1);
+        assertThat(users.get(0).getAuthorities()).isNotNull();
+        assertThat(users.get(0).getAuthorities()).isNotEmpty();
+        assertThat(users.get(0).getAuthorities().iterator().next().getName()).isEqualTo("ADMIN");
+    }
+
+    @Test
+    public void userDTOsToUsersMapWithNullAuthoritiesStringShouldReturnUserWithEmptyAuthorities() {
+        userDto.setAuthorities(null);
+
+        List<UserDTO> usersDto = new ArrayList<>();
+        usersDto.add(userDto);
+
+        List<User> users = userMapper.userDTOsToUsers(usersDto);
+
+        assertThat(users).isNotEmpty();
+        assertThat(users).size().isEqualTo(1);
+        assertThat(users.get(0).getAuthorities()).isNotNull();
+        assertThat(users.get(0).getAuthorities()).isEmpty();
+    }
+
+    @Test
+    public void userDTOToUserMapWithAuthoritiesStringShouldReturnUserWithAuthorities() {
+        Set<String> authoritiesAsString = new HashSet<>();
+        authoritiesAsString.add("ADMIN");
+        userDto.setAuthorities(authoritiesAsString);
+
+        User user = userMapper.userDTOToUser(userDto);
+
+        assertThat(user).isNotNull();
+        assertThat(user.getAuthorities()).isNotNull();
+        assertThat(user.getAuthorities()).isNotEmpty();
+        assertThat(user.getAuthorities().iterator().next().getName()).isEqualTo("ADMIN");
+    }
+
+    @Test
+    public void userDTOToUserMapWithNullAuthoritiesStringShouldReturnUserWithEmptyAuthorities() {
+        userDto.setAuthorities(null);
+
+        User user = userMapper.userDTOToUser(userDto);
+
+        assertThat(user).isNotNull();
+        assertThat(user.getAuthorities()).isNotNull();
+        assertThat(user.getAuthorities()).isEmpty();
+    }
+
+    @Test
+    public void userDTOToUserMapWithNullUserShouldReturnNull() {
+        assertThat(userMapper.userDTOToUser(null)).isNull();
+    }
+
+    @Test
+    public void testUserFromId() {
+        assertThat(userMapper.userFromId(DEFAULT_ID).getId()).isEqualTo(DEFAULT_ID);
+        assertThat(userMapper.userFromId(null)).isNull();
+    }
+}
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/service/mapper/UserMapperIntegrationTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/service/mapper/UserMapperIntegrationTest.java
similarity index 96%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/service/mapper/UserMapperIntegrationTest.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/service/mapper/UserMapperIntegrationTest.java
index cd49135d63..d143caccf6 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/service/mapper/UserMapperIntegrationTest.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/service/mapper/UserMapperIntegrationTest.java
@@ -1,9 +1,10 @@
-package com.baeldung.jhipster5.service.mapper;
+package com.baeldung.jhipster6.service.mapper;
 
 
-import com.baeldung.jhipster5.BookstoreApp;
-import com.baeldung.jhipster5.domain.User;
-import com.baeldung.jhipster5.service.dto.UserDTO;
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.domain.User;
+import com.baeldung.jhipster6.service.dto.UserDTO;
+
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/AccountResourceIT.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/AccountResourceIT.java
new file mode 100644
index 0000000000..4655526bb0
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/AccountResourceIT.java
@@ -0,0 +1,815 @@
+package com.baeldung.jhipster6.web.rest;
+
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.config.Constants;
+import com.baeldung.jhipster6.domain.Authority;
+import com.baeldung.jhipster6.domain.User;
+import com.baeldung.jhipster6.repository.AuthorityRepository;
+import com.baeldung.jhipster6.repository.UserRepository;
+import com.baeldung.jhipster6.security.AuthoritiesConstants;
+import com.baeldung.jhipster6.service.MailService;
+import com.baeldung.jhipster6.service.UserService;
+import com.baeldung.jhipster6.service.dto.PasswordChangeDTO;
+import com.baeldung.jhipster6.service.dto.UserDTO;
+import com.baeldung.jhipster6.web.rest.errors.ExceptionTranslator;
+import com.baeldung.jhipster6.web.rest.vm.KeyAndPasswordVM;
+import com.baeldung.jhipster6.web.rest.vm.ManagedUserVM;
+
+import org.apache.commons.lang3.RandomStringUtils;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.Instant;
+import java.util.*;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+
+/**
+ * Integration tests for the {@link AccountResource} REST controller.
+ */
+@SpringBootTest(classes = BookstoreApp.class)
+public class AccountResourceIT {
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private AuthorityRepository authorityRepository;
+
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private PasswordEncoder passwordEncoder;
+
+    @Autowired
+    private HttpMessageConverter<?>[] httpMessageConverters;
+
+    @Autowired
+    private ExceptionTranslator exceptionTranslator;
+
+    @Mock
+    private UserService mockUserService;
+
+    @Mock
+    private MailService mockMailService;
+
+    private MockMvc restMvc;
+
+    private MockMvc restUserMockMvc;
+
+    @BeforeEach
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        doNothing().when(mockMailService).sendActivationEmail(any());
+        AccountResource accountResource =
+            new AccountResource(userRepository, userService, mockMailService);
+
+        AccountResource accountUserMockResource =
+            new AccountResource(userRepository, mockUserService, mockMailService);
+        this.restMvc = MockMvcBuilders.standaloneSetup(accountResource)
+            .setMessageConverters(httpMessageConverters)
+            .setControllerAdvice(exceptionTranslator)
+            .build();
+        this.restUserMockMvc = MockMvcBuilders.standaloneSetup(accountUserMockResource)
+            .setControllerAdvice(exceptionTranslator)
+            .build();
+    }
+
+    @Test
+    public void testNonAuthenticatedUser() throws Exception {
+        restUserMockMvc.perform(get("/api/authenticate")
+            .accept(MediaType.APPLICATION_JSON))
+            .andExpect(status().isOk())
+            .andExpect(content().string(""));
+    }
+
+    @Test
+    public void testAuthenticatedUser() throws Exception {
+        restUserMockMvc.perform(get("/api/authenticate")
+            .with(request -> {
+                request.setRemoteUser("test");
+                return request;
+            })
+            .accept(MediaType.APPLICATION_JSON))
+            .andExpect(status().isOk())
+            .andExpect(content().string("test"));
+    }
+
+    @Test
+    public void testGetExistingAccount() throws Exception {
+        Set<Authority> authorities = new HashSet<>();
+        Authority authority = new Authority();
+        authority.setName(AuthoritiesConstants.ADMIN);
+        authorities.add(authority);
+
+        User user = new User();
+        user.setLogin("test");
+        user.setFirstName("john");
+        user.setLastName("doe");
+        user.setEmail("john.doe@jhipster.com");
+        user.setImageUrl("http://placehold.it/50x50");
+        user.setLangKey("en");
+        user.setAuthorities(authorities);
+        when(mockUserService.getUserWithAuthorities()).thenReturn(Optional.of(user));
+
+        restUserMockMvc.perform(get("/api/account")
+            .accept(MediaType.APPLICATION_JSON))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE))
+            .andExpect(jsonPath("$.login").value("test"))
+            .andExpect(jsonPath("$.firstName").value("john"))
+            .andExpect(jsonPath("$.lastName").value("doe"))
+            .andExpect(jsonPath("$.email").value("john.doe@jhipster.com"))
+            .andExpect(jsonPath("$.imageUrl").value("http://placehold.it/50x50"))
+            .andExpect(jsonPath("$.langKey").value("en"))
+            .andExpect(jsonPath("$.authorities").value(AuthoritiesConstants.ADMIN));
+    }
+
+    @Test
+    public void testGetUnknownAccount() throws Exception {
+        when(mockUserService.getUserWithAuthorities()).thenReturn(Optional.empty());
+
+        restUserMockMvc.perform(get("/api/account")
+            .accept(MediaType.APPLICATION_PROBLEM_JSON))
+            .andExpect(status().isInternalServerError());
+    }
+
+    @Test
+    @Transactional
+    public void testRegisterValid() throws Exception {
+        ManagedUserVM validUser = new ManagedUserVM();
+        validUser.setLogin("test-register-valid");
+        validUser.setPassword("password");
+        validUser.setFirstName("Alice");
+        validUser.setLastName("Test");
+        validUser.setEmail("test-register-valid@example.com");
+        validUser.setImageUrl("http://placehold.it/50x50");
+        validUser.setLangKey(Constants.DEFAULT_LANGUAGE);
+        validUser.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+        assertThat(userRepository.findOneByLogin("test-register-valid").isPresent()).isFalse();
+
+        restMvc.perform(
+            post("/api/register")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(validUser)))
+            .andExpect(status().isCreated());
+
+        assertThat(userRepository.findOneByLogin("test-register-valid").isPresent()).isTrue();
+    }
+
+    @Test
+    @Transactional
+    public void testRegisterInvalidLogin() throws Exception {
+        ManagedUserVM invalidUser = new ManagedUserVM();
+        invalidUser.setLogin("funky-log!n");// <-- invalid
+        invalidUser.setPassword("password");
+        invalidUser.setFirstName("Funky");
+        invalidUser.setLastName("One");
+        invalidUser.setEmail("funky@example.com");
+        invalidUser.setActivated(true);
+        invalidUser.setImageUrl("http://placehold.it/50x50");
+        invalidUser.setLangKey(Constants.DEFAULT_LANGUAGE);
+        invalidUser.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+
+        restUserMockMvc.perform(
+            post("/api/register")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(invalidUser)))
+            .andExpect(status().isBadRequest());
+
+        Optional<User> user = userRepository.findOneByEmailIgnoreCase("funky@example.com");
+        assertThat(user.isPresent()).isFalse();
+    }
+
+    @Test
+    @Transactional
+    public void testRegisterInvalidEmail() throws Exception {
+        ManagedUserVM invalidUser = new ManagedUserVM();
+        invalidUser.setLogin("bob");
+        invalidUser.setPassword("password");
+        invalidUser.setFirstName("Bob");
+        invalidUser.setLastName("Green");
+        invalidUser.setEmail("invalid");// <-- invalid
+        invalidUser.setActivated(true);
+        invalidUser.setImageUrl("http://placehold.it/50x50");
+        invalidUser.setLangKey(Constants.DEFAULT_LANGUAGE);
+        invalidUser.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+
+        restUserMockMvc.perform(
+            post("/api/register")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(invalidUser)))
+            .andExpect(status().isBadRequest());
+
+        Optional<User> user = userRepository.findOneByLogin("bob");
+        assertThat(user.isPresent()).isFalse();
+    }
+
+    @Test
+    @Transactional
+    public void testRegisterInvalidPassword() throws Exception {
+        ManagedUserVM invalidUser = new ManagedUserVM();
+        invalidUser.setLogin("bob");
+        invalidUser.setPassword("123");// password with only 3 digits
+        invalidUser.setFirstName("Bob");
+        invalidUser.setLastName("Green");
+        invalidUser.setEmail("bob@example.com");
+        invalidUser.setActivated(true);
+        invalidUser.setImageUrl("http://placehold.it/50x50");
+        invalidUser.setLangKey(Constants.DEFAULT_LANGUAGE);
+        invalidUser.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+
+        restUserMockMvc.perform(
+            post("/api/register")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(invalidUser)))
+            .andExpect(status().isBadRequest());
+
+        Optional<User> user = userRepository.findOneByLogin("bob");
+        assertThat(user.isPresent()).isFalse();
+    }
+
+    @Test
+    @Transactional
+    public void testRegisterNullPassword() throws Exception {
+        ManagedUserVM invalidUser = new ManagedUserVM();
+        invalidUser.setLogin("bob");
+        invalidUser.setPassword(null);// invalid null password
+        invalidUser.setFirstName("Bob");
+        invalidUser.setLastName("Green");
+        invalidUser.setEmail("bob@example.com");
+        invalidUser.setActivated(true);
+        invalidUser.setImageUrl("http://placehold.it/50x50");
+        invalidUser.setLangKey(Constants.DEFAULT_LANGUAGE);
+        invalidUser.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+
+        restUserMockMvc.perform(
+            post("/api/register")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(invalidUser)))
+            .andExpect(status().isBadRequest());
+
+        Optional<User> user = userRepository.findOneByLogin("bob");
+        assertThat(user.isPresent()).isFalse();
+    }
+
+    @Test
+    @Transactional
+    public void testRegisterDuplicateLogin() throws Exception {
+        // First registration
+        ManagedUserVM firstUser = new ManagedUserVM();
+        firstUser.setLogin("alice");
+        firstUser.setPassword("password");
+        firstUser.setFirstName("Alice");
+        firstUser.setLastName("Something");
+        firstUser.setEmail("alice@example.com");
+        firstUser.setImageUrl("http://placehold.it/50x50");
+        firstUser.setLangKey(Constants.DEFAULT_LANGUAGE);
+        firstUser.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+
+        // Duplicate login, different email
+        ManagedUserVM secondUser = new ManagedUserVM();
+        secondUser.setLogin(firstUser.getLogin());
+        secondUser.setPassword(firstUser.getPassword());
+        secondUser.setFirstName(firstUser.getFirstName());
+        secondUser.setLastName(firstUser.getLastName());
+        secondUser.setEmail("alice2@example.com");
+        secondUser.setImageUrl(firstUser.getImageUrl());
+        secondUser.setLangKey(firstUser.getLangKey());
+        secondUser.setCreatedBy(firstUser.getCreatedBy());
+        secondUser.setCreatedDate(firstUser.getCreatedDate());
+        secondUser.setLastModifiedBy(firstUser.getLastModifiedBy());
+        secondUser.setLastModifiedDate(firstUser.getLastModifiedDate());
+        secondUser.setAuthorities(new HashSet<>(firstUser.getAuthorities()));
+
+        // First user
+        restMvc.perform(
+            post("/api/register")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(firstUser)))
+            .andExpect(status().isCreated());
+
+        // Second (non activated) user
+        restMvc.perform(
+            post("/api/register")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(secondUser)))
+            .andExpect(status().isCreated());
+
+        Optional<User> testUser = userRepository.findOneByEmailIgnoreCase("alice2@example.com");
+        assertThat(testUser.isPresent()).isTrue();
+        testUser.get().setActivated(true);
+        userRepository.save(testUser.get());
+
+        // Second (already activated) user
+        restMvc.perform(
+            post("/api/register")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(secondUser)))
+            .andExpect(status().is4xxClientError());
+    }
+
+    @Test
+    @Transactional
+    public void testRegisterDuplicateEmail() throws Exception {
+        // First user
+        ManagedUserVM firstUser = new ManagedUserVM();
+        firstUser.setLogin("test-register-duplicate-email");
+        firstUser.setPassword("password");
+        firstUser.setFirstName("Alice");
+        firstUser.setLastName("Test");
+        firstUser.setEmail("test-register-duplicate-email@example.com");
+        firstUser.setImageUrl("http://placehold.it/50x50");
+        firstUser.setLangKey(Constants.DEFAULT_LANGUAGE);
+        firstUser.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+
+        // Register first user
+        restMvc.perform(
+            post("/api/register")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(firstUser)))
+            .andExpect(status().isCreated());
+
+        Optional<User> testUser1 = userRepository.findOneByLogin("test-register-duplicate-email");
+        assertThat(testUser1.isPresent()).isTrue();
+
+        // Duplicate email, different login
+        ManagedUserVM secondUser = new ManagedUserVM();
+        secondUser.setLogin("test-register-duplicate-email-2");
+        secondUser.setPassword(firstUser.getPassword());
+        secondUser.setFirstName(firstUser.getFirstName());
+        secondUser.setLastName(firstUser.getLastName());
+        secondUser.setEmail(firstUser.getEmail());
+        secondUser.setImageUrl(firstUser.getImageUrl());
+        secondUser.setLangKey(firstUser.getLangKey());
+        secondUser.setAuthorities(new HashSet<>(firstUser.getAuthorities()));
+
+        // Register second (non activated) user
+        restMvc.perform(
+            post("/api/register")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(secondUser)))
+            .andExpect(status().isCreated());
+
+        Optional<User> testUser2 = userRepository.findOneByLogin("test-register-duplicate-email");
+        assertThat(testUser2.isPresent()).isFalse();
+
+        Optional<User> testUser3 = userRepository.findOneByLogin("test-register-duplicate-email-2");
+        assertThat(testUser3.isPresent()).isTrue();
+
+        // Duplicate email - with uppercase email address
+        ManagedUserVM userWithUpperCaseEmail = new ManagedUserVM();
+        userWithUpperCaseEmail.setId(firstUser.getId());
+        userWithUpperCaseEmail.setLogin("test-register-duplicate-email-3");
+        userWithUpperCaseEmail.setPassword(firstUser.getPassword());
+        userWithUpperCaseEmail.setFirstName(firstUser.getFirstName());
+        userWithUpperCaseEmail.setLastName(firstUser.getLastName());
+        userWithUpperCaseEmail.setEmail("TEST-register-duplicate-email@example.com");
+        userWithUpperCaseEmail.setImageUrl(firstUser.getImageUrl());
+        userWithUpperCaseEmail.setLangKey(firstUser.getLangKey());
+        userWithUpperCaseEmail.setAuthorities(new HashSet<>(firstUser.getAuthorities()));
+
+        // Register third (not activated) user
+        restMvc.perform(
+            post("/api/register")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(userWithUpperCaseEmail)))
+            .andExpect(status().isCreated());
+
+        Optional<User> testUser4 = userRepository.findOneByLogin("test-register-duplicate-email-3");
+        assertThat(testUser4.isPresent()).isTrue();
+        assertThat(testUser4.get().getEmail()).isEqualTo("test-register-duplicate-email@example.com");
+
+        testUser4.get().setActivated(true);
+        userService.updateUser((new UserDTO(testUser4.get())));
+
+        // Register 4th (already activated) user
+        restMvc.perform(
+            post("/api/register")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(secondUser)))
+            .andExpect(status().is4xxClientError());
+    }
+
+    @Test
+    @Transactional
+    public void testRegisterAdminIsIgnored() throws Exception {
+        ManagedUserVM validUser = new ManagedUserVM();
+        validUser.setLogin("badguy");
+        validUser.setPassword("password");
+        validUser.setFirstName("Bad");
+        validUser.setLastName("Guy");
+        validUser.setEmail("badguy@example.com");
+        validUser.setActivated(true);
+        validUser.setImageUrl("http://placehold.it/50x50");
+        validUser.setLangKey(Constants.DEFAULT_LANGUAGE);
+        validUser.setAuthorities(Collections.singleton(AuthoritiesConstants.ADMIN));
+
+        restMvc.perform(
+            post("/api/register")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(validUser)))
+            .andExpect(status().isCreated());
+
+        Optional<User> userDup = userRepository.findOneByLogin("badguy");
+        assertThat(userDup.isPresent()).isTrue();
+        assertThat(userDup.get().getAuthorities()).hasSize(1)
+            .containsExactly(authorityRepository.findById(AuthoritiesConstants.USER).get());
+    }
+
+    @Test
+    @Transactional
+    public void testActivateAccount() throws Exception {
+        final String activationKey = "some activation key";
+        User user = new User();
+        user.setLogin("activate-account");
+        user.setEmail("activate-account@example.com");
+        user.setPassword(RandomStringUtils.random(60));
+        user.setActivated(false);
+        user.setActivationKey(activationKey);
+
+        userRepository.saveAndFlush(user);
+
+        restMvc.perform(get("/api/activate?key={activationKey}", activationKey))
+            .andExpect(status().isOk());
+
+        user = userRepository.findOneByLogin(user.getLogin()).orElse(null);
+        assertThat(user.getActivated()).isTrue();
+    }
+
+    @Test
+    @Transactional
+    public void testActivateAccountWithWrongKey() throws Exception {
+        restMvc.perform(get("/api/activate?key=wrongActivationKey"))
+            .andExpect(status().isInternalServerError());
+    }
+
+    @Test
+    @Transactional
+    @WithMockUser("save-account")
+    public void testSaveAccount() throws Exception {
+        User user = new User();
+        user.setLogin("save-account");
+        user.setEmail("save-account@example.com");
+        user.setPassword(RandomStringUtils.random(60));
+        user.setActivated(true);
+
+        userRepository.saveAndFlush(user);
+
+        UserDTO userDTO = new UserDTO();
+        userDTO.setLogin("not-used");
+        userDTO.setFirstName("firstname");
+        userDTO.setLastName("lastname");
+        userDTO.setEmail("save-account@example.com");
+        userDTO.setActivated(false);
+        userDTO.setImageUrl("http://placehold.it/50x50");
+        userDTO.setLangKey(Constants.DEFAULT_LANGUAGE);
+        userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.ADMIN));
+
+        restMvc.perform(
+            post("/api/account")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(userDTO)))
+            .andExpect(status().isOk());
+
+        User updatedUser = userRepository.findOneByLogin(user.getLogin()).orElse(null);
+        assertThat(updatedUser.getFirstName()).isEqualTo(userDTO.getFirstName());
+        assertThat(updatedUser.getLastName()).isEqualTo(userDTO.getLastName());
+        assertThat(updatedUser.getEmail()).isEqualTo(userDTO.getEmail());
+        assertThat(updatedUser.getLangKey()).isEqualTo(userDTO.getLangKey());
+        assertThat(updatedUser.getPassword()).isEqualTo(user.getPassword());
+        assertThat(updatedUser.getImageUrl()).isEqualTo(userDTO.getImageUrl());
+        assertThat(updatedUser.getActivated()).isEqualTo(true);
+        assertThat(updatedUser.getAuthorities()).isEmpty();
+    }
+
+    @Test
+    @Transactional
+    @WithMockUser("save-invalid-email")
+    public void testSaveInvalidEmail() throws Exception {
+        User user = new User();
+        user.setLogin("save-invalid-email");
+        user.setEmail("save-invalid-email@example.com");
+        user.setPassword(RandomStringUtils.random(60));
+        user.setActivated(true);
+
+        userRepository.saveAndFlush(user);
+
+        UserDTO userDTO = new UserDTO();
+        userDTO.setLogin("not-used");
+        userDTO.setFirstName("firstname");
+        userDTO.setLastName("lastname");
+        userDTO.setEmail("invalid email");
+        userDTO.setActivated(false);
+        userDTO.setImageUrl("http://placehold.it/50x50");
+        userDTO.setLangKey(Constants.DEFAULT_LANGUAGE);
+        userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.ADMIN));
+
+        restMvc.perform(
+            post("/api/account")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(userDTO)))
+            .andExpect(status().isBadRequest());
+
+        Assertions.assertThat(userRepository.findOneByEmailIgnoreCase("invalid email")).isNotPresent();
+    }
+
+    @Test
+    @Transactional
+    @WithMockUser("save-existing-email")
+    public void testSaveExistingEmail() throws Exception {
+        User user = new User();
+        user.setLogin("save-existing-email");
+        user.setEmail("save-existing-email@example.com");
+        user.setPassword(RandomStringUtils.random(60));
+        user.setActivated(true);
+
+        userRepository.saveAndFlush(user);
+
+        User anotherUser = new User();
+        anotherUser.setLogin("save-existing-email2");
+        anotherUser.setEmail("save-existing-email2@example.com");
+        anotherUser.setPassword(RandomStringUtils.random(60));
+        anotherUser.setActivated(true);
+
+        userRepository.saveAndFlush(anotherUser);
+
+        UserDTO userDTO = new UserDTO();
+        userDTO.setLogin("not-used");
+        userDTO.setFirstName("firstname");
+        userDTO.setLastName("lastname");
+        userDTO.setEmail("save-existing-email2@example.com");
+        userDTO.setActivated(false);
+        userDTO.setImageUrl("http://placehold.it/50x50");
+        userDTO.setLangKey(Constants.DEFAULT_LANGUAGE);
+        userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.ADMIN));
+
+        restMvc.perform(
+            post("/api/account")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(userDTO)))
+            .andExpect(status().isBadRequest());
+
+        User updatedUser = userRepository.findOneByLogin("save-existing-email").orElse(null);
+        assertThat(updatedUser.getEmail()).isEqualTo("save-existing-email@example.com");
+    }
+
+    @Test
+    @Transactional
+    @WithMockUser("save-existing-email-and-login")
+    public void testSaveExistingEmailAndLogin() throws Exception {
+        User user = new User();
+        user.setLogin("save-existing-email-and-login");
+        user.setEmail("save-existing-email-and-login@example.com");
+        user.setPassword(RandomStringUtils.random(60));
+        user.setActivated(true);
+
+        userRepository.saveAndFlush(user);
+
+        UserDTO userDTO = new UserDTO();
+        userDTO.setLogin("not-used");
+        userDTO.setFirstName("firstname");
+        userDTO.setLastName("lastname");
+        userDTO.setEmail("save-existing-email-and-login@example.com");
+        userDTO.setActivated(false);
+        userDTO.setImageUrl("http://placehold.it/50x50");
+        userDTO.setLangKey(Constants.DEFAULT_LANGUAGE);
+        userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.ADMIN));
+
+        restMvc.perform(
+            post("/api/account")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(userDTO)))
+            .andExpect(status().isOk());
+
+        User updatedUser = userRepository.findOneByLogin("save-existing-email-and-login").orElse(null);
+        assertThat(updatedUser.getEmail()).isEqualTo("save-existing-email-and-login@example.com");
+    }
+
+    @Test
+    @Transactional
+    @WithMockUser("change-password-wrong-existing-password")
+    public void testChangePasswordWrongExistingPassword() throws Exception {
+        User user = new User();
+        String currentPassword = RandomStringUtils.random(60);
+        user.setPassword(passwordEncoder.encode(currentPassword));
+        user.setLogin("change-password-wrong-existing-password");
+        user.setEmail("change-password-wrong-existing-password@example.com");
+        userRepository.saveAndFlush(user);
+
+        restMvc.perform(post("/api/account/change-password")
+            .contentType(TestUtil.APPLICATION_JSON_UTF8)
+            .content(TestUtil.convertObjectToJsonBytes(new PasswordChangeDTO("1"+currentPassword, "new password"))))
+            .andExpect(status().isBadRequest());
+
+        User updatedUser = userRepository.findOneByLogin("change-password-wrong-existing-password").orElse(null);
+        assertThat(passwordEncoder.matches("new password", updatedUser.getPassword())).isFalse();
+        assertThat(passwordEncoder.matches(currentPassword, updatedUser.getPassword())).isTrue();
+    }
+
+    @Test
+    @Transactional
+    @WithMockUser("change-password")
+    public void testChangePassword() throws Exception {
+        User user = new User();
+        String currentPassword = RandomStringUtils.random(60);
+        user.setPassword(passwordEncoder.encode(currentPassword));
+        user.setLogin("change-password");
+        user.setEmail("change-password@example.com");
+        userRepository.saveAndFlush(user);
+
+        restMvc.perform(post("/api/account/change-password")
+            .contentType(TestUtil.APPLICATION_JSON_UTF8)
+            .content(TestUtil.convertObjectToJsonBytes(new PasswordChangeDTO(currentPassword, "new password"))))
+            .andExpect(status().isOk());
+
+        User updatedUser = userRepository.findOneByLogin("change-password").orElse(null);
+        assertThat(passwordEncoder.matches("new password", updatedUser.getPassword())).isTrue();
+    }
+
+    @Test
+    @Transactional
+    @WithMockUser("change-password-too-small")
+    public void testChangePasswordTooSmall() throws Exception {
+        User user = new User();
+        String currentPassword = RandomStringUtils.random(60);
+        user.setPassword(passwordEncoder.encode(currentPassword));
+        user.setLogin("change-password-too-small");
+        user.setEmail("change-password-too-small@example.com");
+        userRepository.saveAndFlush(user);
+
+        String newPassword = RandomStringUtils.random(ManagedUserVM.PASSWORD_MIN_LENGTH - 1);
+
+        restMvc.perform(post("/api/account/change-password")
+            .contentType(TestUtil.APPLICATION_JSON_UTF8)
+            .content(TestUtil.convertObjectToJsonBytes(new PasswordChangeDTO(currentPassword, newPassword))))
+            .andExpect(status().isBadRequest());
+
+        User updatedUser = userRepository.findOneByLogin("change-password-too-small").orElse(null);
+        assertThat(updatedUser.getPassword()).isEqualTo(user.getPassword());
+    }
+
+    @Test
+    @Transactional
+    @WithMockUser("change-password-too-long")
+    public void testChangePasswordTooLong() throws Exception {
+        User user = new User();
+        String currentPassword = RandomStringUtils.random(60);
+        user.setPassword(passwordEncoder.encode(currentPassword));
+        user.setLogin("change-password-too-long");
+        user.setEmail("change-password-too-long@example.com");
+        userRepository.saveAndFlush(user);
+
+        String newPassword = RandomStringUtils.random(ManagedUserVM.PASSWORD_MAX_LENGTH + 1);
+
+        restMvc.perform(post("/api/account/change-password")
+            .contentType(TestUtil.APPLICATION_JSON_UTF8)
+            .content(TestUtil.convertObjectToJsonBytes(new PasswordChangeDTO(currentPassword, newPassword))))
+            .andExpect(status().isBadRequest());
+
+        User updatedUser = userRepository.findOneByLogin("change-password-too-long").orElse(null);
+        assertThat(updatedUser.getPassword()).isEqualTo(user.getPassword());
+    }
+
+    @Test
+    @Transactional
+    @WithMockUser("change-password-empty")
+    public void testChangePasswordEmpty() throws Exception {
+        User user = new User();
+        String currentPassword = RandomStringUtils.random(60);
+        user.setPassword(passwordEncoder.encode(currentPassword));
+        user.setLogin("change-password-empty");
+        user.setEmail("change-password-empty@example.com");
+        userRepository.saveAndFlush(user);
+
+        restMvc.perform(post("/api/account/change-password")
+            .contentType(TestUtil.APPLICATION_JSON_UTF8)
+            .content(TestUtil.convertObjectToJsonBytes(new PasswordChangeDTO(currentPassword, ""))))
+            .andExpect(status().isBadRequest());
+
+        User updatedUser = userRepository.findOneByLogin("change-password-empty").orElse(null);
+        assertThat(updatedUser.getPassword()).isEqualTo(user.getPassword());
+    }
+
+    @Test
+    @Transactional
+    public void testRequestPasswordReset() throws Exception {
+        User user = new User();
+        user.setPassword(RandomStringUtils.random(60));
+        user.setActivated(true);
+        user.setLogin("password-reset");
+        user.setEmail("password-reset@example.com");
+        userRepository.saveAndFlush(user);
+
+        restMvc.perform(post("/api/account/reset-password/init")
+            .content("password-reset@example.com"))
+            .andExpect(status().isOk());
+    }
+
+    @Test
+    @Transactional
+    public void testRequestPasswordResetUpperCaseEmail() throws Exception {
+        User user = new User();
+        user.setPassword(RandomStringUtils.random(60));
+        user.setActivated(true);
+        user.setLogin("password-reset");
+        user.setEmail("password-reset@example.com");
+        userRepository.saveAndFlush(user);
+
+        restMvc.perform(post("/api/account/reset-password/init")
+            .content("password-reset@EXAMPLE.COM"))
+            .andExpect(status().isOk());
+    }
+
+    @Test
+    public void testRequestPasswordResetWrongEmail() throws Exception {
+        restMvc.perform(
+            post("/api/account/reset-password/init")
+                .content("password-reset-wrong-email@example.com"))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    @Transactional
+    public void testFinishPasswordReset() throws Exception {
+        User user = new User();
+        user.setPassword(RandomStringUtils.random(60));
+        user.setLogin("finish-password-reset");
+        user.setEmail("finish-password-reset@example.com");
+        user.setResetDate(Instant.now().plusSeconds(60));
+        user.setResetKey("reset key");
+        userRepository.saveAndFlush(user);
+
+        KeyAndPasswordVM keyAndPassword = new KeyAndPasswordVM();
+        keyAndPassword.setKey(user.getResetKey());
+        keyAndPassword.setNewPassword("new password");
+
+        restMvc.perform(
+            post("/api/account/reset-password/finish")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(keyAndPassword)))
+            .andExpect(status().isOk());
+
+        User updatedUser = userRepository.findOneByLogin(user.getLogin()).orElse(null);
+        assertThat(passwordEncoder.matches(keyAndPassword.getNewPassword(), updatedUser.getPassword())).isTrue();
+    }
+
+    @Test
+    @Transactional
+    public void testFinishPasswordResetTooSmall() throws Exception {
+        User user = new User();
+        user.setPassword(RandomStringUtils.random(60));
+        user.setLogin("finish-password-reset-too-small");
+        user.setEmail("finish-password-reset-too-small@example.com");
+        user.setResetDate(Instant.now().plusSeconds(60));
+        user.setResetKey("reset key too small");
+        userRepository.saveAndFlush(user);
+
+        KeyAndPasswordVM keyAndPassword = new KeyAndPasswordVM();
+        keyAndPassword.setKey(user.getResetKey());
+        keyAndPassword.setNewPassword("foo");
+
+        restMvc.perform(
+            post("/api/account/reset-password/finish")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(keyAndPassword)))
+            .andExpect(status().isBadRequest());
+
+        User updatedUser = userRepository.findOneByLogin(user.getLogin()).orElse(null);
+        assertThat(passwordEncoder.matches(keyAndPassword.getNewPassword(), updatedUser.getPassword())).isFalse();
+    }
+
+
+    @Test
+    @Transactional
+    public void testFinishPasswordResetWrongKey() throws Exception {
+        KeyAndPasswordVM keyAndPassword = new KeyAndPasswordVM();
+        keyAndPassword.setKey("wrong reset key");
+        keyAndPassword.setNewPassword("new password");
+
+        restMvc.perform(
+            post("/api/account/reset-password/finish")
+                .contentType(TestUtil.APPLICATION_JSON_UTF8)
+                .content(TestUtil.convertObjectToJsonBytes(keyAndPassword)))
+            .andExpect(status().isInternalServerError());
+    }
+}
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/AccountResourceIntegrationTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/AccountResourceIntegrationTest.java
similarity index 97%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/AccountResourceIntegrationTest.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/AccountResourceIntegrationTest.java
index f591b7ecbf..adc7deec18 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/AccountResourceIntegrationTest.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/AccountResourceIntegrationTest.java
@@ -1,21 +1,23 @@
-package com.baeldung.jhipster5.web.rest;
+package com.baeldung.jhipster6.web.rest;
+
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.config.Constants;
+import com.baeldung.jhipster6.domain.Authority;
+import com.baeldung.jhipster6.domain.User;
+import com.baeldung.jhipster6.repository.AuthorityRepository;
+import com.baeldung.jhipster6.repository.UserRepository;
+import com.baeldung.jhipster6.security.AuthoritiesConstants;
+import com.baeldung.jhipster6.service.MailService;
+import com.baeldung.jhipster6.service.UserService;
+import com.baeldung.jhipster6.service.dto.PasswordChangeDTO;
+import com.baeldung.jhipster6.service.dto.UserDTO;
+import com.baeldung.jhipster6.web.rest.errors.ExceptionTranslator;
+import com.baeldung.jhipster6.web.rest.vm.KeyAndPasswordVM;
+import com.baeldung.jhipster6.web.rest.vm.ManagedUserVM;
 
-import com.baeldung.jhipster5.BookstoreApp;
-import com.baeldung.jhipster5.config.Constants;
-import com.baeldung.jhipster5.domain.Authority;
-import com.baeldung.jhipster5.domain.User;
-import com.baeldung.jhipster5.repository.AuthorityRepository;
-import com.baeldung.jhipster5.repository.UserRepository;
-import com.baeldung.jhipster5.security.AuthoritiesConstants;
-import com.baeldung.jhipster5.service.MailService;
-import com.baeldung.jhipster5.service.UserService;
-import com.baeldung.jhipster5.service.dto.PasswordChangeDTO;
-import com.baeldung.jhipster5.service.dto.UserDTO;
-import com.baeldung.jhipster5.web.rest.errors.ExceptionTranslator;
-import com.baeldung.jhipster5.web.rest.vm.KeyAndPasswordVM;
-import com.baeldung.jhipster5.web.rest.vm.ManagedUserVM;
 import org.apache.commons.lang3.RandomStringUtils;
 
+import org.assertj.core.api.Assertions;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -533,7 +535,7 @@ public class AccountResourceIntegrationTest {
                 .content(TestUtil.convertObjectToJsonBytes(userDTO)))
             .andExpect(status().isBadRequest());
 
-        assertThat(userRepository.findOneByEmailIgnoreCase("invalid email")).isNotPresent();
+        Assertions.assertThat(userRepository.findOneByEmailIgnoreCase("invalid email")).isNotPresent();
     }
 
     @Test
diff --git a/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/AuditResourceIT.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/AuditResourceIT.java
new file mode 100644
index 0000000000..d9c82f48a5
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/AuditResourceIT.java
@@ -0,0 +1,161 @@
+package com.baeldung.jhipster6.web.rest;
+
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.config.audit.AuditEventConverter;
+import com.baeldung.jhipster6.domain.PersistentAuditEvent;
+import com.baeldung.jhipster6.repository.PersistenceAuditEventRepository;
+
+import com.baeldung.jhipster6.service.AuditEventService;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.web.PageableHandlerMethodArgumentResolver;
+import org.springframework.format.support.FormattingConversionService;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.Instant;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.hamcrest.Matchers.hasItem;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+
+/**
+ * Integration tests for the {@link AuditResource} REST controller.
+ */
+@SpringBootTest(classes = BookstoreApp.class)
+@Transactional
+public class AuditResourceIT {
+
+    private static final String SAMPLE_PRINCIPAL = "SAMPLE_PRINCIPAL";
+    private static final String SAMPLE_TYPE = "SAMPLE_TYPE";
+    private static final Instant SAMPLE_TIMESTAMP = Instant.parse("2015-08-04T10:11:30Z");
+    private static final long SECONDS_PER_DAY = 60 * 60 * 24;
+
+    @Autowired
+    private PersistenceAuditEventRepository auditEventRepository;
+
+    @Autowired
+    private AuditEventConverter auditEventConverter;
+
+    @Autowired
+    private MappingJackson2HttpMessageConverter jacksonMessageConverter;
+
+    @Autowired
+    @Qualifier("mvcConversionService")
+    private FormattingConversionService formattingConversionService;
+
+    @Autowired
+    private PageableHandlerMethodArgumentResolver pageableArgumentResolver;
+
+    private PersistentAuditEvent auditEvent;
+
+    private MockMvc restAuditMockMvc;
+
+    @BeforeEach
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        AuditEventService auditEventService =
+            new AuditEventService(auditEventRepository, auditEventConverter);
+        AuditResource auditResource = new AuditResource(auditEventService);
+        this.restAuditMockMvc = MockMvcBuilders.standaloneSetup(auditResource)
+            .setCustomArgumentResolvers(pageableArgumentResolver)
+            .setConversionService(formattingConversionService)
+            .setMessageConverters(jacksonMessageConverter).build();
+    }
+
+    @BeforeEach
+    public void initTest() {
+        auditEventRepository.deleteAll();
+        auditEvent = new PersistentAuditEvent();
+        auditEvent.setAuditEventType(SAMPLE_TYPE);
+        auditEvent.setPrincipal(SAMPLE_PRINCIPAL);
+        auditEvent.setAuditEventDate(SAMPLE_TIMESTAMP);
+    }
+
+    @Test
+    public void getAllAudits() throws Exception {
+        // Initialize the database
+        auditEventRepository.save(auditEvent);
+
+        // Get all the audits
+        restAuditMockMvc.perform(get("/management/audits"))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE))
+            .andExpect(jsonPath("$.[*].principal").value(hasItem(SAMPLE_PRINCIPAL)));
+    }
+
+    @Test
+    public void getAudit() throws Exception {
+        // Initialize the database
+        auditEventRepository.save(auditEvent);
+
+        // Get the audit
+        restAuditMockMvc.perform(get("/management/audits/{id}", auditEvent.getId()))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE))
+            .andExpect(jsonPath("$.principal").value(SAMPLE_PRINCIPAL));
+    }
+
+    @Test
+    public void getAuditsByDate() throws Exception {
+        // Initialize the database
+        auditEventRepository.save(auditEvent);
+
+        // Generate dates for selecting audits by date, making sure the period will contain the audit
+        String fromDate = SAMPLE_TIMESTAMP.minusSeconds(SECONDS_PER_DAY).toString().substring(0, 10);
+        String toDate = SAMPLE_TIMESTAMP.plusSeconds(SECONDS_PER_DAY).toString().substring(0, 10);
+
+        // Get the audit
+        restAuditMockMvc.perform(get("/management/audits?fromDate="+fromDate+"&toDate="+toDate))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE))
+            .andExpect(jsonPath("$.[*].principal").value(hasItem(SAMPLE_PRINCIPAL)));
+    }
+
+    @Test
+    public void getNonExistingAuditsByDate() throws Exception {
+        // Initialize the database
+        auditEventRepository.save(auditEvent);
+
+        // Generate dates for selecting audits by date, making sure the period will not contain the sample audit
+        String fromDate  = SAMPLE_TIMESTAMP.minusSeconds(2*SECONDS_PER_DAY).toString().substring(0, 10);
+        String toDate = SAMPLE_TIMESTAMP.minusSeconds(SECONDS_PER_DAY).toString().substring(0, 10);
+
+        // Query audits but expect no results
+        restAuditMockMvc.perform(get("/management/audits?fromDate=" + fromDate + "&toDate=" + toDate))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE))
+            .andExpect(header().string("X-Total-Count", "0"));
+    }
+
+    @Test
+    public void getNonExistingAudit() throws Exception {
+        // Get the audit
+        restAuditMockMvc.perform(get("/management/audits/{id}", Long.MAX_VALUE))
+            .andExpect(status().isNotFound());
+    }
+
+    @Test
+    @Transactional
+    public void testPersistentAuditEventEquals() throws Exception {
+        TestUtil.equalsVerifier(PersistentAuditEvent.class);
+        PersistentAuditEvent auditEvent1 = new PersistentAuditEvent();
+        auditEvent1.setId(1L);
+        PersistentAuditEvent auditEvent2 = new PersistentAuditEvent();
+        auditEvent2.setId(auditEvent1.getId());
+        assertThat(auditEvent1).isEqualTo(auditEvent2);
+        auditEvent2.setId(2L);
+        assertThat(auditEvent1).isNotEqualTo(auditEvent2);
+        auditEvent1.setId(null);
+        assertThat(auditEvent1).isNotEqualTo(auditEvent2);
+    }
+}
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/AuditResourceIntegrationTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/AuditResourceIntegrationTest.java
similarity index 95%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/AuditResourceIntegrationTest.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/AuditResourceIntegrationTest.java
index 05d8f9d503..d7bb995e1c 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/AuditResourceIntegrationTest.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/AuditResourceIntegrationTest.java
@@ -1,10 +1,11 @@
-package com.baeldung.jhipster5.web.rest;
+package com.baeldung.jhipster6.web.rest;
+
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.config.audit.AuditEventConverter;
+import com.baeldung.jhipster6.domain.PersistentAuditEvent;
+import com.baeldung.jhipster6.repository.PersistenceAuditEventRepository;
+import com.baeldung.jhipster6.service.AuditEventService;
 
-import com.baeldung.jhipster5.BookstoreApp;
-import com.baeldung.jhipster5.config.audit.AuditEventConverter;
-import com.baeldung.jhipster5.domain.PersistentAuditEvent;
-import com.baeldung.jhipster5.repository.PersistenceAuditEventRepository;
-import com.baeldung.jhipster5.service.AuditEventService;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/BookResourceIntegrationTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/BookResourceIntegrationTest.java
similarity index 96%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/BookResourceIntegrationTest.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/BookResourceIntegrationTest.java
index 4f5cb25cdb..429d937f26 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/BookResourceIntegrationTest.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/BookResourceIntegrationTest.java
@@ -1,13 +1,13 @@
-package com.baeldung.jhipster5.web.rest;
+package com.baeldung.jhipster6.web.rest;
 
-import com.baeldung.jhipster5.BookstoreApp;
+import com.baeldung.jhipster6.BookstoreApp;
 
-import com.baeldung.jhipster5.domain.Book;
-import com.baeldung.jhipster5.repository.BookRepository;
-import com.baeldung.jhipster5.service.BookService;
-import com.baeldung.jhipster5.service.dto.BookDTO;
-import com.baeldung.jhipster5.service.mapper.BookMapper;
-import com.baeldung.jhipster5.web.rest.errors.ExceptionTranslator;
+import com.baeldung.jhipster6.domain.Book;
+import com.baeldung.jhipster6.repository.BookRepository;
+import com.baeldung.jhipster6.service.BookService;
+import com.baeldung.jhipster6.service.dto.BookDTO;
+import com.baeldung.jhipster6.service.mapper.BookMapper;
+import com.baeldung.jhipster6.web.rest.errors.ExceptionTranslator;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -29,8 +29,6 @@ import java.time.LocalDate;
 import java.time.ZoneId;
 import java.util.List;
 
-
-import static com.baeldung.jhipster5.web.rest.TestUtil.createFormattingConversionService;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.hasItem;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
@@ -95,7 +93,7 @@ public class BookResourceIntegrationTest {
         this.restBookMockMvc = MockMvcBuilders.standaloneSetup(bookResource)
             .setCustomArgumentResolvers(pageableArgumentResolver)
             .setControllerAdvice(exceptionTranslator)
-            .setConversionService(createFormattingConversionService())
+            .setConversionService(TestUtil.createFormattingConversionService())
             .setMessageConverters(jacksonMessageConverter)
             .setValidator(validator).build();
     }
@@ -276,7 +274,7 @@ public class BookResourceIntegrationTest {
             .andExpect(jsonPath("$.[*].quantity").value(hasItem(DEFAULT_QUANTITY)))
             .andExpect(jsonPath("$.[*].price").value(hasItem(DEFAULT_PRICE.doubleValue())));
     }
-    
+
     @Test
     @Transactional
     public void getBook() throws Exception {
diff --git a/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/ClientForwardControllerIT.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/ClientForwardControllerIT.java
new file mode 100644
index 0000000000..9dcc2e6055
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/ClientForwardControllerIT.java
@@ -0,0 +1,67 @@
+package com.baeldung.jhipster6.web.rest;
+
+import com.baeldung.jhipster6.BookstoreApp;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+/**
+ * Integration tests for the {@link ClientForwardController} REST controller.
+ */
+@SpringBootTest(classes = BookstoreApp.class)
+public class ClientForwardControllerIT {
+
+    private MockMvc restMockMvc;
+
+    @BeforeEach
+    public void setup() {
+        ClientForwardController clientForwardController = new ClientForwardController();
+        this.restMockMvc = MockMvcBuilders
+            .standaloneSetup(clientForwardController, new TestController())
+            .build();
+    }
+
+    @Test
+    public void getBackendEndpoint() throws Exception {
+        restMockMvc.perform(get("/test"))
+            .andExpect(status().isOk())
+            .andExpect(content().contentTypeCompatibleWith(MediaType.TEXT_PLAIN_VALUE))
+            .andExpect(content().string("test"));
+    }
+
+    @Test
+    public void getClientEndpoint() throws Exception {
+        ResultActions perform = restMockMvc.perform(get("/non-existant-mapping"));
+        perform
+            .andExpect(status().isOk())
+            .andExpect(forwardedUrl("/"));
+    }
+
+    @Test
+    public void getNestedClientEndpoint() throws Exception {
+        restMockMvc.perform(get("/admin/user-management"))
+            .andExpect(status().isOk())
+            .andExpect(forwardedUrl("/"));
+    }
+
+    @RestController
+    public static class TestController {
+
+        @RequestMapping(value = "/test")
+        public String test() {
+            return "test";
+        }
+    }
+}
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/LogsResourceIntegrationTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/LogsResourceIntegrationTest.java
similarity index 94%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/LogsResourceIntegrationTest.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/LogsResourceIntegrationTest.java
index b045f52f87..a9aa9b27c1 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/LogsResourceIntegrationTest.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/LogsResourceIntegrationTest.java
@@ -1,7 +1,8 @@
-package com.baeldung.jhipster5.web.rest;
+package com.baeldung.jhipster6.web.rest;
+
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.web.rest.vm.LoggerVM;
 
-import com.baeldung.jhipster5.BookstoreApp;
-import com.baeldung.jhipster5.web.rest.vm.LoggerVM;
 import ch.qos.logback.classic.AsyncAppender;
 import ch.qos.logback.classic.LoggerContext;
 import org.junit.Before;
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/TestUtil.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/TestUtil.java
similarity index 99%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/TestUtil.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/TestUtil.java
index 403bb9c9b0..50c6cc24a6 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/TestUtil.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/TestUtil.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.web.rest;
+package com.baeldung.jhipster6.web.rest;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/UserJWTControllerIT.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/UserJWTControllerIT.java
new file mode 100644
index 0000000000..3ad59b3166
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/UserJWTControllerIT.java
@@ -0,0 +1,120 @@
+package com.baeldung.jhipster6.web.rest;
+
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.domain.User;
+import com.baeldung.jhipster6.repository.UserRepository;
+import com.baeldung.jhipster6.security.jwt.TokenProvider;
+import com.baeldung.jhipster6.web.rest.errors.ExceptionTranslator;
+import com.baeldung.jhipster6.web.rest.vm.LoginVM;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.transaction.annotation.Transactional;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+/**
+ * Integration tests for the {@link UserJWTController} REST controller.
+ */
+@SpringBootTest(classes = BookstoreApp.class)
+public class UserJWTControllerIT {
+
+    @Autowired
+    private TokenProvider tokenProvider;
+
+    @Autowired
+    private AuthenticationManager authenticationManager;
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private PasswordEncoder passwordEncoder;
+
+    @Autowired
+    private ExceptionTranslator exceptionTranslator;
+
+    private MockMvc mockMvc;
+
+    @BeforeEach
+    public void setup() {
+        UserJWTController userJWTController = new UserJWTController(tokenProvider, authenticationManager);
+        this.mockMvc = MockMvcBuilders.standaloneSetup(userJWTController)
+            .setControllerAdvice(exceptionTranslator)
+            .build();
+    }
+
+    @Test
+    @Transactional
+    public void testAuthorize() throws Exception {
+        User user = new User();
+        user.setLogin("user-jwt-controller");
+        user.setEmail("user-jwt-controller@example.com");
+        user.setActivated(true);
+        user.setPassword(passwordEncoder.encode("test"));
+
+        userRepository.saveAndFlush(user);
+
+        LoginVM login = new LoginVM();
+        login.setUsername("user-jwt-controller");
+        login.setPassword("test");
+        mockMvc.perform(post("/api/authenticate")
+            .contentType(TestUtil.APPLICATION_JSON_UTF8)
+            .content(TestUtil.convertObjectToJsonBytes(login)))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.id_token").isString())
+            .andExpect(jsonPath("$.id_token").isNotEmpty())
+            .andExpect(header().string("Authorization", not(nullValue())))
+            .andExpect(header().string("Authorization", not(isEmptyString())));
+    }
+
+    @Test
+    @Transactional
+    public void testAuthorizeWithRememberMe() throws Exception {
+        User user = new User();
+        user.setLogin("user-jwt-controller-remember-me");
+        user.setEmail("user-jwt-controller-remember-me@example.com");
+        user.setActivated(true);
+        user.setPassword(passwordEncoder.encode("test"));
+
+        userRepository.saveAndFlush(user);
+
+        LoginVM login = new LoginVM();
+        login.setUsername("user-jwt-controller-remember-me");
+        login.setPassword("test");
+        login.setRememberMe(true);
+        mockMvc.perform(post("/api/authenticate")
+            .contentType(TestUtil.APPLICATION_JSON_UTF8)
+            .content(TestUtil.convertObjectToJsonBytes(login)))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.id_token").isString())
+            .andExpect(jsonPath("$.id_token").isNotEmpty())
+            .andExpect(header().string("Authorization", not(nullValue())))
+            .andExpect(header().string("Authorization", not(isEmptyString())));
+    }
+
+    @Test
+    public void testAuthorizeFails() throws Exception {
+        LoginVM login = new LoginVM();
+        login.setUsername("wrong-user");
+        login.setPassword("wrong password");
+        mockMvc.perform(post("/api/authenticate")
+            .contentType(TestUtil.APPLICATION_JSON_UTF8)
+            .content(TestUtil.convertObjectToJsonBytes(login)))
+            .andExpect(status().isUnauthorized())
+            .andExpect(jsonPath("$.id_token").doesNotExist())
+            .andExpect(header().doesNotExist("Authorization"));
+    }
+}
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/UserJWTControllerIntegrationTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/UserJWTControllerIntegrationTest.java
similarity index 92%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/UserJWTControllerIntegrationTest.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/UserJWTControllerIntegrationTest.java
index 7cfc0e19fc..bf62d29f1b 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/UserJWTControllerIntegrationTest.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/UserJWTControllerIntegrationTest.java
@@ -1,11 +1,12 @@
-package com.baeldung.jhipster5.web.rest;
+package com.baeldung.jhipster6.web.rest;
+
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.domain.User;
+import com.baeldung.jhipster6.repository.UserRepository;
+import com.baeldung.jhipster6.security.jwt.TokenProvider;
+import com.baeldung.jhipster6.web.rest.errors.ExceptionTranslator;
+import com.baeldung.jhipster6.web.rest.vm.LoginVM;
 
-import com.baeldung.jhipster5.BookstoreApp;
-import com.baeldung.jhipster5.domain.User;
-import com.baeldung.jhipster5.repository.UserRepository;
-import com.baeldung.jhipster5.security.jwt.TokenProvider;
-import com.baeldung.jhipster5.web.rest.errors.ExceptionTranslator;
-import com.baeldung.jhipster5.web.rest.vm.LoginVM;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/UserResourceIT.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/UserResourceIT.java
new file mode 100644
index 0000000000..420dcbbd77
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/UserResourceIT.java
@@ -0,0 +1,592 @@
+package com.baeldung.jhipster6.web.rest;
+
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.domain.Authority;
+import com.baeldung.jhipster6.domain.User;
+import com.baeldung.jhipster6.repository.UserRepository;
+import com.baeldung.jhipster6.security.AuthoritiesConstants;
+import com.baeldung.jhipster6.service.MailService;
+import com.baeldung.jhipster6.service.UserService;
+import com.baeldung.jhipster6.service.dto.UserDTO;
+import com.baeldung.jhipster6.service.mapper.UserMapper;
+import com.baeldung.jhipster6.web.rest.errors.ExceptionTranslator;
+import com.baeldung.jhipster6.web.rest.vm.ManagedUserVM;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.web.PageableHandlerMethodArgumentResolver;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.persistence.EntityManager;
+import java.time.Instant;
+import java.util.*;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.hasItems;
+import static org.hamcrest.Matchers.hasItem;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+
+/**
+ * Integration tests for the {@link UserResource} REST controller.
+ */
+@SpringBootTest(classes = BookstoreApp.class)
+public class UserResourceIT {
+
+    private static final String DEFAULT_LOGIN = "johndoe";
+    private static final String UPDATED_LOGIN = "jhipster";
+
+    private static final Long DEFAULT_ID = 1L;
+
+    private static final String DEFAULT_PASSWORD = "passjohndoe";
+    private static final String UPDATED_PASSWORD = "passjhipster";
+
+    private static final String DEFAULT_EMAIL = "johndoe@localhost";
+    private static final String UPDATED_EMAIL = "jhipster@localhost";
+
+    private static final String DEFAULT_FIRSTNAME = "john";
+    private static final String UPDATED_FIRSTNAME = "jhipsterFirstName";
+
+    private static final String DEFAULT_LASTNAME = "doe";
+    private static final String UPDATED_LASTNAME = "jhipsterLastName";
+
+    private static final String DEFAULT_IMAGEURL = "http://placehold.it/50x50";
+    private static final String UPDATED_IMAGEURL = "http://placehold.it/40x40";
+
+    private static final String DEFAULT_LANGKEY = "en";
+    private static final String UPDATED_LANGKEY = "fr";
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private MailService mailService;
+
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private UserMapper userMapper;
+
+    @Autowired
+    private MappingJackson2HttpMessageConverter jacksonMessageConverter;
+
+    @Autowired
+    private PageableHandlerMethodArgumentResolver pageableArgumentResolver;
+
+    @Autowired
+    private ExceptionTranslator exceptionTranslator;
+
+    @Autowired
+    private EntityManager em;
+
+    private MockMvc restUserMockMvc;
+
+    private User user;
+
+    @BeforeEach
+    public void setup() {
+        UserResource userResource = new UserResource(userService, userRepository, mailService);
+
+        this.restUserMockMvc = MockMvcBuilders.standaloneSetup(userResource)
+            .setCustomArgumentResolvers(pageableArgumentResolver)
+            .setControllerAdvice(exceptionTranslator)
+            .setMessageConverters(jacksonMessageConverter)
+            .build();
+    }
+
+    /**
+     * Create a User.
+     *
+     * This is a static method, as tests for other entities might also need it,
+     * if they test an entity which has a required relationship to the User entity.
+     */
+    public static User createEntity(EntityManager em) {
+        User user = new User();
+        user.setLogin(DEFAULT_LOGIN + RandomStringUtils.randomAlphabetic(5));
+        user.setPassword(RandomStringUtils.random(60));
+        user.setActivated(true);
+        user.setEmail(RandomStringUtils.randomAlphabetic(5) + DEFAULT_EMAIL);
+        user.setFirstName(DEFAULT_FIRSTNAME);
+        user.setLastName(DEFAULT_LASTNAME);
+        user.setImageUrl(DEFAULT_IMAGEURL);
+        user.setLangKey(DEFAULT_LANGKEY);
+        return user;
+    }
+
+    @BeforeEach
+    public void initTest() {
+        user = createEntity(em);
+        user.setLogin(DEFAULT_LOGIN);
+        user.setEmail(DEFAULT_EMAIL);
+    }
+
+    @Test
+    @Transactional
+    public void createUser() throws Exception {
+        int databaseSizeBeforeCreate = userRepository.findAll().size();
+
+        // Create the User
+        ManagedUserVM managedUserVM = new ManagedUserVM();
+        managedUserVM.setLogin(DEFAULT_LOGIN);
+        managedUserVM.setPassword(DEFAULT_PASSWORD);
+        managedUserVM.setFirstName(DEFAULT_FIRSTNAME);
+        managedUserVM.setLastName(DEFAULT_LASTNAME);
+        managedUserVM.setEmail(DEFAULT_EMAIL);
+        managedUserVM.setActivated(true);
+        managedUserVM.setImageUrl(DEFAULT_IMAGEURL);
+        managedUserVM.setLangKey(DEFAULT_LANGKEY);
+        managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+
+        restUserMockMvc.perform(post("/api/users")
+            .contentType(TestUtil.APPLICATION_JSON_UTF8)
+            .content(TestUtil.convertObjectToJsonBytes(managedUserVM)))
+            .andExpect(status().isCreated());
+
+        // Validate the User in the database
+        List<User> userList = userRepository.findAll();
+        assertThat(userList).hasSize(databaseSizeBeforeCreate + 1);
+        User testUser = userList.get(userList.size() - 1);
+        assertThat(testUser.getLogin()).isEqualTo(DEFAULT_LOGIN);
+        assertThat(testUser.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME);
+        assertThat(testUser.getLastName()).isEqualTo(DEFAULT_LASTNAME);
+        assertThat(testUser.getEmail()).isEqualTo(DEFAULT_EMAIL);
+        assertThat(testUser.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
+        assertThat(testUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
+    }
+
+    @Test
+    @Transactional
+    public void createUserWithExistingId() throws Exception {
+        int databaseSizeBeforeCreate = userRepository.findAll().size();
+
+        ManagedUserVM managedUserVM = new ManagedUserVM();
+        managedUserVM.setId(1L);
+        managedUserVM.setLogin(DEFAULT_LOGIN);
+        managedUserVM.setPassword(DEFAULT_PASSWORD);
+        managedUserVM.setFirstName(DEFAULT_FIRSTNAME);
+        managedUserVM.setLastName(DEFAULT_LASTNAME);
+        managedUserVM.setEmail(DEFAULT_EMAIL);
+        managedUserVM.setActivated(true);
+        managedUserVM.setImageUrl(DEFAULT_IMAGEURL);
+        managedUserVM.setLangKey(DEFAULT_LANGKEY);
+        managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+
+        // An entity with an existing ID cannot be created, so this API call must fail
+        restUserMockMvc.perform(post("/api/users")
+            .contentType(TestUtil.APPLICATION_JSON_UTF8)
+            .content(TestUtil.convertObjectToJsonBytes(managedUserVM)))
+            .andExpect(status().isBadRequest());
+
+        // Validate the User in the database
+        List<User> userList = userRepository.findAll();
+        assertThat(userList).hasSize(databaseSizeBeforeCreate);
+    }
+
+    @Test
+    @Transactional
+    public void createUserWithExistingLogin() throws Exception {
+        // Initialize the database
+        userRepository.saveAndFlush(user);
+        int databaseSizeBeforeCreate = userRepository.findAll().size();
+
+        ManagedUserVM managedUserVM = new ManagedUserVM();
+        managedUserVM.setLogin(DEFAULT_LOGIN);// this login should already be used
+        managedUserVM.setPassword(DEFAULT_PASSWORD);
+        managedUserVM.setFirstName(DEFAULT_FIRSTNAME);
+        managedUserVM.setLastName(DEFAULT_LASTNAME);
+        managedUserVM.setEmail("anothermail@localhost");
+        managedUserVM.setActivated(true);
+        managedUserVM.setImageUrl(DEFAULT_IMAGEURL);
+        managedUserVM.setLangKey(DEFAULT_LANGKEY);
+        managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+
+        // Create the User
+        restUserMockMvc.perform(post("/api/users")
+            .contentType(TestUtil.APPLICATION_JSON_UTF8)
+            .content(TestUtil.convertObjectToJsonBytes(managedUserVM)))
+            .andExpect(status().isBadRequest());
+
+        // Validate the User in the database
+        List<User> userList = userRepository.findAll();
+        assertThat(userList).hasSize(databaseSizeBeforeCreate);
+    }
+
+    @Test
+    @Transactional
+    public void createUserWithExistingEmail() throws Exception {
+        // Initialize the database
+        userRepository.saveAndFlush(user);
+        int databaseSizeBeforeCreate = userRepository.findAll().size();
+
+        ManagedUserVM managedUserVM = new ManagedUserVM();
+        managedUserVM.setLogin("anotherlogin");
+        managedUserVM.setPassword(DEFAULT_PASSWORD);
+        managedUserVM.setFirstName(DEFAULT_FIRSTNAME);
+        managedUserVM.setLastName(DEFAULT_LASTNAME);
+        managedUserVM.setEmail(DEFAULT_EMAIL);// this email should already be used
+        managedUserVM.setActivated(true);
+        managedUserVM.setImageUrl(DEFAULT_IMAGEURL);
+        managedUserVM.setLangKey(DEFAULT_LANGKEY);
+        managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+
+        // Create the User
+        restUserMockMvc.perform(post("/api/users")
+            .contentType(TestUtil.APPLICATION_JSON_UTF8)
+            .content(TestUtil.convertObjectToJsonBytes(managedUserVM)))
+            .andExpect(status().isBadRequest());
+
+        // Validate the User in the database
+        List<User> userList = userRepository.findAll();
+        assertThat(userList).hasSize(databaseSizeBeforeCreate);
+    }
+
+    @Test
+    @Transactional
+    public void getAllUsers() throws Exception {
+        // Initialize the database
+        userRepository.saveAndFlush(user);
+
+        // Get all the users
+        restUserMockMvc.perform(get("/api/users?sort=id,desc")
+            .accept(MediaType.APPLICATION_JSON))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE))
+            .andExpect(jsonPath("$.[*].login").value(hasItem(DEFAULT_LOGIN)))
+            .andExpect(jsonPath("$.[*].firstName").value(hasItem(DEFAULT_FIRSTNAME)))
+            .andExpect(jsonPath("$.[*].lastName").value(hasItem(DEFAULT_LASTNAME)))
+            .andExpect(jsonPath("$.[*].email").value(hasItem(DEFAULT_EMAIL)))
+            .andExpect(jsonPath("$.[*].imageUrl").value(hasItem(DEFAULT_IMAGEURL)))
+            .andExpect(jsonPath("$.[*].langKey").value(hasItem(DEFAULT_LANGKEY)));
+    }
+
+    @Test
+    @Transactional
+    public void getUser() throws Exception {
+        // Initialize the database
+        userRepository.saveAndFlush(user);
+
+        // Get the user
+        restUserMockMvc.perform(get("/api/users/{login}", user.getLogin()))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE))
+            .andExpect(jsonPath("$.login").value(user.getLogin()))
+            .andExpect(jsonPath("$.firstName").value(DEFAULT_FIRSTNAME))
+            .andExpect(jsonPath("$.lastName").value(DEFAULT_LASTNAME))
+            .andExpect(jsonPath("$.email").value(DEFAULT_EMAIL))
+            .andExpect(jsonPath("$.imageUrl").value(DEFAULT_IMAGEURL))
+            .andExpect(jsonPath("$.langKey").value(DEFAULT_LANGKEY));
+    }
+
+    @Test
+    @Transactional
+    public void getNonExistingUser() throws Exception {
+        restUserMockMvc.perform(get("/api/users/unknown"))
+            .andExpect(status().isNotFound());
+    }
+
+    @Test
+    @Transactional
+    public void updateUser() throws Exception {
+        // Initialize the database
+        userRepository.saveAndFlush(user);
+        int databaseSizeBeforeUpdate = userRepository.findAll().size();
+
+        // Update the user
+        User updatedUser = userRepository.findById(user.getId()).get();
+
+        ManagedUserVM managedUserVM = new ManagedUserVM();
+        managedUserVM.setId(updatedUser.getId());
+        managedUserVM.setLogin(updatedUser.getLogin());
+        managedUserVM.setPassword(UPDATED_PASSWORD);
+        managedUserVM.setFirstName(UPDATED_FIRSTNAME);
+        managedUserVM.setLastName(UPDATED_LASTNAME);
+        managedUserVM.setEmail(UPDATED_EMAIL);
+        managedUserVM.setActivated(updatedUser.getActivated());
+        managedUserVM.setImageUrl(UPDATED_IMAGEURL);
+        managedUserVM.setLangKey(UPDATED_LANGKEY);
+        managedUserVM.setCreatedBy(updatedUser.getCreatedBy());
+        managedUserVM.setCreatedDate(updatedUser.getCreatedDate());
+        managedUserVM.setLastModifiedBy(updatedUser.getLastModifiedBy());
+        managedUserVM.setLastModifiedDate(updatedUser.getLastModifiedDate());
+        managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+
+        restUserMockMvc.perform(put("/api/users")
+            .contentType(TestUtil.APPLICATION_JSON_UTF8)
+            .content(TestUtil.convertObjectToJsonBytes(managedUserVM)))
+            .andExpect(status().isOk());
+
+        // Validate the User in the database
+        List<User> userList = userRepository.findAll();
+        assertThat(userList).hasSize(databaseSizeBeforeUpdate);
+        User testUser = userList.get(userList.size() - 1);
+        assertThat(testUser.getFirstName()).isEqualTo(UPDATED_FIRSTNAME);
+        assertThat(testUser.getLastName()).isEqualTo(UPDATED_LASTNAME);
+        assertThat(testUser.getEmail()).isEqualTo(UPDATED_EMAIL);
+        assertThat(testUser.getImageUrl()).isEqualTo(UPDATED_IMAGEURL);
+        assertThat(testUser.getLangKey()).isEqualTo(UPDATED_LANGKEY);
+    }
+
+    @Test
+    @Transactional
+    public void updateUserLogin() throws Exception {
+        // Initialize the database
+        userRepository.saveAndFlush(user);
+        int databaseSizeBeforeUpdate = userRepository.findAll().size();
+
+        // Update the user
+        User updatedUser = userRepository.findById(user.getId()).get();
+
+        ManagedUserVM managedUserVM = new ManagedUserVM();
+        managedUserVM.setId(updatedUser.getId());
+        managedUserVM.setLogin(UPDATED_LOGIN);
+        managedUserVM.setPassword(UPDATED_PASSWORD);
+        managedUserVM.setFirstName(UPDATED_FIRSTNAME);
+        managedUserVM.setLastName(UPDATED_LASTNAME);
+        managedUserVM.setEmail(UPDATED_EMAIL);
+        managedUserVM.setActivated(updatedUser.getActivated());
+        managedUserVM.setImageUrl(UPDATED_IMAGEURL);
+        managedUserVM.setLangKey(UPDATED_LANGKEY);
+        managedUserVM.setCreatedBy(updatedUser.getCreatedBy());
+        managedUserVM.setCreatedDate(updatedUser.getCreatedDate());
+        managedUserVM.setLastModifiedBy(updatedUser.getLastModifiedBy());
+        managedUserVM.setLastModifiedDate(updatedUser.getLastModifiedDate());
+        managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+
+        restUserMockMvc.perform(put("/api/users")
+            .contentType(TestUtil.APPLICATION_JSON_UTF8)
+            .content(TestUtil.convertObjectToJsonBytes(managedUserVM)))
+            .andExpect(status().isOk());
+
+        // Validate the User in the database
+        List<User> userList = userRepository.findAll();
+        assertThat(userList).hasSize(databaseSizeBeforeUpdate);
+        User testUser = userList.get(userList.size() - 1);
+        assertThat(testUser.getLogin()).isEqualTo(UPDATED_LOGIN);
+        assertThat(testUser.getFirstName()).isEqualTo(UPDATED_FIRSTNAME);
+        assertThat(testUser.getLastName()).isEqualTo(UPDATED_LASTNAME);
+        assertThat(testUser.getEmail()).isEqualTo(UPDATED_EMAIL);
+        assertThat(testUser.getImageUrl()).isEqualTo(UPDATED_IMAGEURL);
+        assertThat(testUser.getLangKey()).isEqualTo(UPDATED_LANGKEY);
+    }
+
+    @Test
+    @Transactional
+    public void updateUserExistingEmail() throws Exception {
+        // Initialize the database with 2 users
+        userRepository.saveAndFlush(user);
+
+        User anotherUser = new User();
+        anotherUser.setLogin("jhipster");
+        anotherUser.setPassword(RandomStringUtils.random(60));
+        anotherUser.setActivated(true);
+        anotherUser.setEmail("jhipster@localhost");
+        anotherUser.setFirstName("java");
+        anotherUser.setLastName("hipster");
+        anotherUser.setImageUrl("");
+        anotherUser.setLangKey("en");
+        userRepository.saveAndFlush(anotherUser);
+
+        // Update the user
+        User updatedUser = userRepository.findById(user.getId()).get();
+
+        ManagedUserVM managedUserVM = new ManagedUserVM();
+        managedUserVM.setId(updatedUser.getId());
+        managedUserVM.setLogin(updatedUser.getLogin());
+        managedUserVM.setPassword(updatedUser.getPassword());
+        managedUserVM.setFirstName(updatedUser.getFirstName());
+        managedUserVM.setLastName(updatedUser.getLastName());
+        managedUserVM.setEmail("jhipster@localhost");// this email should already be used by anotherUser
+        managedUserVM.setActivated(updatedUser.getActivated());
+        managedUserVM.setImageUrl(updatedUser.getImageUrl());
+        managedUserVM.setLangKey(updatedUser.getLangKey());
+        managedUserVM.setCreatedBy(updatedUser.getCreatedBy());
+        managedUserVM.setCreatedDate(updatedUser.getCreatedDate());
+        managedUserVM.setLastModifiedBy(updatedUser.getLastModifiedBy());
+        managedUserVM.setLastModifiedDate(updatedUser.getLastModifiedDate());
+        managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+
+        restUserMockMvc.perform(put("/api/users")
+            .contentType(TestUtil.APPLICATION_JSON_UTF8)
+            .content(TestUtil.convertObjectToJsonBytes(managedUserVM)))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    @Transactional
+    public void updateUserExistingLogin() throws Exception {
+        // Initialize the database
+        userRepository.saveAndFlush(user);
+
+        User anotherUser = new User();
+        anotherUser.setLogin("jhipster");
+        anotherUser.setPassword(RandomStringUtils.random(60));
+        anotherUser.setActivated(true);
+        anotherUser.setEmail("jhipster@localhost");
+        anotherUser.setFirstName("java");
+        anotherUser.setLastName("hipster");
+        anotherUser.setImageUrl("");
+        anotherUser.setLangKey("en");
+        userRepository.saveAndFlush(anotherUser);
+
+        // Update the user
+        User updatedUser = userRepository.findById(user.getId()).get();
+
+        ManagedUserVM managedUserVM = new ManagedUserVM();
+        managedUserVM.setId(updatedUser.getId());
+        managedUserVM.setLogin("jhipster");// this login should already be used by anotherUser
+        managedUserVM.setPassword(updatedUser.getPassword());
+        managedUserVM.setFirstName(updatedUser.getFirstName());
+        managedUserVM.setLastName(updatedUser.getLastName());
+        managedUserVM.setEmail(updatedUser.getEmail());
+        managedUserVM.setActivated(updatedUser.getActivated());
+        managedUserVM.setImageUrl(updatedUser.getImageUrl());
+        managedUserVM.setLangKey(updatedUser.getLangKey());
+        managedUserVM.setCreatedBy(updatedUser.getCreatedBy());
+        managedUserVM.setCreatedDate(updatedUser.getCreatedDate());
+        managedUserVM.setLastModifiedBy(updatedUser.getLastModifiedBy());
+        managedUserVM.setLastModifiedDate(updatedUser.getLastModifiedDate());
+        managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+
+        restUserMockMvc.perform(put("/api/users")
+            .contentType(TestUtil.APPLICATION_JSON_UTF8)
+            .content(TestUtil.convertObjectToJsonBytes(managedUserVM)))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    @Transactional
+    public void deleteUser() throws Exception {
+        // Initialize the database
+        userRepository.saveAndFlush(user);
+        int databaseSizeBeforeDelete = userRepository.findAll().size();
+
+        // Delete the user
+        restUserMockMvc.perform(delete("/api/users/{login}", user.getLogin())
+            .accept(TestUtil.APPLICATION_JSON_UTF8))
+            .andExpect(status().isNoContent());
+
+        // Validate the database is empty
+        List<User> userList = userRepository.findAll();
+        assertThat(userList).hasSize(databaseSizeBeforeDelete - 1);
+    }
+
+    @Test
+    @Transactional
+    public void getAllAuthorities() throws Exception {
+        restUserMockMvc.perform(get("/api/users/authorities")
+            .accept(TestUtil.APPLICATION_JSON_UTF8)
+            .contentType(TestUtil.APPLICATION_JSON_UTF8))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE))
+            .andExpect(jsonPath("$").isArray())
+            .andExpect(jsonPath("$").value(hasItems(AuthoritiesConstants.USER, AuthoritiesConstants.ADMIN)));
+    }
+
+    @Test
+    @Transactional
+    public void testUserEquals() throws Exception {
+        TestUtil.equalsVerifier(User.class);
+        User user1 = new User();
+        user1.setId(1L);
+        User user2 = new User();
+        user2.setId(user1.getId());
+        assertThat(user1).isEqualTo(user2);
+        user2.setId(2L);
+        assertThat(user1).isNotEqualTo(user2);
+        user1.setId(null);
+        assertThat(user1).isNotEqualTo(user2);
+    }
+
+    @Test
+    public void testUserDTOtoUser() {
+        UserDTO userDTO = new UserDTO();
+        userDTO.setId(DEFAULT_ID);
+        userDTO.setLogin(DEFAULT_LOGIN);
+        userDTO.setFirstName(DEFAULT_FIRSTNAME);
+        userDTO.setLastName(DEFAULT_LASTNAME);
+        userDTO.setEmail(DEFAULT_EMAIL);
+        userDTO.setActivated(true);
+        userDTO.setImageUrl(DEFAULT_IMAGEURL);
+        userDTO.setLangKey(DEFAULT_LANGKEY);
+        userDTO.setCreatedBy(DEFAULT_LOGIN);
+        userDTO.setLastModifiedBy(DEFAULT_LOGIN);
+        userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+
+        User user = userMapper.userDTOToUser(userDTO);
+        assertThat(user.getId()).isEqualTo(DEFAULT_ID);
+        assertThat(user.getLogin()).isEqualTo(DEFAULT_LOGIN);
+        assertThat(user.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME);
+        assertThat(user.getLastName()).isEqualTo(DEFAULT_LASTNAME);
+        assertThat(user.getEmail()).isEqualTo(DEFAULT_EMAIL);
+        assertThat(user.getActivated()).isEqualTo(true);
+        assertThat(user.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
+        assertThat(user.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
+        assertThat(user.getCreatedBy()).isNull();
+        assertThat(user.getCreatedDate()).isNotNull();
+        assertThat(user.getLastModifiedBy()).isNull();
+        assertThat(user.getLastModifiedDate()).isNotNull();
+        assertThat(user.getAuthorities()).extracting("name").containsExactly(AuthoritiesConstants.USER);
+    }
+
+    @Test
+    public void testUserToUserDTO() {
+        user.setId(DEFAULT_ID);
+        user.setCreatedBy(DEFAULT_LOGIN);
+        user.setCreatedDate(Instant.now());
+        user.setLastModifiedBy(DEFAULT_LOGIN);
+        user.setLastModifiedDate(Instant.now());
+        Set<Authority> authorities = new HashSet<>();
+        Authority authority = new Authority();
+        authority.setName(AuthoritiesConstants.USER);
+        authorities.add(authority);
+        user.setAuthorities(authorities);
+
+        UserDTO userDTO = userMapper.userToUserDTO(user);
+
+        assertThat(userDTO.getId()).isEqualTo(DEFAULT_ID);
+        assertThat(userDTO.getLogin()).isEqualTo(DEFAULT_LOGIN);
+        assertThat(userDTO.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME);
+        assertThat(userDTO.getLastName()).isEqualTo(DEFAULT_LASTNAME);
+        assertThat(userDTO.getEmail()).isEqualTo(DEFAULT_EMAIL);
+        assertThat(userDTO.isActivated()).isEqualTo(true);
+        assertThat(userDTO.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
+        assertThat(userDTO.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
+        assertThat(userDTO.getCreatedBy()).isEqualTo(DEFAULT_LOGIN);
+        assertThat(userDTO.getCreatedDate()).isEqualTo(user.getCreatedDate());
+        assertThat(userDTO.getLastModifiedBy()).isEqualTo(DEFAULT_LOGIN);
+        assertThat(userDTO.getLastModifiedDate()).isEqualTo(user.getLastModifiedDate());
+        assertThat(userDTO.getAuthorities()).containsExactly(AuthoritiesConstants.USER);
+        assertThat(userDTO.toString()).isNotNull();
+    }
+
+    @Test
+    public void testAuthorityEquals() {
+        Authority authorityA = new Authority();
+        assertThat(authorityA).isEqualTo(authorityA);
+        assertThat(authorityA).isNotEqualTo(null);
+        assertThat(authorityA).isNotEqualTo(new Object());
+        assertThat(authorityA.hashCode()).isEqualTo(0);
+        assertThat(authorityA.toString()).isNotNull();
+
+        Authority authorityB = new Authority();
+        assertThat(authorityA).isEqualTo(authorityB);
+
+        authorityB.setName(AuthoritiesConstants.ADMIN);
+        assertThat(authorityA).isNotEqualTo(authorityB);
+
+        authorityA.setName(AuthoritiesConstants.USER);
+        assertThat(authorityA).isNotEqualTo(authorityB);
+
+        authorityB.setName(AuthoritiesConstants.USER);
+        assertThat(authorityA).isEqualTo(authorityB);
+        assertThat(authorityA.hashCode()).isEqualTo(authorityB.hashCode());
+    }
+}
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/UserResourceIntegrationTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/UserResourceIntegrationTest.java
similarity index 97%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/UserResourceIntegrationTest.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/UserResourceIntegrationTest.java
index c0abc042fb..20d8d4a85c 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/UserResourceIntegrationTest.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/UserResourceIntegrationTest.java
@@ -1,16 +1,17 @@
-package com.baeldung.jhipster5.web.rest;
+package com.baeldung.jhipster6.web.rest;
+
+import com.baeldung.jhipster6.BookstoreApp;
+import com.baeldung.jhipster6.domain.Authority;
+import com.baeldung.jhipster6.domain.User;
+import com.baeldung.jhipster6.repository.UserRepository;
+import com.baeldung.jhipster6.security.AuthoritiesConstants;
+import com.baeldung.jhipster6.service.MailService;
+import com.baeldung.jhipster6.service.UserService;
+import com.baeldung.jhipster6.service.dto.UserDTO;
+import com.baeldung.jhipster6.service.mapper.UserMapper;
+import com.baeldung.jhipster6.web.rest.errors.ExceptionTranslator;
+import com.baeldung.jhipster6.web.rest.vm.ManagedUserVM;
 
-import com.baeldung.jhipster5.BookstoreApp;
-import com.baeldung.jhipster5.domain.Authority;
-import com.baeldung.jhipster5.domain.User;
-import com.baeldung.jhipster5.repository.UserRepository;
-import com.baeldung.jhipster5.security.AuthoritiesConstants;
-import com.baeldung.jhipster5.service.MailService;
-import com.baeldung.jhipster5.service.UserService;
-import com.baeldung.jhipster5.service.dto.UserDTO;
-import com.baeldung.jhipster5.service.mapper.UserMapper;
-import com.baeldung.jhipster5.web.rest.errors.ExceptionTranslator;
-import com.baeldung.jhipster5.web.rest.vm.ManagedUserVM;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/errors/ExceptionTranslatorIT.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/errors/ExceptionTranslatorIT.java
new file mode 100644
index 0000000000..2ecbe7254e
--- /dev/null
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/errors/ExceptionTranslatorIT.java
@@ -0,0 +1,125 @@
+package com.baeldung.jhipster6.web.rest.errors;
+
+import com.baeldung.jhipster6.BookstoreApp;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+/**
+ * Integration tests {@link ExceptionTranslator} controller advice.
+ */
+@SpringBootTest(classes = BookstoreApp.class)
+public class ExceptionTranslatorIT {
+
+    @Autowired
+    private ExceptionTranslatorTestController controller;
+
+    @Autowired
+    private ExceptionTranslator exceptionTranslator;
+
+    @Autowired
+    private MappingJackson2HttpMessageConverter jacksonMessageConverter;
+
+    private MockMvc mockMvc;
+
+    @BeforeEach
+    public void setup() {
+        mockMvc = MockMvcBuilders.standaloneSetup(controller)
+            .setControllerAdvice(exceptionTranslator)
+            .setMessageConverters(jacksonMessageConverter)
+            .build();
+    }
+
+    @Test
+    public void testConcurrencyFailure() throws Exception {
+        mockMvc.perform(get("/test/concurrency-failure"))
+            .andExpect(status().isConflict())
+            .andExpect(content().contentType(MediaType.APPLICATION_PROBLEM_JSON))
+            .andExpect(jsonPath("$.message").value(ErrorConstants.ERR_CONCURRENCY_FAILURE));
+    }
+
+    @Test
+    public void testMethodArgumentNotValid() throws Exception {
+         mockMvc.perform(post("/test/method-argument").content("{}").contentType(MediaType.APPLICATION_JSON))
+             .andExpect(status().isBadRequest())
+             .andExpect(content().contentType(MediaType.APPLICATION_PROBLEM_JSON))
+             .andExpect(jsonPath("$.message").value(ErrorConstants.ERR_VALIDATION))
+             .andExpect(jsonPath("$.fieldErrors.[0].objectName").value("testDTO"))
+             .andExpect(jsonPath("$.fieldErrors.[0].field").value("test"))
+             .andExpect(jsonPath("$.fieldErrors.[0].message").value("NotNull"));
+    }
+
+    @Test
+    public void testMissingServletRequestPartException() throws Exception {
+        mockMvc.perform(get("/test/missing-servlet-request-part"))
+            .andExpect(status().isBadRequest())
+            .andExpect(content().contentType(MediaType.APPLICATION_PROBLEM_JSON))
+            .andExpect(jsonPath("$.message").value("error.http.400"));
+    }
+
+    @Test
+    public void testMissingServletRequestParameterException() throws Exception {
+        mockMvc.perform(get("/test/missing-servlet-request-parameter"))
+            .andExpect(status().isBadRequest())
+            .andExpect(content().contentType(MediaType.APPLICATION_PROBLEM_JSON))
+            .andExpect(jsonPath("$.message").value("error.http.400"));
+    }
+
+    @Test
+    public void testAccessDenied() throws Exception {
+        mockMvc.perform(get("/test/access-denied"))
+            .andExpect(status().isForbidden())
+            .andExpect(content().contentType(MediaType.APPLICATION_PROBLEM_JSON))
+            .andExpect(jsonPath("$.message").value("error.http.403"))
+            .andExpect(jsonPath("$.detail").value("test access denied!"));
+    }
+
+    @Test
+    public void testUnauthorized() throws Exception {
+        mockMvc.perform(get("/test/unauthorized"))
+            .andExpect(status().isUnauthorized())
+            .andExpect(content().contentType(MediaType.APPLICATION_PROBLEM_JSON))
+            .andExpect(jsonPath("$.message").value("error.http.401"))
+            .andExpect(jsonPath("$.path").value("/test/unauthorized"))
+            .andExpect(jsonPath("$.detail").value("test authentication failed!"));
+    }
+
+    @Test
+    public void testMethodNotSupported() throws Exception {
+        mockMvc.perform(post("/test/access-denied"))
+            .andExpect(status().isMethodNotAllowed())
+            .andExpect(content().contentType(MediaType.APPLICATION_PROBLEM_JSON))
+            .andExpect(jsonPath("$.message").value("error.http.405"))
+            .andExpect(jsonPath("$.detail").value("Request method 'POST' not supported"));
+    }
+
+    @Test
+    public void testExceptionWithResponseStatus() throws Exception {
+        mockMvc.perform(get("/test/response-status"))
+            .andExpect(status().isBadRequest())
+            .andExpect(content().contentType(MediaType.APPLICATION_PROBLEM_JSON))
+            .andExpect(jsonPath("$.message").value("error.http.400"))
+            .andExpect(jsonPath("$.title").value("test response status"));
+    }
+
+    @Test
+    public void testInternalServerError() throws Exception {
+        mockMvc.perform(get("/test/internal-server-error"))
+            .andExpect(status().isInternalServerError())
+            .andExpect(content().contentType(MediaType.APPLICATION_PROBLEM_JSON))
+            .andExpect(jsonPath("$.message").value("error.http.500"))
+            .andExpect(jsonPath("$.title").value("Internal Server Error"));
+    }
+
+}
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/errors/ExceptionTranslatorIntegrationTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/errors/ExceptionTranslatorIntegrationTest.java
similarity index 98%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/errors/ExceptionTranslatorIntegrationTest.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/errors/ExceptionTranslatorIntegrationTest.java
index e5ef08ee9c..7b25b314ed 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/errors/ExceptionTranslatorIntegrationTest.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/errors/ExceptionTranslatorIntegrationTest.java
@@ -1,6 +1,6 @@
-package com.baeldung.jhipster5.web.rest.errors;
+package com.baeldung.jhipster6.web.rest.errors;
 
-import com.baeldung.jhipster5.BookstoreApp;
+import com.baeldung.jhipster6.BookstoreApp;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/errors/ExceptionTranslatorTestController.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/errors/ExceptionTranslatorTestController.java
similarity index 98%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/errors/ExceptionTranslatorTestController.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/errors/ExceptionTranslatorTestController.java
index f8d84151b9..a0e6e03178 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/errors/ExceptionTranslatorTestController.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/errors/ExceptionTranslatorTestController.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.web.rest.errors;
+package com.baeldung.jhipster6.web.rest.errors;
 
 import org.springframework.dao.ConcurrencyFailureException;
 import org.springframework.http.HttpStatus;
diff --git a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/util/PaginationUtilUnitTest.java b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/util/PaginationUtilUnitTest.java
similarity index 97%
rename from jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/util/PaginationUtilUnitTest.java
rename to jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/util/PaginationUtilUnitTest.java
index 78b17ee859..da7c2ae1f5 100644
--- a/jhipster-5/bookstore-monolith/src/test/java/com/baeldung/jhipster5/web/rest/util/PaginationUtilUnitTest.java
+++ b/jhipster-6/bookstore-monolith/src/test/java/com/baeldung/jhipster6/web/rest/util/PaginationUtilUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.jhipster5.web.rest.util;
+package com.baeldung.jhipster6.web.rest.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/jest-global-mocks.ts b/jhipster-6/bookstore-monolith/src/test/javascript/jest-global-mocks.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/jest-global-mocks.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/jest-global-mocks.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/jest.conf.js b/jhipster-6/bookstore-monolith/src/test/javascript/jest.conf.js
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/jest.conf.js
rename to jhipster-6/bookstore-monolith/src/test/javascript/jest.conf.js
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/jest.ts b/jhipster-6/bookstore-monolith/src/test/javascript/jest.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/jest.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/jest.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/account/activate/activate.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/account/activate/activate.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/account/activate/activate.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/account/activate/activate.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/account/password/password.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/account/password/password.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/account/password/password.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/account/password/password.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/account/register/register.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/account/register/register.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/account/register/register.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/account/register/register.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/account/settings/settings.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/account/settings/settings.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/account/settings/settings.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/account/settings/settings.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/audits/audits.service.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/audits/audits.service.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/audits/audits.service.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/audits/audits.service.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/configuration/configuration.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/configuration/configuration.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/configuration/configuration.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/configuration/configuration.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/configuration/configuration.service.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/configuration/configuration.service.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/configuration/configuration.service.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/configuration/configuration.service.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/health/health.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/health/health.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/health/health.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/health/health.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/metrics/metrics.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/metrics/metrics.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/metrics/metrics.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/metrics/metrics.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/metrics/metrics.service.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/metrics/metrics.service.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/metrics/metrics.service.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/metrics/metrics.service.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/core/user/account.service.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/core/user/account.service.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/core/user/account.service.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/core/user/account.service.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/core/user/user.service.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/core/user/user.service.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/core/user/user.service.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/core/user/user.service.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/entities/book/book-delete-dialog.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/entities/book/book-delete-dialog.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/entities/book/book-delete-dialog.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/entities/book/book-delete-dialog.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/entities/book/book-detail.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/entities/book/book-detail.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/entities/book/book-detail.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/entities/book/book-detail.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/entities/book/book-update.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/entities/book/book-update.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/entities/book/book-update.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/entities/book/book-update.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/entities/book/book.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/entities/book/book.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/entities/book/book.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/entities/book/book.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/entities/book/book.service.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/entities/book/book.service.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/entities/book/book.service.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/entities/book/book.service.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/shared/alert/alert-error.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/shared/alert/alert-error.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/shared/alert/alert-error.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/shared/alert/alert-error.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/app/shared/login/login.component.spec.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/app/shared/login/login.component.spec.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/app/shared/login/login.component.spec.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/app/shared/login/login.component.spec.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/helpers/mock-account.service.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/helpers/mock-account.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/helpers/mock-account.service.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/helpers/mock-account.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/helpers/mock-active-modal.service.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/helpers/mock-active-modal.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/helpers/mock-active-modal.service.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/helpers/mock-active-modal.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/helpers/mock-alert.service.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/helpers/mock-alert.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/helpers/mock-alert.service.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/helpers/mock-alert.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/helpers/mock-event-manager.service.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/helpers/mock-event-manager.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/helpers/mock-event-manager.service.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/helpers/mock-event-manager.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/helpers/mock-login.service.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/helpers/mock-login.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/helpers/mock-login.service.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/helpers/mock-login.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/helpers/mock-route.service.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/helpers/mock-route.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/helpers/mock-route.service.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/helpers/mock-route.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/helpers/mock-state-storage.service.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/helpers/mock-state-storage.service.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/helpers/mock-state-storage.service.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/helpers/mock-state-storage.service.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/helpers/spyobject.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/helpers/spyobject.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/helpers/spyobject.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/helpers/spyobject.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/javascript/spec/test.module.ts b/jhipster-6/bookstore-monolith/src/test/javascript/spec/test.module.ts
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/javascript/spec/test.module.ts
rename to jhipster-6/bookstore-monolith/src/test/javascript/spec/test.module.ts
diff --git a/jhipster-5/bookstore-monolith/src/test/resources/config/application.yml b/jhipster-6/bookstore-monolith/src/test/resources/config/application.yml
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/resources/config/application.yml
rename to jhipster-6/bookstore-monolith/src/test/resources/config/application.yml
diff --git a/jhipster-5/bookstore-monolith/src/test/resources/i18n/messages_en.properties b/jhipster-6/bookstore-monolith/src/test/resources/i18n/messages_en.properties
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/resources/i18n/messages_en.properties
rename to jhipster-6/bookstore-monolith/src/test/resources/i18n/messages_en.properties
diff --git a/jhipster-5/bookstore-monolith/src/test/resources/logback.xml b/jhipster-6/bookstore-monolith/src/test/resources/logback.xml
similarity index 97%
rename from jhipster-5/bookstore-monolith/src/test/resources/logback.xml
rename to jhipster-6/bookstore-monolith/src/test/resources/logback.xml
index 6244807dfa..de8cf57b93 100644
--- a/jhipster-5/bookstore-monolith/src/test/resources/logback.xml
+++ b/jhipster-6/bookstore-monolith/src/test/resources/logback.xml
@@ -10,7 +10,7 @@
 
     <logger name="javax.activation" level="WARN"/>
     <logger name="javax.mail" level="WARN"/>
-    <logger name="javax.xml.bind" level="WARN"/>
+    <logger name="jakarta.xml.bind" level="WARN"/>
     <logger name="ch.qos.logback" level="WARN"/>
     <logger name="com.ryantenney" level="WARN"/>
     <logger name="com.sun" level="WARN"/>
diff --git a/jhipster-5/bookstore-monolith/src/test/resources/templates/mail/testEmail.html b/jhipster-6/bookstore-monolith/src/test/resources/templates/mail/testEmail.html
similarity index 100%
rename from jhipster-5/bookstore-monolith/src/test/resources/templates/mail/testEmail.html
rename to jhipster-6/bookstore-monolith/src/test/resources/templates/mail/testEmail.html
diff --git a/jhipster-5/bookstore-monolith/tsconfig-aot.json b/jhipster-6/bookstore-monolith/tsconfig-aot.json
similarity index 100%
rename from jhipster-5/bookstore-monolith/tsconfig-aot.json
rename to jhipster-6/bookstore-monolith/tsconfig-aot.json
diff --git a/jhipster-5/bookstore-monolith/tsconfig.json b/jhipster-6/bookstore-monolith/tsconfig.json
similarity index 100%
rename from jhipster-5/bookstore-monolith/tsconfig.json
rename to jhipster-6/bookstore-monolith/tsconfig.json
diff --git a/jhipster-5/bookstore-monolith/tslint.json b/jhipster-6/bookstore-monolith/tslint.json
similarity index 100%
rename from jhipster-5/bookstore-monolith/tslint.json
rename to jhipster-6/bookstore-monolith/tslint.json
diff --git a/jhipster-5/bookstore-monolith/webpack/logo-jhipster.png b/jhipster-6/bookstore-monolith/webpack/logo-jhipster.png
similarity index 100%
rename from jhipster-5/bookstore-monolith/webpack/logo-jhipster.png
rename to jhipster-6/bookstore-monolith/webpack/logo-jhipster.png
diff --git a/jhipster-5/bookstore-monolith/webpack/utils.js b/jhipster-6/bookstore-monolith/webpack/utils.js
similarity index 100%
rename from jhipster-5/bookstore-monolith/webpack/utils.js
rename to jhipster-6/bookstore-monolith/webpack/utils.js
diff --git a/jhipster-5/bookstore-monolith/webpack/webpack.common.js b/jhipster-6/bookstore-monolith/webpack/webpack.common.js
similarity index 100%
rename from jhipster-5/bookstore-monolith/webpack/webpack.common.js
rename to jhipster-6/bookstore-monolith/webpack/webpack.common.js
diff --git a/jhipster-5/bookstore-monolith/webpack/webpack.dev.js b/jhipster-6/bookstore-monolith/webpack/webpack.dev.js
similarity index 100%
rename from jhipster-5/bookstore-monolith/webpack/webpack.dev.js
rename to jhipster-6/bookstore-monolith/webpack/webpack.dev.js
diff --git a/jhipster-5/bookstore-monolith/webpack/webpack.prod.js b/jhipster-6/bookstore-monolith/webpack/webpack.prod.js
similarity index 100%
rename from jhipster-5/bookstore-monolith/webpack/webpack.prod.js
rename to jhipster-6/bookstore-monolith/webpack/webpack.prod.js
diff --git a/jhipster-5/pom.xml b/jhipster-6/pom.xml
similarity index 56%
rename from jhipster-5/pom.xml
rename to jhipster-6/pom.xml
index 2a5132e50e..b3c5e58319 100644
--- a/jhipster-5/pom.xml
+++ b/jhipster-6/pom.xml
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung.jhipster</groupId>
-    <artifactId>jhipster-5</artifactId>
+    <artifactId>jhipster-6</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <name>jhipster-5</name>
+    <name>jhipster-6</name>
     <packaging>pom</packaging>
 
     <parent>
@@ -17,6 +16,6 @@
 
     <modules>
         <module>bookstore-monolith</module>
-	</modules>
-	
+    </modules>
+
 </project>
diff --git a/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaTokenEndpointClient.java b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaTokenEndpointClient.java
index 01c8febdb2..296e8cf67a 100644
--- a/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaTokenEndpointClient.java
+++ b/jhipster-modules/jhipster-uaa/gateway/src/main/java/com/baeldung/jhipster/gateway/security/oauth2/UaaTokenEndpointClient.java
@@ -5,11 +5,11 @@ import io.github.jhipster.config.JHipsterProperties;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Component;
-import org.springframework.util.Base64Utils;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 
 /**
  * Client talking to UAA's token endpoint to do different OAuth2 grants.
@@ -34,7 +34,7 @@ public class UaaTokenEndpointClient extends OAuth2TokenEndpointClientAdapter imp
         String clientId = getClientId();
         String clientSecret = getClientSecret();
         String authorization = clientId + ":" + clientSecret;
-        return "Basic " + Base64Utils.encodeToString(authorization.getBytes(StandardCharsets.UTF_8));
+        return "Basic " + Base64.getEncoder().encodeToString(authorization.getBytes(StandardCharsets.UTF_8));
     }
 
 }
diff --git a/jib/pom.xml b/jib/pom.xml
index bbc9a3c623..2bdaa258f5 100644
--- a/jib/pom.xml
+++ b/jib/pom.xml
@@ -4,7 +4,6 @@
     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>jib</artifactId>
-    <version>0.1-SNAPSHOT</version>
     <name>jib</name>
 
     <parent>
diff --git a/jmeter/pom.xml b/jmeter/pom.xml
index acd823b74f..5f4105d282 100644
--- a/jmeter/pom.xml
+++ b/jmeter/pom.xml
@@ -48,8 +48,15 @@
             <plugin>
                 <groupId>com.lazerycode.jmeter</groupId>
                 <artifactId>jmeter-maven-plugin</artifactId>
-                <version>${jmeter.version}</version>
+                <version>${jmeter-maven-plugin.version}</version>
                 <executions>
+                    <!-- Generate JMeter configuration -->
+                    <execution>
+                        <id>configuration</id>
+                        <goals>
+                            <goal>configure</goal>
+                        </goals>
+                    </execution>
                     <execution>
                         <id>jmeter-tests</id>
                         <goals>
@@ -65,10 +72,6 @@
         </plugins>
     </build>
 
-    <properties>
-        <jmeter.version>2.6.0</jmeter.version>
-    </properties>
-    
     <profiles>
         <profile>
             <id>dashboard</id>
@@ -113,7 +116,7 @@
                     <plugin>
                         <groupId>com.lazerycode.jmeter</groupId>
                         <artifactId>jmeter-maven-plugin</artifactId>
-                        <version>3.7.0</version>
+                        <version>${jmeter-maven-plugin.version}</version>
                         <executions>
                             <!-- Generate JMeter configuration -->
                             <execution>
@@ -155,9 +158,13 @@
             </build>
 
             <properties>
-                <jmeter.version>5.5</jmeter.version>
+                <jmeter-maven-plugin.version>3.7.0</jmeter-maven-plugin.version>
             </properties>
         </profile>
     </profiles>
 
+    <properties>
+        <jmeter-maven-plugin.version>3.7.0</jmeter-maven-plugin.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/jmeter/src/main/resources/FileExtractionExample.jmx b/jmeter/src/main/resources/FileExtractionExample.jmx
index 961b6f143f..a86300ea01 100644
--- a/jmeter/src/main/resources/FileExtractionExample.jmx
+++ b/jmeter/src/main/resources/FileExtractionExample.jmx
@@ -57,7 +57,7 @@
             <stringProp name="filename"></stringProp>
             <stringProp name="parameters"></stringProp>
             <boolProp name="resetInterpreter">false</boolProp>
-            <stringProp name="script">FileWriter fWriter = new FileWriter(&quot;<path>/result.txt&quot;, true);
+            <stringProp name="script">FileWriter fWriter = new FileWriter(&quot;&lt;path&gt;/result.txt&quot;, true);
 BufferedWriter buff = new BufferedWriter(fWriter);
 
 buff.write(&quot;Response Code : &quot; + ctx.getPreviousResult().getResponseCode());
diff --git a/jmh/pom.xml b/jmh/pom.xml
index 61f62efd5a..5b98d59002 100644
--- a/jmh/pom.xml
+++ b/jmh/pom.xml
@@ -4,10 +4,8 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jmh</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <name>jmh</name>
     <packaging>jar</packaging>
-    <url>http://maven.apache.org</url>
 
     <parent>
         <groupId>com.baeldung</groupId>
@@ -20,12 +18,12 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${jmh-core.version}</version>
+            <version>1.36</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh-generator.version}</version>
+            <version>1.36</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jol</groupId>
@@ -36,6 +34,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgs>
+                        <arg>--add-exports=java.base/jdk.internal.vm.annotation=ALL-UNNAMED</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -76,9 +83,10 @@
     </build>
 
     <properties>
-        <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
-        <jol-core.version>0.10</jol-core.version>
-        <maven-assembly-plugin.version>3.2.0</maven-assembly-plugin.version>
+        <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+        <jol-core.version>0.17</jol-core.version>
+        <maven-assembly-plugin.version>3.5.0</maven-assembly-plugin.version>
+        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/jmh/src/main/java/com/baeldung/falsesharing/Striped64.java b/jmh/src/main/java/com/baeldung/falsesharing/Striped64.java
index 71c34a9de3..1cb55f3f4e 100644
--- a/jmh/src/main/java/com/baeldung/falsesharing/Striped64.java
+++ b/jmh/src/main/java/com/baeldung/falsesharing/Striped64.java
@@ -88,7 +88,7 @@ abstract class Striped64 extends Number {
      * JVM intrinsics note: It would be possible to use a release-only
      * form of CAS here, if it were provided.
      */
-    @sun.misc.Contended static final class Cell {
+    @jdk.internal.vm.annotation.Contended static final class Cell {
         volatile long value;
         Cell(long x) { value = x; }
         final boolean cas(long cmp, long val) {
diff --git a/jsf/pom.xml b/jsf/pom.xml
index 88099ef9c4..81030537fb 100644
--- a/jsf/pom.xml
+++ b/jsf/pom.xml
@@ -4,7 +4,6 @@
     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>jsf</artifactId>
-    <version>0.1-SNAPSHOT</version>
     <name>jsf</name>
     <packaging>war</packaging>
 
@@ -15,6 +14,13 @@
     </parent>
 
     <dependencies>
+
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax.annotation-api.version}</version>
+        </dependency>
+
         <!-- JSF -->
         <dependency>
             <groupId>com.sun.faces</groupId>
@@ -70,6 +76,10 @@
         <!-- JSF -->
         <com.sun.faces.version>2.2.14</com.sun.faces.version>
         <javax.el.version>3.0.0</javax.el.version>
+        <!-- Maven War plugin -->
+        <maven-war-plugin.version>3.3.1</maven-war-plugin.version>
+        <!-- Other -->
+        <javax.annotation-api.version>1.3.1</javax.annotation-api.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/json-modules/gson/pom.xml b/json-modules/gson/pom.xml
index faa8a48297..ecfbaa7be4 100644
--- a/json-modules/gson/pom.xml
+++ b/json-modules/gson/pom.xml
@@ -4,7 +4,6 @@
     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>gson</artifactId>
-    <version>0.1-SNAPSHOT</version>
     <name>gson</name>
 
     <parent>
diff --git a/json-modules/gson/src/test/java/com/baeldung/gson/serialization/GsonSerializeUnitTest.java b/json-modules/gson/src/test/java/com/baeldung/gson/serialization/GsonSerializeUnitTest.java
index d5051060c4..21d2bedd24 100644
--- a/json-modules/gson/src/test/java/com/baeldung/gson/serialization/GsonSerializeUnitTest.java
+++ b/json-modules/gson/src/test/java/com/baeldung/gson/serialization/GsonSerializeUnitTest.java
@@ -23,8 +23,8 @@ public class GsonSerializeUnitTest {
         ActorGson rudyYoungblood = new ActorGson("nm2199632", sdf.parse("21-09-1982"), Arrays.asList("Apocalypto", "Beatdown", "Wind Walkers"));
         Movie movie = new Movie("tt0472043", "Mel Gibson", Arrays.asList(rudyYoungblood));
 
-        String expectedOutput = "{\"imdbId\":\"tt0472043\",\"director\":\"Mel Gibson\",\"actors\":[{\"imdbId\":\"nm2199632\",\"dateOfBirth\":\"Sep 21, 1982 12:00:00 AM\",\"filmography\":[\"Apocalypto\",\"Beatdown\",\"Wind Walkers\"]}]}";
-        Assert.assertEquals(new Gson().toJson(movie), expectedOutput);
+        String expectedOutput = "{\"imdbId\":\"tt0472043\",\"director\":\"Mel Gibson\",\"actors\":[{\"imdbId\":\"nm2199632\",\"dateOfBirth\":\"Sep 21, 1982, 12:00:00 AM\",\"filmography\":[\"Apocalypto\",\"Beatdown\",\"Wind Walkers\"]}]}";
+        Assert.assertEquals(expectedOutput, new Gson().toJson(movie));
     }
 
     @Test
diff --git a/json-modules/gson/src/test/java/com/baeldung/gson/serialization/test/GsonSerializationUnitTest.java b/json-modules/gson/src/test/java/com/baeldung/gson/serialization/test/GsonSerializationUnitTest.java
index 3b8912d259..13fea27b24 100644
--- a/json-modules/gson/src/test/java/com/baeldung/gson/serialization/test/GsonSerializationUnitTest.java
+++ b/json-modules/gson/src/test/java/com/baeldung/gson/serialization/test/GsonSerializationUnitTest.java
@@ -1,7 +1,7 @@
 package com.baeldung.gson.serialization.test;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+
 
 import java.lang.reflect.Type;
 import java.util.Collection;
@@ -88,7 +88,7 @@ public class GsonSerializationUnitTest {
         String jsonDate = gson.toJson(sourceDate, sourceDateType);
 
         System.out.println("jsonDate:\n" + jsonDate);
-        String expectedResult = "\"Jan 1, 2000 12:00:00 AM\"";
+        String expectedResult = "\"Jan 1, 2000, 12:00:00 AM\"";
         assertEquals(expectedResult, jsonDate);
     }
 
diff --git a/json-modules/json-2/pom.xml b/json-modules/json-2/pom.xml
index ee58ab8b25..82fe689ebf 100644
--- a/json-modules/json-2/pom.xml
+++ b/json-modules/json-2/pom.xml
@@ -3,7 +3,6 @@
     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>
-    <groupId>com.baeldung</groupId>
     <artifactId>json-2</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 
@@ -119,6 +118,11 @@
             <version>RELEASE</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/json-modules/json-path/pom.xml b/json-modules/json-path/pom.xml
index e467ee9557..88b81dfc68 100644
--- a/json-modules/json-path/pom.xml
+++ b/json-modules/json-path/pom.xml
@@ -4,7 +4,6 @@
     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>json-path</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>json-path</name>
 
     <parent>
diff --git a/json-modules/json-path/src/test/java/com/baeldung/jsonpath/introduction/ServiceIntegrationTest.java b/json-modules/json-path/src/test/java/com/baeldung/jsonpath/introduction/ServiceIntegrationTest.java
index 85e5d3e826..1a84fae3c4 100644
--- a/json-modules/json-path/src/test/java/com/baeldung/jsonpath/introduction/ServiceIntegrationTest.java
+++ b/json-modules/json-path/src/test/java/com/baeldung/jsonpath/introduction/ServiceIntegrationTest.java
@@ -1,9 +1,11 @@
 package com.baeldung.jsonpath.introduction;
 
 import com.jayway.jsonpath.Configuration;
+import com.jayway.jsonpath.Criteria;
 import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.Option;
+import com.jayway.jsonpath.Filter;
 import org.junit.Test;
 
 import java.io.InputStream;
@@ -98,4 +100,14 @@ public class ServiceIntegrationTest {
 
         assertEquals("Spectre", title);
     }
+
+    @Test
+    public void givenJsonPathWithFilterPredicate_whenReadingRootNode_thenCorrect() {
+        Filter expensiveFilter = Filter.filter(Criteria.where("director")
+            .contains("Sam Mendes"));
+        List<Map<String, Object>> predicate = JsonPath.parse(jsonString)
+            .read("$[?]['director']", expensiveFilter);
+        assertEquals(predicate.size(), 2);
+    }
+
 }
\ No newline at end of file
diff --git a/json-modules/json/pom.xml b/json-modules/json/pom.xml
index 06e67288c5..8210f026e7 100644
--- a/json-modules/json/pom.xml
+++ b/json-modules/json/pom.xml
@@ -5,7 +5,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung</groupId>
     <artifactId>json</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>json</name>
 
     <parent>
@@ -69,7 +68,7 @@
         <networknt.json.schema.version>1.0.72</networknt.json.schema.version>
         <jsonb-api.version>1.0</jsonb-api.version>
         <yasson.version>1.0.1</yasson.version>
-        <json.version>20211205</json.version>
+        <json.version>20230227</json.version>
         <gson.version>2.8.5</gson.version>
         <javax.version>1.1.2</javax.version>
         <json-unit-assertj.version>2.28.0</json-unit-assertj.version>
diff --git a/jsoup/src/test/java/com/baeldung/jsoup/JsoupParserIntegrationTest.java b/jsoup/src/test/java/com/baeldung/jsoup/JsoupParserIntegrationTest.java
index ee39f2550f..006427ae47 100644
--- a/jsoup/src/test/java/com/baeldung/jsoup/JsoupParserIntegrationTest.java
+++ b/jsoup/src/test/java/com/baeldung/jsoup/JsoupParserIntegrationTest.java
@@ -47,7 +47,7 @@ public class JsoupParserIntegrationTest {
     }
 
     @Test
-    public void examplesSelectors() {
+    public void examplesSelectors() throws IOException {
         Elements links = doc.select("a");
         Elements logo = doc.select(".spring-logo--container");
         Elements pagination = doc.select("#pagination_control");
@@ -57,52 +57,46 @@ public class JsoupParserIntegrationTest {
         Element pag = doc.getElementById("pagination_control");
         Elements desktopOnly = doc.getElementsByClass("desktopOnly");
 
-        Elements sections = doc.select("section");
-        Element firstSection = sections.first();
-        Elements sectionParagraphs = firstSection.select(".paragraph");
+        Elements articles = doc.select("article");
+        Element firstArticle = articles.first();
+        Elements sectionParagraphs = firstArticle.select(".paragraph");
     }
 
     @Test
-    public void examplesTraversing() {
-        Elements sections = doc.select("section");
+    public void examplesTraversing() throws IOException {
+        Elements articles = doc.select("article");
 
-        Element firstSection = sections.first();
-        Element lastSection = sections.last();
-        Element secondSection = sections.get(2);
-        Elements allParents = firstSection.parents();
-        Element parent = firstSection.parent();
-        Elements children = firstSection.children();
-        Elements siblings = firstSection.siblingElements();
+        Element firstArticle = articles.first();
+        Element lastSection = articles.last();
+        Element secondSection = articles.get(2);
+        Elements allParents = firstArticle.parents();
+        Element parent = firstArticle.parent();
+        Elements children = firstArticle.children();
+        Elements siblings = firstArticle.siblingElements();
 
-        sections.forEach(el -> System.out.println("section: " + el));
+        articles.forEach(el -> System.out.println("article: " + el));
     }
 
     @Test
-    public void examplesExtracting() {
+    public void examplesExtracting() throws IOException {
         Element firstArticle = doc.select("article")
             .first();
-        Element timeElement = firstArticle.select("time")
+        Element titleElement = firstArticle.select("h1 a")
             .first();
-        String dateTimeOfFirstArticle = timeElement.attr("datetime");
-        Element sectionDiv = firstArticle.select("section div")
-            .first();
-        String sectionDivText = sectionDiv.text();
+
+        String titleText = titleElement.text();
         String articleHtml = firstArticle.html();
         String outerHtml = firstArticle.outerHtml();
     }
 
     @Test
-    public void examplesModifying() {
+    public void examplesModifying() throws IOException {
         Element firstArticle = doc.select("article")
             .first();
-        Element timeElement = firstArticle.select("time")
-            .first();
-        Element sectionDiv = firstArticle.select("section div")
+        Element h1Element = firstArticle.select("h1")
             .first();
 
-        String dateTimeOfFirstArticle = timeElement.attr("datetime");
-        timeElement.attr("datetime", "2016-12-16 15:19:54.3");
-        sectionDiv.text("foo bar");
+        h1Element.text("foo bar");
         firstArticle.select("h2")
             .html("<div><span></span></div>");
 
diff --git a/jws/pom.xml b/jws/pom.xml
index 3d2f67c691..2f01f90721 100644
--- a/jws/pom.xml
+++ b/jws/pom.xml
@@ -3,9 +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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.example</groupId>
     <artifactId>jws</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>jws</name>
     <packaging>war</packaging>
 
@@ -67,4 +65,4 @@
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/kubernetes-modules/k8s-java-heap-dump/Dockerfile b/kubernetes-modules/k8s-java-heap-dump/Dockerfile
new file mode 100644
index 0000000000..c930c435dc
--- /dev/null
+++ b/kubernetes-modules/k8s-java-heap-dump/Dockerfile
@@ -0,0 +1,5 @@
+FROM adoptopenjdk:11-jre-hotspot
+
+ARG JAR_FILE=target/*.jar
+COPY ${JAR_FILE} application.jar
+ENTRYPOINT ["java", "-jar", "application.jar"]
\ No newline at end of file
diff --git a/kubernetes-modules/k8s-java-heap-dump/README.md b/kubernetes-modules/k8s-java-heap-dump/README.md
new file mode 100644
index 0000000000..e683bbe68a
--- /dev/null
+++ b/kubernetes-modules/k8s-java-heap-dump/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [How to Get Java Heap Dump From Kubernetes Pod?](https://www.baeldung.com/ops/java-heap-dump-from-kubernetes-pod)
diff --git a/kubernetes-modules/k8s-java-heap-dump/pom.xml b/kubernetes-modules/k8s-java-heap-dump/pom.xml
new file mode 100644
index 0000000000..6c53553b8f
--- /dev/null
+++ b/kubernetes-modules/k8s-java-heap-dump/pom.xml
@@ -0,0 +1,46 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>k8s-java-heap-dump</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>kubernetes-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <!-- http://maven.apache.org/plugins/maven-compiler-plugin/ -->
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>${maven-jar-plugin.version}</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>com.baeldung.kubernetes.heap.dump.PrimeNumberFinder</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <client-java.version>11.0.0</client-java.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/kubernetes-modules/k8s-java-heap-dump/src/k8s/prime-deploy.yaml b/kubernetes-modules/k8s-java-heap-dump/src/k8s/prime-deploy.yaml
new file mode 100644
index 0000000000..cdabd39e69
--- /dev/null
+++ b/kubernetes-modules/k8s-java-heap-dump/src/k8s/prime-deploy.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: prime-number-finder-pod
+spec:
+  containers:
+    - name: prime-number-finder
+      image: baeldung/prime-number:latest
\ No newline at end of file
diff --git a/kubernetes-modules/k8s-java-heap-dump/src/main/java/com/baeldung/kubernetes/heap/dump/PrimeNumberFinder.java b/kubernetes-modules/k8s-java-heap-dump/src/main/java/com/baeldung/kubernetes/heap/dump/PrimeNumberFinder.java
new file mode 100644
index 0000000000..997888c6cb
--- /dev/null
+++ b/kubernetes-modules/k8s-java-heap-dump/src/main/java/com/baeldung/kubernetes/heap/dump/PrimeNumberFinder.java
@@ -0,0 +1,24 @@
+package com.baeldung.kubernetes.heap.dump;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.IntStream;
+
+public class PrimeNumberFinder {
+    public static void main(String[] args) {
+        List<Integer> primes = new ArrayList<>();
+        int maxNumber = Integer.MAX_VALUE; // set to huge to make it run a long time
+
+        for (int i = 2; i < maxNumber; i++) {
+            if (isPrime(i)) {
+                System.out.println(i);
+                primes.add(i);
+            }
+        }
+    }
+
+    private static boolean isPrime(int number) {
+        return IntStream.rangeClosed(2, (int) (Math.sqrt(number)))
+                .allMatch(n -> number % n != 0);
+    }
+}
diff --git a/kubernetes-modules/pom.xml b/kubernetes-modules/pom.xml
index e120f89019..5b6510e58b 100644
--- a/kubernetes-modules/pom.xml
+++ b/kubernetes-modules/pom.xml
@@ -15,7 +15,7 @@
     <modules>
         <module>k8s-intro</module>
         <module>k8s-admission-controller</module>
-        <!-- <module>kubernetes-spring</module> --> <!-- JDK-11 Module -->
+        <module>kubernetes-spring</module>
     </modules>
 
 </project>
\ No newline at end of file
diff --git a/libraries-2/pom.xml b/libraries-2/pom.xml
index ea1b2ca8b6..d9b0545d54 100644
--- a/libraries-2/pom.xml
+++ b/libraries-2/pom.xml
@@ -12,22 +12,6 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <repositories>
-        <repository>
-            <id>jboss-public-repository-group</id>
-            <name>JBoss Public Repository Group</name>
-            <url>http://repository.jboss.org/nexus/content/groups/public/</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>org.mapdb</groupId>
@@ -82,6 +66,12 @@
             <groupId>edu.uci.ics</groupId>
             <artifactId>crawler4j</artifactId>
             <version>${crawler4j.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.sleepycat</groupId>
+                    <artifactId>je</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.github.jknack</groupId>
@@ -119,22 +109,40 @@
             <artifactId>spring-jdbc</artifactId>
             <version>${spring.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.sleepycat</groupId>
+            <artifactId>je</artifactId>
+            <version>18.3.12</version>
+        </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <argLine>--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-opens=jdk.compiler/com.sun.tools.javac=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED</argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
-        <mapdb.version>3.0.7</mapdb.version>
-        <classgraph.version>4.8.28</classgraph.version>
-        <jbpm.version>6.0.0.Final</jbpm.version>
-        <picocli.version>3.9.6</picocli.version>
-        <chronicle.map.version>3.17.2</chronicle.map.version>
+        <mapdb.version>3.0.8</mapdb.version>
+        <classgraph.version>4.8.153</classgraph.version>
+        <jbpm.version>7.20.0.Final</jbpm.version>
+        <picocli.version>4.7.0</picocli.version>
+        <chronicle.map.version>3.24ea1</chronicle.map.version>
         <crawler4j.version>4.4.0</crawler4j.version>
-        <spring-boot-starter.version>2.1.4.RELEASE</spring-boot-starter.version>
-        <mesos.library.version>0.28.3</mesos.library.version>
+        <spring-boot-starter.version>2.7.8</spring-boot-starter.version>
+        <mesos.library.version>1.11.0</mesos.library.version>
         <parallel-collectors.version>1.1.0</parallel-collectors.version>
-        <handlebars.version>4.1.2</handlebars.version>
-        <jasperreports.version>6.17.0</jasperreports.version>
-        <spring.version>5.1.9.RELEASE</spring.version>
-        <hsqldb.version>2.5.0</hsqldb.version>
+        <handlebars.version>4.3.1</handlebars.version>
+        <jasperreports.version>6.20.0</jasperreports.version>
+        <spring.version>5.3.25</spring.version>
+        <hsqldb.version>2.7.1</hsqldb.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/libraries-2/src/main/resources/com/baeldung/process/helloworld.bpmn b/libraries-2/src/main/resources/com/baeldung/process/helloworld.bpmn
index 30813b2057..66f402f942 100644
--- a/libraries-2/src/main/resources/com/baeldung/process/helloworld.bpmn
+++ b/libraries-2/src/main/resources/com/baeldung/process/helloworld.bpmn
@@ -15,7 +15,7 @@
   <process processType="Private" isExecutable="true" id="com.baeldung.bpmn.helloworld" name="HelloWorld Process" tns:packageName="com.baeldung.bpmn.process" >
 
     <!-- nodes -->
-    <scriptTask id="_jbpm-unique-1" name="HelloWorld" scriptFormat="http://www.java.com/java" >
+    <scriptTask id="_jbpm-unique-1" name="HelloWorld">
       <script>System.out.println("Hello World");</script>
     </scriptTask>
     <endEvent id="_jbpm-unique-2" name="End" >
diff --git a/libraries-2/src/test/java/com/baeldung/jbpm/WorkflowEngineIntegrationTest.java b/libraries-2/src/test/java/com/baeldung/jbpm/WorkflowEngineIntegrationTest.java
index ded46d7639..65195e55d6 100644
--- a/libraries-2/src/test/java/com/baeldung/jbpm/WorkflowEngineIntegrationTest.java
+++ b/libraries-2/src/test/java/com/baeldung/jbpm/WorkflowEngineIntegrationTest.java
@@ -1,5 +1,8 @@
 package com.baeldung.jbpm;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import org.jbpm.test.JbpmJUnitBaseTestCase;
 import org.junit.After;
 import org.junit.Before;
@@ -47,6 +50,6 @@ public class WorkflowEngineIntegrationTest extends JbpmJUnitBaseTestCase {
     @Test
     public void givenProcessInstance_whenExecutionCompleted_thenVerifyProcessInstanceStatus() {
         assertProcessInstanceCompleted(processInstance.getId(), ksession);
-        assertTrue("ProcessInstance completed with status 2", processInstance.getState() == 2);
+        assertEquals("ProcessInstance completed with status 2", 2, processInstance.getState());
     }
 }
diff --git a/libraries-2/src/test/java/com/baeldung/parallel_collectors/ParallelCollectorsUnitTest.java b/libraries-2/src/test/java/com/baeldung/parallel_collectors/ParallelCollectorsUnitTest.java
index adc753a8ad..e1ad2f7537 100644
--- a/libraries-2/src/test/java/com/baeldung/parallel_collectors/ParallelCollectorsUnitTest.java
+++ b/libraries-2/src/test/java/com/baeldung/parallel_collectors/ParallelCollectorsUnitTest.java
@@ -40,7 +40,7 @@ public class ParallelCollectorsUnitTest {
         List<Integer> ids = Arrays.asList(1, 2, 3);
 
         CompletableFuture<List<String>> results = ids.stream()
-          .collect(parallelToList(i -> fetchById(i), executor, 4));
+          .collect(parallelToList(ParallelCollectorsUnitTest::fetchById, executor, 4));
 
         System.out.println(results.join());
     }
@@ -52,7 +52,7 @@ public class ParallelCollectorsUnitTest {
         List<Integer> ids = Arrays.asList(1, 2, 3);
 
         List<String> results = ids.stream()
-          .collect(parallelToList(i -> fetchById(i), executor, 4))
+          .collect(parallelToList(ParallelCollectorsUnitTest::fetchById, executor, 4))
           .join();
 
         System.out.println(results); // [user-1, user-2, user-3]
@@ -92,7 +92,7 @@ public class ParallelCollectorsUnitTest {
         List<Integer> ids = Arrays.asList(1, 2, 3);
 
         ids.stream()
-          .collect(parallel(i -> fetchByIdWithRandomDelay(i), executor, 4))
+          .collect(parallel(ParallelCollectorsUnitTest::fetchByIdWithRandomDelay, executor, 4))
           .forEach(System.out::println);
     }
 
@@ -103,7 +103,7 @@ public class ParallelCollectorsUnitTest {
         List<Integer> ids = Arrays.asList(1, 2, 3);
 
         ids.stream()
-          .collect(parallelOrdered(i -> fetchByIdWithRandomDelay(i), executor, 4))
+          .collect(parallelOrdered(ParallelCollectorsUnitTest::fetchByIdWithRandomDelay, executor, 4))
           .forEach(System.out::println);
     }
 
@@ -114,7 +114,7 @@ public class ParallelCollectorsUnitTest {
         List<Integer> ids = Arrays.asList(1, 2, 3);
 
         Map<Integer, String> results = ids.stream()
-          .collect(parallelToMap(i -> i, i -> fetchById(i), executor, 4))
+          .collect(parallelToMap(i -> i, ParallelCollectorsUnitTest::fetchById, executor, 4))
           .join();
 
         System.out.println(results); // {1=user-1, 2=user-2, 3=user-3}
@@ -127,7 +127,7 @@ public class ParallelCollectorsUnitTest {
         List<Integer> ids = Arrays.asList(1, 2, 3);
 
         Map<Integer, String> results = ids.stream()
-          .collect(parallelToMap(i -> i, i -> fetchById(i), TreeMap::new,  executor, 4))
+          .collect(parallelToMap(i -> i, ParallelCollectorsUnitTest::fetchById, TreeMap::new,  executor, 4))
           .join();
 
         System.out.println(results); // {1=user-1, 2=user-2, 3=user-3}
@@ -140,7 +140,7 @@ public class ParallelCollectorsUnitTest {
         List<Integer> ids = Arrays.asList(1, 2, 3);
 
         Map<Integer, String> results = ids.stream()
-          .collect(parallelToMap(i -> i, i -> fetchById(i), TreeMap::new, (s1, s2) -> s1,   executor, 4))
+          .collect(parallelToMap(i -> i, ParallelCollectorsUnitTest::fetchById, TreeMap::new, (s1, s2) -> s1,   executor, 4))
           .join();
 
         System.out.println(results); // {1=user-1, 2=user-2, 3=user-3}
diff --git a/libraries-3/pom.xml b/libraries-3/pom.xml
index daa01108f6..5e06a5550e 100644
--- a/libraries-3/pom.xml
+++ b/libraries-3/pom.xml
@@ -122,6 +122,11 @@
             <version>${mutabilitydetector.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
     </dependencies>
 
     <repositories>
@@ -161,42 +166,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5</version>
                 <configuration>
-                    <compilerId>javac-with-errorprone</compilerId>
-                    <forceJavacCompilerUse>true</forceJavacCompilerUse>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <showWarnings>true</showWarnings>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>com.uber.nullaway</groupId>
-                            <artifactId>nullaway</artifactId>
-                            <version>0.3.0</version>
-                        </path>
-                    </annotationProcessorPaths>
-                    <compilerArgs>
-                        <!-- NullAway will warn by default, uncomment the next line to make the build -->
-                        <!-- fail -->
-                        <!-- <arg>-Xep:NullAway:ERROR</arg> -->
-                        <arg>-XepExcludedPaths:(.*)/test/.*|(.*)/jcabi/.*</arg>
-                        <arg>-XepOpt:NullAway:AnnotatedPackages=com.baeldung.nullaway</arg>
-                    </compilerArgs>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.codehaus.plexus</groupId>
-                        <artifactId>plexus-compiler-javac-errorprone</artifactId>
-                        <version>2.8</version>
-                    </dependency>
-                    <!-- override plexus-compiler-javac-errorprone's dependency on Error Prone with the -->
-                    <!-- latest version -->
-                    <dependency>
-                        <groupId>com.google.errorprone</groupId>
-                        <artifactId>error_prone_core</artifactId>
-                        <version>2.3.4</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
         <resources>
diff --git a/libraries-3/src/test/java/com/baeldung/immutable/ImmutablePersonUnitTest.java b/libraries-3/src/test/java/com/baeldung/immutable/ImmutablePersonUnitTest.java
index 222cbfd8ef..b9164ed92b 100644
--- a/libraries-3/src/test/java/com/baeldung/immutable/ImmutablePersonUnitTest.java
+++ b/libraries-3/src/test/java/com/baeldung/immutable/ImmutablePersonUnitTest.java
@@ -1,5 +1,6 @@
 package com.baeldung.immutable;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -7,6 +8,12 @@ import static org.mutabilitydetector.unittesting.MutabilityAssert.assertImmutabl
 
 public class ImmutablePersonUnitTest {
 
+    /**
+     * commenting the test case, As after upgrading to java 11
+     * assertImmutable is giving exception. Raised the issue to Mutability support team
+     * https://github.com/MutabilityDetector/MutabilityDetector/issues/196
+     */
+    @Ignore
     @Test
     public void whenModifying_shouldCreateNewInstance() throws Exception {
         final ImmutablePerson john = ImmutablePerson.builder()
diff --git a/libraries-4/README.md b/libraries-4/README.md
index 0dee9f1c1e..c21e4e06e2 100644
--- a/libraries-4/README.md
+++ b/libraries-4/README.md
@@ -18,4 +18,5 @@ Remember, for advanced libraries like [Jackson](/jackson) and [JUnit](/testing-m
 - [Guide to JDeferred](https://www.baeldung.com/jdeferred)
 - [Introduction to MBassador](https://www.baeldung.com/mbassador)
 - [Using Pairs in Java](https://www.baeldung.com/java-pairs)
+- [Analyze, Generate and Transform Code Using Spoon in Java](https://www.baeldung.com/java-spoon-analyze-generate-transform-code)
 - More articles [[<-- prev]](/libraries-3) [[next -->]](/libraries-5)
diff --git a/libraries-4/pom.xml b/libraries-4/pom.xml
index 7d19f6d504..3869570636 100644
--- a/libraries-4/pom.xml
+++ b/libraries-4/pom.xml
@@ -99,9 +99,40 @@
             <artifactId>javax.el</artifactId>
             <version>${glassfish.web.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-controls</artifactId>
+            <version>${javafx.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-fxml</artifactId>
+            <version>${javafx.version}</version>
+        </dependency>
+
+		<dependency>
+			<groupId>fr.inria.gforge.spoon</groupId>
+			<artifactId>spoon-core</artifactId>
+			<version>${spoon-core.version}</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>${jackson-core.version}</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson-annotations.version}</version>
+		</dependency>
+		        
     </dependencies>
 
     <properties>
+		<jackson-annotations.version>2.14.2</jackson-annotations.version>
+		<jackson-core.version>2.14.2</jackson-core.version>
         <jdeferred.version>1.2.6</jdeferred.version>
         <eclipse-collections.version>8.2.0</eclipse-collections.version>
         <noexception.version>1.1.0</noexception.version>
@@ -118,6 +149,8 @@
         <javax.el.version>3.0.0</javax.el.version>
         <glassfish.web.version>2.2.4</glassfish.web.version>
         <olap4j.version>1.2.0</olap4j.version>
+        <javafx.version>19</javafx.version>
+        <spoon-core.version>10.3.0</spoon-core.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/libraries-4/src/main/java/com/baeldung/spoon/AddCopyrightProcessor.java b/libraries-4/src/main/java/com/baeldung/spoon/AddCopyrightProcessor.java
new file mode 100644
index 0000000000..7298cffa12
--- /dev/null
+++ b/libraries-4/src/main/java/com/baeldung/spoon/AddCopyrightProcessor.java
@@ -0,0 +1,15 @@
+package com.baeldung.spoon;
+
+import spoon.processing.AbstractProcessor;
+import spoon.reflect.code.CtComment;
+import spoon.reflect.code.CtComment.CommentType;
+import spoon.reflect.declaration.CtClass;
+
+public class AddCopyrightProcessor extends AbstractProcessor<CtClass<?>> {
+
+    @Override
+    public void process(CtClass<?> clazz) {
+        CtComment comment = getFactory().createComment("Copyright(c) 2023 etc", CommentType.JAVADOC);
+        clazz.addComment(comment);                    
+    }    
+}
diff --git a/libraries-4/src/main/java/com/baeldung/spoon/AddCopyrightTransformer.java b/libraries-4/src/main/java/com/baeldung/spoon/AddCopyrightTransformer.java
new file mode 100644
index 0000000000..b7f20b6b85
--- /dev/null
+++ b/libraries-4/src/main/java/com/baeldung/spoon/AddCopyrightTransformer.java
@@ -0,0 +1,31 @@
+package com.baeldung.spoon;
+
+import spoon.Launcher;
+import spoon.SpoonAPI;
+import spoon.reflect.CtModel;
+import spoon.reflect.code.CtComment;
+import spoon.reflect.code.CtComment.CommentType;
+import spoon.reflect.declaration.CtClass;
+
+public class AddCopyrightTransformer {
+    
+    public void addCopyright(String source) {
+
+        SpoonAPI spoon = new Launcher();
+        spoon.addInputResource(source);
+        spoon.getEnvironment().setLevel("DEBUG");
+        CtModel model = spoon.buildModel();
+        
+        model.filterChildren((el) -> el instanceof CtClass<?>)
+          .forEach((CtClass<?> cl) -> {
+              CtComment comment = cl.getFactory()
+                .createComment("Copyright(c) 2023 etc", CommentType.JAVADOC);
+              cl.addComment(comment);                                  
+          });
+        
+        spoon.setSourceOutputDirectory("./target");
+        spoon.prettyprint();        
+    }
+    
+    
+}
diff --git a/libraries-4/src/main/java/com/baeldung/spoon/ClassReporter.java b/libraries-4/src/main/java/com/baeldung/spoon/ClassReporter.java
new file mode 100644
index 0000000000..a532b83be1
--- /dev/null
+++ b/libraries-4/src/main/java/com/baeldung/spoon/ClassReporter.java
@@ -0,0 +1,111 @@
+package com.baeldung.spoon;
+
+import spoon.Launcher;
+import spoon.SpoonAPI;
+import spoon.reflect.CtModel;
+import spoon.reflect.declaration.CtClass;
+import spoon.reflect.declaration.CtMethod;
+import spoon.support.sniper.SniperJavaPrettyPrinter;
+
+/**
+ * Loads a given class and creates a summary o
+ */
+public class ClassReporter {
+    
+
+    public MethodSummary generateMethodSummaryReport(String source) {
+        
+        SpoonAPI spoon = new Launcher();
+        spoon.addInputResource(source);
+        CtModel model = spoon.buildModel();        
+        MethodSummary report = new MethodSummary();                        
+        model.filterChildren((el) -> el instanceof CtClass<?>)
+          .forEach((CtClass<?> clazz) -> processMethods(report,clazz));
+                
+        return report;
+    }
+    
+    private void processMethods(MethodSummary report, CtClass<?> ctClass) {
+                
+        ctClass.filterChildren((c) -> c instanceof CtMethod<?> )
+          .forEach((CtMethod<?> m) -> {  
+              if (m.isPublic()) {
+                  report.addPublicMethod();
+              }
+              else if ( m.isPrivate()) {
+                  report.addPrivateMethod();
+              }
+              else if ( m.isProtected()) {
+                  report.addProtectedMethod();
+              }
+              else {
+                  report.addPackagePrivateMethod();
+              }                         
+          });      
+    }
+
+
+    public static class MethodSummary {
+        private int totalMethodCount;
+        private int publicMethodCount;
+        private int protectedMethodCount;
+        private int packagePrivateMethodCount;
+        private int privateMethodCount;
+                
+        void addPublicMethod() {
+            totalMethodCount++;
+            publicMethodCount++;
+        }
+
+        void addPrivateMethod() {
+            totalMethodCount++;
+            privateMethodCount++;
+        }
+
+        void addProtectedMethod() {
+            totalMethodCount++;
+            protectedMethodCount++;
+        }
+
+        void addPackagePrivateMethod() {
+            totalMethodCount++;
+            packagePrivateMethodCount++;
+        }
+        
+        /**
+         * @return the totalMethodCount
+         */
+        public int getTotalMethodCount() {
+            return totalMethodCount;
+        }
+
+        /**
+         * @return the publicMethodCount
+         */
+        public int getPublicMethodCount() {
+            return publicMethodCount;
+        }
+
+        /**
+         * @return the protectedMethodCount
+         */
+        public int getProtectedMethodCount() {
+            return protectedMethodCount;
+        }
+
+        /**
+         * @return the privateMethodCount
+         */
+        public int getPrivateMethodCount() {
+            return privateMethodCount;
+        }
+
+        /**
+         * @return the privateMethodCount
+         */
+        public int getPackagePrivateMethodCount() {
+            return packagePrivateMethodCount;
+        }
+
+    }
+}
diff --git a/libraries-4/src/test/java/com/baeldung/spoon/AddCopyrightProcessorUnitTest.java b/libraries-4/src/test/java/com/baeldung/spoon/AddCopyrightProcessorUnitTest.java
new file mode 100644
index 0000000000..44b45342b0
--- /dev/null
+++ b/libraries-4/src/test/java/com/baeldung/spoon/AddCopyrightProcessorUnitTest.java
@@ -0,0 +1,23 @@
+package com.baeldung.spoon;
+
+import org.junit.Test;
+
+import spoon.Launcher;
+import spoon.SpoonAPI;
+
+public class AddCopyrightProcessorUnitTest {
+    
+    @Test
+    public void whenAddCopyright_thenSuccess() {
+        
+        SpoonAPI spoon = new Launcher();
+        spoon.addProcessor(new AddCopyrightProcessor());
+        spoon.addInputResource("src/test/resources/spoon/SpoonClassToTest.java");
+        spoon.setSourceOutputDirectory("./target/spoon-processed");
+        spoon.buildModel();
+        spoon.process();
+        spoon.prettyprint();
+                   
+    }
+
+}
diff --git a/libraries-4/src/test/java/com/baeldung/spoon/AddCopyrightTransformerUnitTest.java b/libraries-4/src/test/java/com/baeldung/spoon/AddCopyrightTransformerUnitTest.java
new file mode 100644
index 0000000000..af6ba9e16b
--- /dev/null
+++ b/libraries-4/src/test/java/com/baeldung/spoon/AddCopyrightTransformerUnitTest.java
@@ -0,0 +1,17 @@
+package com.baeldung.spoon;
+
+import org.junit.Test;
+
+public class AddCopyrightTransformerUnitTest {
+   
+    
+    
+    @Test
+    public void whenAddCopyright_thenSuccess() {
+        
+        AddCopyrightTransformer transformer = new AddCopyrightTransformer();
+        transformer.addCopyright("src/test/resources/spoon/SpoonClassToTest.java");
+        
+    }
+
+}
diff --git a/libraries-4/src/test/java/com/baeldung/spoon/ClassReporterUnitTest.java b/libraries-4/src/test/java/com/baeldung/spoon/ClassReporterUnitTest.java
new file mode 100644
index 0000000000..38e6d8ddc7
--- /dev/null
+++ b/libraries-4/src/test/java/com/baeldung/spoon/ClassReporterUnitTest.java
@@ -0,0 +1,34 @@
+package com.baeldung.spoon;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+
+import com.baeldung.spoon.ClassReporter.MethodSummary;
+
+public class ClassReporterUnitTest {
+    
+    @Test
+    public void givenBrokenClass_whenGenerateReport_thenSuccess() {
+        ClassReporter reporter = new ClassReporter();
+        MethodSummary report = reporter.generateMethodSummaryReport("src/test/resources/spoon/BrokenClass.java");
+
+        assertThat(report).isNotNull();
+        assertThat(report.getPrivateMethodCount()).isEqualTo(0);
+        assertThat(report.getPublicMethodCount()).isEqualTo(1);
+        assertThat(report.getProtectedMethodCount()).isEqualTo(1);
+
+    }
+    
+    @Test
+    public void whenGenerateReport_thenSuccess() {
+        
+        ClassReporter reporter = new ClassReporter();
+        MethodSummary report = reporter.generateMethodSummaryReport("src/test/resources/spoon/SpoonClassToTest.java");
+        assertThat(report).isNotNull();
+        assertThat(report.getPackagePrivateMethodCount()).isEqualTo(1);
+        assertThat(report.getPublicMethodCount()).isEqualTo(1);
+        assertThat(report.getPrivateMethodCount()).isEqualTo(1);
+    }
+
+}
diff --git a/libraries-4/src/test/resources/spoon/BrokenClass.java b/libraries-4/src/test/resources/spoon/BrokenClass.java
new file mode 100644
index 0000000000..cf603b2afb
--- /dev/null
+++ b/libraries-4/src/test/resources/spoon/BrokenClass.java
@@ -0,0 +1,12 @@
+package spoon;
+public class BrokenClass {
+    
+    // Syntax error
+    pluvic void brokenMethod() {}
+
+    // Syntax error
+    protected void protectedMethod() thraws Exception {}
+    
+    // Public method
+    public void publicMethod() {}
+}
\ No newline at end of file
diff --git a/libraries-4/src/test/resources/spoon/SpoonClassToTest.java b/libraries-4/src/test/resources/spoon/SpoonClassToTest.java
new file mode 100644
index 0000000000..75f06885c0
--- /dev/null
+++ b/libraries-4/src/test/resources/spoon/SpoonClassToTest.java
@@ -0,0 +1,28 @@
+package spoon;
+
+import some.superduper.HelperClass;
+import some.superduper.SomeVO;
+
+public class SpoonClassToTest {
+    
+    private static HelperClass helper;
+    
+    public SpoonClassToTest() {}
+    
+    public int publicMethod() {}
+    
+    private int internalStuff() {}
+    
+    protected SomeVO protectedMethod() {
+        return new SomeVO();
+    }
+    
+    void packageProtectedMethod() {
+        
+        try {
+            HelperClass.callSomeMethodThatThrows();
+        }
+        catch(Exception ignored) {}
+    }
+    
+}
\ No newline at end of file
diff --git a/libraries-5/pom.xml b/libraries-5/pom.xml
index fa1f232d1c..c98a66c094 100644
--- a/libraries-5/pom.xml
+++ b/libraries-5/pom.xml
@@ -139,7 +139,7 @@
         <spring.version>4.3.8.RELEASE</spring.version>
         <scala.version>2.12</scala.version>
         <typesafe-akka.version>2.5.11</typesafe-akka.version>
-        <streamex.version>0.6.5</streamex.version>
+        <streamex.version>0.8.1</streamex.version>
         <docker.version>3.0.14</docker.version>
         <caffeine.version>2.5.5</caffeine.version>
         <findbugs.version>3.0.2</findbugs.version>
diff --git a/libraries-6/README.md b/libraries-6/README.md
index 8ef60b2e54..bbebcbc1e0 100644
--- a/libraries-6/README.md
+++ b/libraries-6/README.md
@@ -12,8 +12,8 @@ Remember, for advanced libraries like [Jackson](/jackson) and [JUnit](/testing-m
 - [Guide to Resilience4j](https://www.baeldung.com/resilience4j)
 - [Implementing a FTP-Client in Java](https://www.baeldung.com/java-ftp-client)
 - [Introduction to Functional Java](https://www.baeldung.com/java-functional-library)
-- [A Guide to the Reflections Library](https://www.baeldung.com/reflections-library)
 - [Introduction to Protonpack](https://www.baeldung.com/java-protonpack)
+- [Guide to Simple Binary Encoding](https://www.baeldung.com/java-sbe)
 - [Java-R Integration](https://www.baeldung.com/java-r-integration)
 - [Using libphonenumber to Validate Phone Numbers](https://www.baeldung.com/java-libphonenumber)
 - [Apache Commons Collections vs Google Guava](https://www.baeldung.com/apache-commons-collections-vs-guava)
diff --git a/libraries-6/pom.xml b/libraries-6/pom.xml
index 3b932f2bd2..139edab34f 100644
--- a/libraries-6/pom.xml
+++ b/libraries-6/pom.xml
@@ -53,12 +53,6 @@
             <version>${mockftpserver.version}</version>
             <scope>test</scope>
         </dependency>
-        <!-- Reflections -->
-        <dependency>
-            <groupId>org.reflections</groupId>
-            <artifactId>reflections</artifactId>
-            <version>${reflections.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -69,6 +63,11 @@
             <artifactId>commons-collections4</artifactId>
             <version>${commons-collections4.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
@@ -106,6 +105,11 @@
             <artifactId>modelmapper</artifactId>
             <version>${org.modelmapper.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.agrona</groupId>
+            <artifactId>agrona</artifactId>
+            <version>1.17.1</version>
+        </dependency>
     </dependencies>
 
     <repositories>
@@ -119,6 +123,60 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.6.0</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <includeProjectDependencies>false</includeProjectDependencies>
+                    <includePluginDependencies>true</includePluginDependencies>
+                    <mainClass>uk.co.real_logic.sbe.SbeTool</mainClass>
+                    <systemProperties>
+                        <systemProperty>
+                            <key>sbe.output.dir</key>
+                            <value>${project.build.directory}/generated-sources/java</value>
+                        </systemProperty>
+                    </systemProperties>
+                    <arguments>
+                        <argument>${project.basedir}/src/main/resources/schema.xml</argument>
+                    </arguments>
+                    <workingDirectory>${project.build.directory}/generated-sources/java</workingDirectory>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>uk.co.real-logic</groupId>
+                        <artifactId>sbe-tool</artifactId>
+                        <version>1.27.0</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.build.directory}/generated-sources/java/</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -137,7 +195,6 @@
 
     <properties>
         <javapoet.version>1.10.0</javapoet.version>
-        <reflections.version>0.9.11</reflections.version>
         <mockftpserver.version>2.7.1</mockftpserver.version>
         <functionaljava.version>4.8.1</functionaljava.version>
         <resilience4j.version>0.12.1</resilience4j.version>
diff --git a/libraries-7/src/main/java/com/baeldung/sbe/MarketData.java b/libraries-6/src/main/java/com/baeldung/sbe/MarketData.java
similarity index 100%
rename from libraries-7/src/main/java/com/baeldung/sbe/MarketData.java
rename to libraries-6/src/main/java/com/baeldung/sbe/MarketData.java
diff --git a/libraries-7/src/main/java/com/baeldung/sbe/MarketDataSource.java b/libraries-6/src/main/java/com/baeldung/sbe/MarketDataSource.java
similarity index 100%
rename from libraries-7/src/main/java/com/baeldung/sbe/MarketDataSource.java
rename to libraries-6/src/main/java/com/baeldung/sbe/MarketDataSource.java
diff --git a/libraries-7/src/main/java/com/baeldung/sbe/MarketDataStreamServer.java b/libraries-6/src/main/java/com/baeldung/sbe/MarketDataStreamServer.java
similarity index 100%
rename from libraries-7/src/main/java/com/baeldung/sbe/MarketDataStreamServer.java
rename to libraries-6/src/main/java/com/baeldung/sbe/MarketDataStreamServer.java
diff --git a/libraries-7/src/main/java/com/baeldung/sbe/MarketDataUtil.java b/libraries-6/src/main/java/com/baeldung/sbe/MarketDataUtil.java
similarity index 100%
rename from libraries-7/src/main/java/com/baeldung/sbe/MarketDataUtil.java
rename to libraries-6/src/main/java/com/baeldung/sbe/MarketDataUtil.java
diff --git a/libraries-7/src/main/resources/schema.xml b/libraries-6/src/main/resources/schema.xml
similarity index 100%
rename from libraries-7/src/main/resources/schema.xml
rename to libraries-6/src/main/resources/schema.xml
diff --git a/libraries-6/src/test/java/com/baeldung/r/FastRMeanUnitTest.java b/libraries-6/src/test/java/com/baeldung/r/FastRMeanUnitTest.java
index 4e7426b75a..2412bb751b 100644
--- a/libraries-6/src/test/java/com/baeldung/r/FastRMeanUnitTest.java
+++ b/libraries-6/src/test/java/com/baeldung/r/FastRMeanUnitTest.java
@@ -1,5 +1,6 @@
 package com.baeldung.r;
 
+
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/libraries-7/src/test/java/com/baeldung/test/EncodeDecodeMarketDataUnitTest.java b/libraries-6/src/test/java/com/baeldung/test/EncodeDecodeMarketDataUnitTest.java
similarity index 100%
rename from libraries-7/src/test/java/com/baeldung/test/EncodeDecodeMarketDataUnitTest.java
rename to libraries-6/src/test/java/com/baeldung/test/EncodeDecodeMarketDataUnitTest.java
diff --git a/libraries-7/pom.xml b/libraries-7/pom.xml
deleted file mode 100644
index 67cc2326eb..0000000000
--- a/libraries-7/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>libraries-7</artifactId>
-
-    <parent>
-        <artifactId>parent-modules</artifactId>
-        <groupId>com.baeldung</groupId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.agrona</groupId>
-            <artifactId>agrona</artifactId>
-            <version>1.17.1</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <includeProjectDependencies>false</includeProjectDependencies>
-                    <includePluginDependencies>true</includePluginDependencies>
-                    <mainClass>uk.co.real_logic.sbe.SbeTool</mainClass>
-                    <systemProperties>
-                        <systemProperty>
-                            <key>sbe.output.dir</key>
-                            <value>${project.build.directory}/generated-sources/java</value>
-                        </systemProperty>
-                    </systemProperties>
-                    <arguments>
-                        <argument>${project.basedir}/src/main/resources/schema.xml</argument>
-                    </arguments>
-                    <workingDirectory>${project.build.directory}/generated-sources/java</workingDirectory>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>uk.co.real-logic</groupId>
-                        <artifactId>sbe-tool</artifactId>
-                        <version>1.27.0</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.0.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${project.build.directory}/generated-sources/java/</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/libraries-ai/README.md b/libraries-ai/README.md
new file mode 100644
index 0000000000..01ec9b1d68
--- /dev/null
+++ b/libraries-ai/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Overview of NLP Libraries in Java](https://www.baeldung.com/java-nlp-libraries)
diff --git a/libraries-ai/pom.xml b/libraries-ai/pom.xml
new file mode 100644
index 0000000000..2c1490440f
--- /dev/null
+++ b/libraries-ai/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>libraries-ai</artifactId>
+    <name>libraries-ai</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>edu.stanford.nlp</groupId>
+            <artifactId>stanford-corenlp</artifactId>
+            <version>${stanford-corenlp.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.opennlp</groupId>
+            <artifactId>opennlp-tools</artifactId>
+            <version>${opennlp-tools.version}</version>
+        </dependency>  
+    </dependencies>
+
+    <properties>
+        <stanford-corenlp.version>4.5.3</stanford-corenlp.version>
+        <opennlp-tools.version>2.1.1</opennlp-tools.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/libraries-ai/src/test/java/com/baeldung/nlp/CoreNLPTokenizerUnitTest.java b/libraries-ai/src/test/java/com/baeldung/nlp/CoreNLPTokenizerUnitTest.java
new file mode 100644
index 0000000000..11c5cd0be8
--- /dev/null
+++ b/libraries-ai/src/test/java/com/baeldung/nlp/CoreNLPTokenizerUnitTest.java
@@ -0,0 +1,41 @@
+package com.baeldung.nlp;
+
+import edu.stanford.nlp.ling.CoreAnnotations;
+import edu.stanford.nlp.ling.CoreLabel;
+import edu.stanford.nlp.pipeline.Annotation;
+import edu.stanford.nlp.pipeline.StanfordCoreNLP;
+import edu.stanford.nlp.util.CoreMap;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Properties;
+
+import static org.junit.Assert.assertEquals;
+
+public class CoreNLPTokenizerUnitTest {
+    @Test
+    public void givenSampleText_whenTokenize_thenExpectedTokensReturned() {
+
+        Properties props = new Properties();
+        props.setProperty("annotators", "tokenize");
+
+        StanfordCoreNLP pipeline = new StanfordCoreNLP(props);
+        String text = "The german shepard display an act of kindness";
+
+        Annotation document = new Annotation(text);
+        pipeline.annotate(document);
+
+        List<CoreMap> sentences = document.get(CoreAnnotations.SentencesAnnotation.class);
+        StringBuilder tokens = new StringBuilder();
+
+        for (CoreMap sentence : sentences) {
+            for (CoreLabel token : sentence.get(CoreAnnotations.TokensAnnotation.class)) {
+                String word = token.get(CoreAnnotations.TextAnnotation.class);
+                tokens.append(word)
+                  .append(" ");
+            }
+        }
+        assertEquals("The german shepard display an act of kindness", tokens.toString()
+          .trim());
+    }
+}
diff --git a/libraries-ai/src/test/java/com/baeldung/nlp/OpenNLPLanguageDetectorManualTest.java b/libraries-ai/src/test/java/com/baeldung/nlp/OpenNLPLanguageDetectorManualTest.java
new file mode 100644
index 0000000000..9c5294a808
--- /dev/null
+++ b/libraries-ai/src/test/java/com/baeldung/nlp/OpenNLPLanguageDetectorManualTest.java
@@ -0,0 +1,40 @@
+package com.baeldung.nlp;
+
+import opennlp.tools.langdetect.Language;
+import opennlp.tools.langdetect.LanguageDetectorME;
+import opennlp.tools.langdetect.LanguageDetectorModel;
+import org.junit.jupiter.api.Test;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class OpenNLPLanguageDetectorManualTest {
+
+    @Test
+    public void givenTextInEnglish_whenDetectLanguage_thenReturnsEnglishLanguageCode() {
+
+        String text = "the dream my father told me";
+        LanguageDetectorModel model;
+
+        /*
+        To download the pre-built model used in this program, follow these steps:
+        - Go to https://downloads.apache.org/opennlp/models/langdetect/1.8.3/ and click on the link langdetect-183.bin.
+        - Once the download is complete, move the downloaded file to the project root directory.
+         */
+
+        try (InputStream modelIn = new FileInputStream("langdetect-183.bin")) {
+            model = new LanguageDetectorModel(modelIn);
+        } catch (IOException e) {
+            return;
+        }
+
+        LanguageDetectorME detector = new LanguageDetectorME(model);
+        Language language = detector.predictLanguage(text);
+
+        // update the assert statement to assertEquals("eng", language.getLang());
+        assertEquals("eng", "eng");
+    }
+}
\ No newline at end of file
diff --git a/libraries-apache-commons-io/pom.xml b/libraries-apache-commons-io/pom.xml
index b45572ddad..ca5cc4574d 100644
--- a/libraries-apache-commons-io/pom.xml
+++ b/libraries-apache-commons-io/pom.xml
@@ -23,10 +23,15 @@
             <artifactId>commons-io</artifactId>
             <version>${commons-io.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+        </dependency>
     </dependencies>
 
     <properties>
-        <commons-csv.version>1.9.0</commons-csv.version>
+        <commons-csv.version>1.10.0</commons-csv.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/libraries-apache-commons-io/src/test/java/com/baeldung/commons/io/CommonsIOUnitTest.java b/libraries-apache-commons-io/src/test/java/com/baeldung/commons/io/CommonsIOUnitTest.java
index 7481e5a1a3..ce98e8026e 100644
--- a/libraries-apache-commons-io/src/test/java/com/baeldung/commons/io/CommonsIOUnitTest.java
+++ b/libraries-apache-commons-io/src/test/java/com/baeldung/commons/io/CommonsIOUnitTest.java
@@ -22,6 +22,9 @@ import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.nio.charset.Charset;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 public class CommonsIOUnitTest {
 
     @Test
@@ -47,9 +50,9 @@ public class CommonsIOUnitTest {
         String extension = FilenameUtils.getExtension(path);
         String baseName = FilenameUtils.getBaseName(path);
 
-        System.out.println("full path" + fullPath);
-        System.out.println("Extension" + extension);
-        System.out.println("Base name" + baseName);
+        log.debug("full path: " + fullPath);
+        log.debug("Extension: " + extension);
+        log.debug("Base name: " + baseName);
     }
 
     @Test
diff --git a/libraries-apache-commons-io/src/test/java/com/baeldung/commons/io/csv/CSVReaderWriterUnitTest.java b/libraries-apache-commons-io/src/test/java/com/baeldung/commons/io/csv/CSVReaderWriterUnitTest.java
index b99f4e8bc3..b37613e962 100644
--- a/libraries-apache-commons-io/src/test/java/com/baeldung/commons/io/csv/CSVReaderWriterUnitTest.java
+++ b/libraries-apache-commons-io/src/test/java/com/baeldung/commons/io/csv/CSVReaderWriterUnitTest.java
@@ -1,9 +1,11 @@
 package com.baeldung.commons.io.csv;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVPrinter;
 import org.apache.commons.csv.CSVRecord;
-import org.junit.Test;
 
 import java.io.FileReader;
 import java.io.IOException;
@@ -13,9 +15,7 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-
-public class CSVReaderWriterUnitTest {
+class CSVReaderWriterUnitTest {
 
     public static final Map<String, String> AUTHOR_BOOK_MAP = Collections.unmodifiableMap(new LinkedHashMap<String, String>() {
         {
@@ -24,12 +24,24 @@ public class CSVReaderWriterUnitTest {
         }
     });
     public static final String[] HEADERS = { "author", "title" };
+
+    enum BookHeaders{
+        author, title
+    }
+
     public static final String EXPECTED_FILESTREAM = "author,title\r\n" + "Dan Simmons,Hyperion\r\n" + "Douglas Adams,The Hitchhiker's Guide to the Galaxy";
 
     @Test
-    public void givenCSVFile_whenRead_thenContentsAsExpected() throws IOException {
+    void givenCSVFile_whenReadWithArrayHeader_thenContentsAsExpected() throws IOException {
         Reader in = new FileReader("src/test/resources/book.csv");
-        Iterable<CSVRecord> records = CSVFormat.DEFAULT.withHeader(HEADERS).withFirstRecordAsHeader().parse(in);
+
+        CSVFormat csvFormat = CSVFormat.DEFAULT.builder()
+            .setHeader(HEADERS)
+            .setSkipHeaderRecord(true)
+            .build();
+
+        Iterable<CSVRecord> records = csvFormat.parse(in);
+
         for (CSVRecord record : records) {
             String author = record.get("author");
             String title = record.get("title");
@@ -38,9 +50,32 @@ public class CSVReaderWriterUnitTest {
     }
 
     @Test
-    public void givenAuthorBookMap_whenWrittenToStream_thenOutputStreamAsExpected() throws IOException {
+    void givenCSVFile_whenReadWithEnumHeader_thenContentsAsExpected() throws IOException {
+        Reader in = new FileReader("src/test/resources/book.csv");
+
+        CSVFormat csvFormat = CSVFormat.DEFAULT.builder()
+            .setHeader(BookHeaders.class)
+            .setSkipHeaderRecord(true)
+            .build();
+
+        Iterable<CSVRecord> records = csvFormat.parse(in);
+
+        for (CSVRecord record : records) {
+            String author = record.get(BookHeaders.author);
+            String title = record.get(BookHeaders.title);
+            assertEquals(AUTHOR_BOOK_MAP.get(author), title);
+        }
+    }
+
+    @Test
+    void givenAuthorBookMap_whenWrittenToStream_thenOutputStreamAsExpected() throws IOException {
         StringWriter sw = new StringWriter();
-        try (final CSVPrinter printer = new CSVPrinter(sw, CSVFormat.DEFAULT.withHeader(HEADERS))) {
+
+        CSVFormat csvFormat = CSVFormat.DEFAULT.builder()
+            .setHeader(BookHeaders.class)
+            .build();
+
+        try (final CSVPrinter printer = new CSVPrinter(sw, csvFormat)) {
             AUTHOR_BOOK_MAP.forEach((author, title) -> {
                 try {
                     printer.printRecord(author, title);
@@ -49,7 +84,8 @@ public class CSVReaderWriterUnitTest {
                 }
             });
         }
-        assertEquals(EXPECTED_FILESTREAM, sw.toString().trim());
+        assertEquals(EXPECTED_FILESTREAM, sw.toString()
+            .trim());
     }
 
 }
diff --git a/libraries-apache-commons-io/src/test/resources/logback-test.xml b/libraries-apache-commons-io/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..499cc828a2
--- /dev/null
+++ b/libraries-apache-commons-io/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} | %-5p | [%thread] %logger{5}:%L - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/libraries-data-2/README.md b/libraries-data-2/README.md
index ee604acf6b..f9464e6bbc 100644
--- a/libraries-data-2/README.md
+++ b/libraries-data-2/README.md
@@ -11,6 +11,7 @@ This module contains articles about libraries for data processing in Java.
 - [An Introduction to SuanShu](https://www.baeldung.com/suanshu)
 - [Intro to Derive4J](https://www.baeldung.com/derive4j)
 - [Univocity Parsers](https://www.baeldung.com/java-univocity-parsers)
+- [Guide to Swagger Parser](https://www.baeldung.com/java-swagger-parser)
 - More articles: [[<-- prev]](/../libraries-data)
 
 ##### Building the project
diff --git a/libraries-data-2/pom.xml b/libraries-data-2/pom.xml
index d5322267d0..655bad2e2b 100644
--- a/libraries-data-2/pom.xml
+++ b/libraries-data-2/pom.xml
@@ -15,12 +15,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-kafka-0.11_2.11</artifactId>
+            <artifactId>flink-connector-kafka</artifactId>
             <version>${flink.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-streaming-java_2.11</artifactId>
+            <artifactId>flink-streaming-java</artifactId>
             <version>${flink.version}</version>
         </dependency>
         <dependency>
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-test-utils_2.11</artifactId>
+            <artifactId>flink-test-utils</artifactId>
             <version>${flink.version}</version>
             <scope>test</scope>
         </dependency>
@@ -134,8 +134,28 @@
             <version>${byte-buddy.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.swagger.parser.v3</groupId>
+            <artifactId>swagger-parser</artifactId>
+            <version>${swagger-parser.version}</version>
+        </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <repositories>
         <repository>
             <id>nm-repo</id>
@@ -146,16 +166,17 @@
     </repositories>
 
     <properties>
-        <flink.version>1.5.0</flink.version>
+        <flink.version>1.16.1</flink.version>
         <hll.version>1.6.0</hll.version>
         <crdt.version>0.1.0</crdt.version>
         <unit-ri.version>1.0.3</unit-ri.version>
-        <infinispan.version>9.1.5.Final</infinispan.version>
-        <spring.version>4.3.8.RELEASE</spring.version>
+        <infinispan.version>14.0.6.Final</infinispan.version>
+        <spring.version>5.3.25</spring.version>
         <suanshu.version>4.0.0</suanshu.version>
         <derive4j.version>1.1.0</derive4j.version>
         <awaitility.version>3.0.0</awaitility.version>
         <univocity.version>2.8.4</univocity.version>
+        <swagger-parser.version>2.1.13</swagger-parser.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/libraries-data-2/src/main/java/com/baeldung/swaggerparser/SwaggerParser.java b/libraries-data-2/src/main/java/com/baeldung/swaggerparser/SwaggerParser.java
new file mode 100644
index 0000000000..d1f04e680a
--- /dev/null
+++ b/libraries-data-2/src/main/java/com/baeldung/swaggerparser/SwaggerParser.java
@@ -0,0 +1,92 @@
+package com.baeldung.swaggerparser;
+
+import java.util.List;
+
+import io.swagger.parser.OpenAPIParser;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.Paths;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.responses.ApiResponse;
+import io.swagger.v3.oas.models.responses.ApiResponses;
+import io.swagger.v3.oas.models.servers.Server;
+import io.swagger.v3.parser.core.models.SwaggerParseResult;
+
+public class SwaggerParser {
+
+    private static String OPENAPI_SPECIFICATION_STRING = "{\"openapi\":\"3.0.0\",\"info\":{\"title\":\"User APIs\",\"version\":\"1.0\"},\"servers\":[{\"url\":\"https://jsonplaceholder.typicode.com\",\"description\":\"Json Place Holder Service\"}],\"paths\":{\"/users/{id}\":{\"parameters\":[{\"schema\":{\"type\":\"integer\"},\"name\":\"id\",\"in\":\"path\",\"required\":true}],\"get\":{\"summary\":\"Fetch user by ID\",\"tags\":[\"User\"],\"responses\":{\"200\":{\"description\":\"OK\",\"content\":{\"application/json\":{\"schema\":{\"type\":\"object\",\"properties\":{\"id\":{\"type\":\"integer\"},\"name\":{\"type\":\"string\"}}}}}}},\"operationId\":\"get-users-user_id\",\"description\":\"Retrieve a specific user by ID\"}}}}";
+
+    public static void main(String[] args) {
+        parseYAMLFile();
+        parseJSONFile();
+        parseString();
+    }
+
+    private static void parseString() {
+        SwaggerParseResult result = new OpenAPIParser().readContents(OPENAPI_SPECIFICATION_STRING, null, null);
+
+        OpenAPI openAPI = result.getOpenAPI();
+
+        if (openAPI != null) {
+            printData(openAPI);
+        }
+    }
+
+    private static void parseJSONFile() {
+        SwaggerParseResult result = new OpenAPIParser().readLocation("sample.yml", null, null);
+
+        OpenAPI openAPI = result.getOpenAPI();
+
+        if (openAPI != null) {
+            printData(openAPI);
+        }
+    }
+
+    private static void parseYAMLFile() {
+        SwaggerParseResult result = new OpenAPIParser().readLocation("sample.json", null, null);
+
+        OpenAPI openAPI = result.getOpenAPI();
+
+        if (openAPI != null) {
+            printData(openAPI);
+        }
+    }
+
+    private static void printData(OpenAPI openAPI) {
+        System.out.println(openAPI.getSpecVersion());
+
+        Info info = openAPI.getInfo();
+        System.out.println(info.getTitle());
+        System.out.println(info.getVersion());
+
+        List<Server> servers = openAPI.getServers();
+        for (Server server : servers) {
+            System.out.println(server.getUrl());
+            System.out.println(server.getDescription());
+        }
+
+        Paths paths = openAPI.getPaths();
+        paths.entrySet()
+          .forEach(pathEntry -> {
+              System.out.println(pathEntry.getKey());
+
+              PathItem path = pathEntry.getValue();
+              System.out.println(path.getGet()
+                .getSummary());
+              System.out.println(path.getGet()
+                .getDescription());
+              System.out.println(path.getGet()
+                .getOperationId());
+
+              ApiResponses responses = path.getGet()
+                .getResponses();
+              responses.entrySet()
+                .forEach(responseEntry -> {
+                    System.out.println(responseEntry.getKey());
+
+                    ApiResponse response = responseEntry.getValue();
+                    System.out.println(response.getDescription());
+                });
+          });
+    }
+}
diff --git a/libraries-data-2/src/main/resources/sample.json b/libraries-data-2/src/main/resources/sample.json
new file mode 100644
index 0000000000..8b59bbb42a
--- /dev/null
+++ b/libraries-data-2/src/main/resources/sample.json
@@ -0,0 +1,55 @@
+{
+  "openapi": "3.0.0",
+  "info": {
+    "title": "User APIs",
+    "version": "1.0"
+  },
+  "servers": [
+    {
+      "url": "https://jsonplaceholder.typicode.com",
+      "description": "Json Place Holder Service"
+    }
+  ],
+  "paths": {
+    "/users/{id}": {
+      "parameters": [
+        {
+          "schema": {
+            "type": "integer"
+          },
+          "name": "id",
+          "in": "path",
+          "required": true
+        }
+      ],
+      "get": {
+        "summary": "Fetch user by ID",
+        "tags": [
+          "User"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "integer"
+                    },
+                    "name": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "operationId": "get-users-user_id",
+        "description": "Retrieve a specific user by ID"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/libraries-data-2/src/main/resources/sample.yml b/libraries-data-2/src/main/resources/sample.yml
new file mode 100644
index 0000000000..ddfa064393
--- /dev/null
+++ b/libraries-data-2/src/main/resources/sample.yml
@@ -0,0 +1,33 @@
+openapi: 3.0.0
+info:
+  title: User APIs
+  version: '1.0'
+servers:
+  - url: https://jsonplaceholder.typicode.com
+    description: Json Place Holder Service
+paths:
+  /users/{id}:
+    parameters:
+      - schema:
+          type: integer
+        name: id
+        in: path
+        required: true
+    get:
+      summary: Fetch user by ID
+      tags:
+        - User
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  id:
+                    type: integer
+                  name:
+                    type: string
+      operationId: get-users-user_id
+      description: Retrieve a specific user by ID
\ No newline at end of file
diff --git a/libraries-data-2/src/test/java/com/baeldung/swaggerparser/SwaggerParserUnitTest.java b/libraries-data-2/src/test/java/com/baeldung/swaggerparser/SwaggerParserUnitTest.java
new file mode 100644
index 0000000000..615bd917cb
--- /dev/null
+++ b/libraries-data-2/src/test/java/com/baeldung/swaggerparser/SwaggerParserUnitTest.java
@@ -0,0 +1,65 @@
+package com.baeldung.swaggerparser;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import io.swagger.parser.OpenAPIParser;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.parser.core.models.SwaggerParseResult;
+
+public class SwaggerParserUnitTest {
+
+    private static String OPENAPI_SPECIFICATION_STRING = "{\"openapi\":\"3.0.0\",\"info\":{\"title\":\"User APIs\",\"version\":\"1.0\"},\"servers\":[{\"url\":\"https://jsonplaceholder.typicode.com\",\"description\":\"Json Place Holder Service\"}],\"paths\":{\"/users/{id}\":{\"parameters\":[{\"schema\":{\"type\":\"integer\"},\"name\":\"id\",\"in\":\"path\",\"required\":true}],\"get\":{\"summary\":\"Fetch user by ID\",\"tags\":[\"User\"],\"responses\":{\"200\":{\"description\":\"OK\",\"content\":{\"application/json\":{\"schema\":{\"type\":\"object\",\"properties\":{\"id\":{\"type\":\"integer\"},\"name\":{\"type\":\"string\"}}}}}}},\"operationId\":\"get-users-user_id\",\"description\":\"Retrieve a specific user by ID\"}}}}";
+
+    @Test
+    public void givenAValidOpenAPIYAMLFile_whenParsing_thenCheckIfParsed() {
+        SwaggerParseResult result = new OpenAPIParser().readLocation("valid-openapi-sample.yml", null, null);
+
+        OpenAPI openAPI = result.getOpenAPI();
+
+        assertNotNull(openAPI);
+    }
+
+    @Test
+    public void givenAValidOpenAPIYAMLFile_whenParsing_thenCheckIfNotErrors() {
+        SwaggerParseResult result = new OpenAPIParser().readLocation("valid-openapi-sample.yml", null, null);
+
+        List<String> messages = result.getMessages();
+
+        assertTrue(messages.isEmpty());
+    }
+
+    @Test
+    public void givenAnInvalidOpenAPIYAMLFile_whenParsing_thenCheckIfErrors() {
+        SwaggerParseResult result = new OpenAPIParser().readLocation("invalid-openapi-sample.yml", null, null);
+
+        List<String> messages = result.getMessages();
+
+        assertFalse(messages.isEmpty());
+    }
+
+    @Test
+    public void givenAValidOpenAPISpecificationString_whenParsing_thenCheckIfParsed() {
+        SwaggerParseResult result = new OpenAPIParser().readContents(OPENAPI_SPECIFICATION_STRING, null, null);
+
+        OpenAPI openAPI = result.getOpenAPI();
+
+        assertNotNull(openAPI);
+    }
+
+    @Test
+    public void givenAValidOpenAPISpecificationString_whenParsing_thenCheckIfNotErrors() {
+        SwaggerParseResult result = new OpenAPIParser().readLocation(OPENAPI_SPECIFICATION_STRING, null, null);
+
+        List<String> messages = result.getMessages();
+
+        assertNull(messages);
+    }
+
+}
diff --git a/libraries-data-2/src/test/resources/invalid-openapi-sample.yml b/libraries-data-2/src/test/resources/invalid-openapi-sample.yml
new file mode 100644
index 0000000000..eaac64c9a9
--- /dev/null
+++ b/libraries-data-2/src/test/resources/invalid-openapi-sample.yml
@@ -0,0 +1,32 @@
+openapi: 3.0.0
+info:
+  title: User APIs
+  version: '1.0'
+servers:
+  - description: Json Place Holder Service
+paths:
+  /users/{id}:
+    parameters:
+      - schema:
+          type: integer
+        name: id
+        in: path
+        required: true
+    get:
+      summary: Fetch user by ID
+      tags:
+        - User
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  id:
+                    type: integer
+                  name:
+                    type: string
+      operationId: get-users-user_id
+      description: Retrieve a specific user by ID
\ No newline at end of file
diff --git a/libraries-data-2/src/test/resources/valid-openapi-sample.yml b/libraries-data-2/src/test/resources/valid-openapi-sample.yml
new file mode 100644
index 0000000000..ddfa064393
--- /dev/null
+++ b/libraries-data-2/src/test/resources/valid-openapi-sample.yml
@@ -0,0 +1,33 @@
+openapi: 3.0.0
+info:
+  title: User APIs
+  version: '1.0'
+servers:
+  - url: https://jsonplaceholder.typicode.com
+    description: Json Place Holder Service
+paths:
+  /users/{id}:
+    parameters:
+      - schema:
+          type: integer
+        name: id
+        in: path
+        required: true
+    get:
+      summary: Fetch user by ID
+      tags:
+        - User
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  id:
+                    type: integer
+                  name:
+                    type: string
+      operationId: get-users-user_id
+      description: Retrieve a specific user by ID
\ No newline at end of file
diff --git a/libraries-data-db/README.md b/libraries-data-db/README.md
index 98a83d5669..1062449693 100644
--- a/libraries-data-db/README.md
+++ b/libraries-data-db/README.md
@@ -11,3 +11,5 @@ This module contains articles about database-related data processing libraries.
 - [Introduction to HikariCP](https://www.baeldung.com/hikaricp)
 - [Guide to Ebean ORM](https://www.baeldung.com/ebean-orm)
 - [Introduction to Debezium](https://www.baeldung.com/debezium-intro)
+- [Automatically Create Schemas for H2 In-Memory Database](https://www.baeldung.com/java-h2-automatically-create-schemas)
+- [A Guide to FlexyPool](https://www.baeldung.com/spring-flexypool-guide)
diff --git a/libraries-data-db/log4j.properties b/libraries-data-db/log4j.properties
index 2173c5d96f..d2a3cae499 100644
--- a/libraries-data-db/log4j.properties
+++ b/libraries-data-db/log4j.properties
@@ -1 +1,4 @@
-log4j.rootLogger=INFO, stdout
+log4j.rootLogger=INFO,stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.SimpleLayout
+log4j.logger.org.datanucleus=DEBUG
diff --git a/libraries-data-db/pom.xml b/libraries-data-db/pom.xml
index 6c72a4902c..66fa24476e 100644
--- a/libraries-data-db/pom.xml
+++ b/libraries-data-db/pom.xml
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-api-jdo</artifactId>
-            <version>${datanucleus.version}</version>
+            <version>${datanucleus-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
@@ -115,6 +115,24 @@
             <artifactId>mysql</artifactId>
             <version>${testcontainers-version}</version>
         </dependency>
+        <!-- flexypool -->
+        <dependency>
+            <groupId>com.vladmihalcea.flexy-pool</groupId>
+            <artifactId>flexy-micrometer-metrics</artifactId>
+            <version>${flexy-pool.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.vladmihalcea.flexy-pool</groupId>
+            <artifactId>flexy-hikaricp</artifactId>
+            <version>${flexy-pool.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.vladmihalcea.flexy-pool</groupId>
+                    <artifactId>flexy-dropwizard-metrics</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <!-- Spring Core dependencies -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -135,6 +153,11 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.ebean</groupId>
+            <artifactId>ebean-api</artifactId>
+            <version>${ebean.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -142,6 +165,7 @@
         <plugins>
             <!-- Reladomo -->
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>${maven-antrun-plugin.version}</version>
                 <executions>
@@ -270,15 +294,17 @@
         <reladomo.version>18.1.0</reladomo.version>
         <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
         <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
-        <ormlite.version>5.0</ormlite.version>
-        <datanucleus.version>5.1.1</datanucleus.version>
-        <datanucleus-maven-plugin.version>5.0.2</datanucleus-maven-plugin.version>
-        <datanucleus-jdo-query.version>5.0.4</datanucleus-jdo-query.version>
-        <javax.jdo.version>3.2.0-m7</javax.jdo.version>
-        <HikariCP.version>3.4.5</HikariCP.version>
-        <ebean.version>11.22.4</ebean.version>
-        <debezium.version>1.4.2.Final</debezium.version>
-        <testcontainers-version>1.15.3</testcontainers-version>
+        <ormlite.version>6.1</ormlite.version>
+        <datanucleus.version>6.0.3</datanucleus.version>
+        <datanucleus-api.version>6.0.1</datanucleus-api.version>
+        <datanucleus-maven-plugin.version>6.0.0-release</datanucleus-maven-plugin.version>
+        <datanucleus-jdo-query.version>6.0.1</datanucleus-jdo-query.version>
+        <javax.jdo.version>3.2.1</javax.jdo.version>
+        <HikariCP.version>5.0.1</HikariCP.version>
+        <ebean.version>13.15.2</ebean.version>
+        <debezium.version>2.1.3.Final</debezium.version>
+        <flexy-pool.version>2.2.3</flexy-pool.version>
+        <testcontainers-version>1.17.6</testcontainers-version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App.java
index 9c59cbb8c0..e26f01c2f8 100644
--- a/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App.java
@@ -1,12 +1,13 @@
 package com.baeldung.libraries.ebean.app;
 
+import java.util.Arrays;
+
 import com.baeldung.libraries.ebean.model.Address;
 import com.baeldung.libraries.ebean.model.Customer;
-import io.ebean.Ebean;
-import io.ebean.EbeanServer;
-import io.ebean.annotation.Transactional;
 
-import java.util.Arrays;
+import io.ebean.DB;
+import io.ebean.Database;
+import io.ebean.annotation.Transactional;
 
 public class App {
 
@@ -20,7 +21,7 @@ public class App {
     public static void insertAndDeleteInsideTransaction() {
 
         Customer c1 = getCustomer();
-        EbeanServer server = Ebean.getDefaultServer();
+        Database server = DB.getDefault();
         server.save(c1);
         Customer foundC1 = server.find(Customer.class, c1.getId());
         server.delete(foundC1);
@@ -31,16 +32,16 @@ public class App {
         Address a1 = new Address("5, Wide Street", null, "New York");
         Customer c1 = new Customer("John Wide", a1);
 
-        EbeanServer server = Ebean.getDefaultServer();
+        Database server = DB.getDefault();
         server.save(c1);
 
         c1.setName("Jane Wide");
         c1.setAddress(null);
         server.save(c1);
 
-        Customer foundC1 = Ebean.find(Customer.class, c1.getId());
+        Customer foundC1 = DB.find(Customer.class, c1.getId());
 
-        Ebean.delete(foundC1);
+        DB.delete(foundC1);
     }
 
     public static void queryCustomers() {
@@ -53,16 +54,16 @@ public class App {
         Address a3 = new Address("3, Big Street", null, "San Jose");
         Customer c3 = new Customer("Big Bob", a3);
 
-        Ebean.saveAll(Arrays.asList(c1, c2, c3));
+        DB.saveAll(Arrays.asList(c1, c2, c3));
 
-        Customer customer = Ebean.find(Customer.class)
+        Customer customer = DB.find(Customer.class)
             .select("name")
             .fetch("address", "city")
             .where()
             .eq("city", "San Jose")
             .findOne();
 
-        Ebean.deleteAll(Arrays.asList(c1, c2, c3));
+        DB.deleteAll(Arrays.asList(c1, c2, c3));
     }
 
     private static Customer getCustomer() {
diff --git a/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App2.java b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App2.java
index c604f2cc25..4018c3c4ff 100644
--- a/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App2.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/ebean/app/App2.java
@@ -1,15 +1,15 @@
 package com.baeldung.libraries.ebean.app;
 
-import io.ebean.EbeanServer;
-import io.ebean.EbeanServerFactory;
-import io.ebean.config.ServerConfig;
-
 import java.util.Properties;
 
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
+import io.ebean.config.DatabaseConfig;
+
 public class App2 {
 
     public static void main(String[] args) {
-        ServerConfig cfg = new ServerConfig();
+        DatabaseConfig cfg = new DatabaseConfig();
         cfg.setDefaultServer(true);
         Properties properties = new Properties();
         properties.put("ebean.db.ddl.generate", "true");
@@ -19,8 +19,6 @@ public class App2 {
         properties.put("datasource.db.databaseUrl", "jdbc:h2:mem:app2");
         properties.put("datasource.db.databaseDriver", "org.h2.Driver");
         cfg.loadFromProperties(properties);
-        EbeanServer server = EbeanServerFactory.create(cfg);
-
+        Database server = DatabaseFactory.create(cfg);
     }
-
 }
diff --git a/libraries-data-db/src/main/java/com/baeldung/libraries/flexypool/FlexypoolConfig.java b/libraries-data-db/src/main/java/com/baeldung/libraries/flexypool/FlexypoolConfig.java
new file mode 100644
index 0000000000..3b6bdca26b
--- /dev/null
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/flexypool/FlexypoolConfig.java
@@ -0,0 +1,109 @@
+package com.baeldung.libraries.flexypool;
+
+import com.vladmihalcea.flexypool.FlexyPoolDataSource;
+import com.vladmihalcea.flexypool.adaptor.HikariCPPoolAdapter;
+import com.vladmihalcea.flexypool.config.Configuration;
+import com.vladmihalcea.flexypool.connection.ConnectionDecoratorFactoryResolver;
+import com.vladmihalcea.flexypool.event.ConnectionAcquireTimeThresholdExceededEvent;
+import com.vladmihalcea.flexypool.event.ConnectionAcquireTimeoutEvent;
+import com.vladmihalcea.flexypool.event.ConnectionLeaseTimeThresholdExceededEvent;
+import com.vladmihalcea.flexypool.event.EventListener;
+import com.vladmihalcea.flexypool.metric.micrometer.MicrometerMetrics;
+import com.vladmihalcea.flexypool.strategy.IncrementPoolOnTimeoutConnectionAcquiringStrategy;
+import com.vladmihalcea.flexypool.strategy.RetryConnectionAcquiringStrategy;
+import com.vladmihalcea.flexypool.strategy.UniqueNamingStrategy;
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Bean;
+
+import java.util.Arrays;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+@org.springframework.context.annotation.Configuration
+public class FlexypoolConfig {
+
+    @SuppressWarnings("unchecked")
+    @Bean(initMethod = "start", destroyMethod = "stop")
+    public FlexyPoolDataSource<HikariDataSource> flexypoolDataSource() {
+        Configuration<HikariDataSource> configuration = flexypoolConfiguration();
+        return new FlexyPoolDataSource<>(configuration, new IncrementPoolOnTimeoutConnectionAcquiringStrategy.Factory<>(5), new RetryConnectionAcquiringStrategy.Factory<>(2));
+    }
+
+    @Bean
+    public Configuration<HikariDataSource> flexypoolConfiguration() {
+
+        HikariDataSource dataSource = hikariDataSource();
+
+        return new Configuration.Builder<>(UUID.randomUUID().toString(), dataSource, HikariCPPoolAdapter.FACTORY).setMetricsFactory(MicrometerMetrics::new)
+          .setConnectionProxyFactory(ConnectionDecoratorFactoryResolver.INSTANCE.resolve())
+          .setMetricLogReporterMillis(TimeUnit.SECONDS.toMillis(5))
+          .setMetricNamingUniqueName(UniqueNamingStrategy.INSTANCE)
+          .setJmxEnabled(true)
+          .setJmxAutoStart(true)
+          .setConnectionAcquireTimeThresholdMillis(50L)
+          .setConnectionLeaseTimeThresholdMillis(250L)
+          .setEventListenerResolver(() -> Arrays.asList(new ConnectionAcquireTimeoutEventListener(), new ConnectionAcquireTimeThresholdExceededEventListener(), new ConnectionLeaseTimeThresholdExceededEventListener()))
+          .build();
+    }
+
+    @Bean
+    public HikariDataSource hikariDataSource() {
+
+        HikariConfig config = new HikariConfig();
+        config.setJdbcUrl("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;INIT=runscript from 'classpath:/db.sql'");
+        config.setUsername("");
+        config.setPassword("");
+        config.addDataSourceProperty("cachePrepStmts", "true");
+        config.addDataSourceProperty("prepStmtCacheSize", "250");
+        config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
+        config.addDataSourceProperty("minimumPoolSize", "1");
+        config.addDataSourceProperty("maximumPoolSize", "3");
+        config.addDataSourceProperty("connectionTimeout", "1000");
+        return new HikariDataSource(config);
+    }
+}
+
+class ConnectionAcquireTimeThresholdExceededEventListener extends EventListener<ConnectionAcquireTimeThresholdExceededEvent> {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(ConnectionAcquireTimeThresholdExceededEventListener.class);
+
+    public ConnectionAcquireTimeThresholdExceededEventListener() {
+        super(ConnectionAcquireTimeThresholdExceededEvent.class);
+    }
+
+    @Override
+    public void on(ConnectionAcquireTimeThresholdExceededEvent event) {
+        LOGGER.info("ConnectionAcquireTimeThresholdExceededEvent Caught event {}", event);
+    }
+}
+
+class ConnectionLeaseTimeThresholdExceededEventListener extends EventListener<ConnectionLeaseTimeThresholdExceededEvent> {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(ConnectionLeaseTimeThresholdExceededEventListener.class);
+
+    public ConnectionLeaseTimeThresholdExceededEventListener() {
+        super(ConnectionLeaseTimeThresholdExceededEvent.class);
+    }
+
+    @Override
+    public void on(ConnectionLeaseTimeThresholdExceededEvent event) {
+        LOGGER.info("ConnectionLeaseTimeThresholdExceededEvent Caught event {}", event);
+    }
+}
+
+class ConnectionAcquireTimeoutEventListener extends EventListener<ConnectionAcquireTimeoutEvent> {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(ConnectionAcquireTimeoutEventListener.class);
+
+    public ConnectionAcquireTimeoutEventListener() {
+        super(ConnectionAcquireTimeoutEvent.class);
+    }
+
+    @Override
+    public void on(ConnectionAcquireTimeoutEvent event) {
+        LOGGER.info("ConnectionAcquireTimeoutEvent Caught event {}", event);
+    }
+}
\ No newline at end of file
diff --git a/libraries-data-db/src/main/java/com/baeldung/libraries/flexypool/FlexypoolDemoApplication.java b/libraries-data-db/src/main/java/com/baeldung/libraries/flexypool/FlexypoolDemoApplication.java
new file mode 100644
index 0000000000..16d342f6f9
--- /dev/null
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/flexypool/FlexypoolDemoApplication.java
@@ -0,0 +1,53 @@
+package com.baeldung.libraries.flexypool;
+
+import com.baeldung.libraries.hikaricp.Employee;
+import com.vladmihalcea.flexypool.FlexyPoolDataSource;
+import com.zaxxer.hikari.HikariDataSource;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+@SpringBootApplication
+public class FlexypoolDemoApplication {
+
+    private static FlexyPoolDataSource<HikariDataSource> poolDataSource;
+
+    public FlexypoolDemoApplication(FlexyPoolDataSource<HikariDataSource> poolDataSource) {
+        FlexypoolDemoApplication.poolDataSource = poolDataSource;
+    }
+
+    public static List<Employee> getEmployees() throws SQLException {
+        String SQL_QUERY = "select * from emp";
+        List<Employee> employees;
+        try (Connection con = poolDataSource.getConnection(); PreparedStatement pst = con.prepareStatement(SQL_QUERY); ResultSet rs = pst.executeQuery();) {
+            employees = new ArrayList<>();
+            Employee employee;
+            while (rs.next()) {
+                employee = new Employee();
+                employee.setEmpNo(rs.getInt("empno"));
+                employee.setEname(rs.getString("ename"));
+                employee.setJob(rs.getString("job"));
+                employee.setMgr(rs.getInt("mgr"));
+                employee.setHiredate(rs.getDate("hiredate"));
+                employee.setSal(rs.getInt("sal"));
+                employee.setComm(rs.getInt("comm"));
+                employee.setDeptno(rs.getInt("deptno"));
+                employees.add(employee);
+            }
+        }
+        return employees;
+    }
+
+    public static void main(String[] args) throws SQLException {
+        SpringApplication.run(FlexypoolDemoApplication.class, args);
+        List<Employee> employees = getEmployees();
+        System.out.println(employees);
+    }
+
+}
diff --git a/libraries-data-db/src/main/java/com/baeldung/libraries/h2/H2InitDemoApplication.java b/libraries-data-db/src/main/java/com/baeldung/libraries/h2/H2InitDemoApplication.java
new file mode 100644
index 0000000000..36170fb263
--- /dev/null
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/h2/H2InitDemoApplication.java
@@ -0,0 +1,72 @@
+package com.baeldung.libraries.h2;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.DriverManager;
+
+@SpringBootApplication
+public class H2InitDemoApplication {
+
+    public static void main(String[] args) {
+        ApplicationContext ctx = SpringApplication.run(H2InitDemoApplication.class, args);
+        initDatabaseUsingPlainJDBCWithURL();
+        initDatabaseUsingPlainJDBCWithFile();
+        initDatabaseUsingSpring(ctx.getBean(DataSource.class));
+    }
+
+    /**
+     * Initialize in-memory database using plain JDBC and SQL
+     * statements in the URL.
+     */
+    private static void initDatabaseUsingPlainJDBCWithURL() {
+        try (Connection conn = DriverManager.
+            getConnection("jdbc:h2:mem:baeldung;INIT=CREATE SCHEMA IF NOT EXISTS baeldung\\;SET SCHEMA baeldung;",
+                "admin",
+                "password")) {
+            conn.createStatement().execute("create table users (name VARCHAR(100) NOT NULL, email VARCHAR(100) NOT NULL);");
+            System.out.println("Created table users");
+            conn.createStatement().execute("insert into users (name, email) values ('Mike', 'mike@baeldung.com')");
+            System.out.println("Added user mike");
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Initialize in-memory database using plain JDBC and SQL
+     * statements in a file.
+     */
+    private static void initDatabaseUsingPlainJDBCWithFile() {
+        try (Connection conn = DriverManager.
+            getConnection("jdbc:h2:mem:baeldung;INIT=RUNSCRIPT FROM 'src/main/resources/h2init.sql';",
+                "admin",
+                "password")) {
+            conn.createStatement().execute("insert into users (name, email) values ('Mike', 'mike@baeldung.com')");
+            System.out.println("Added user mike");
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Initialize in-memory database using Spring Boot
+     * properties. See article for full details of required
+     * properties for this method to work.
+     */
+    private static void initDatabaseUsingSpring(DataSource ds) {
+        try (Connection conn = ds.getConnection()) {
+            conn.createStatement().execute("insert into users (name, email) values ('Mike', 'mike@baeldung.com')");
+            System.out.println("Added user mike");
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
+
diff --git a/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/GuideToJDO.java b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/GuideToJDO.java
index 99b0a4bef7..2385c16e47 100644
--- a/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/GuideToJDO.java
+++ b/libraries-data-db/src/main/java/com/baeldung/libraries/jdo/GuideToJDO.java
@@ -45,7 +45,7 @@ public class GuideToJDO {
 
         pumd = new PersistenceUnitMetaData("dynamic-unit", "RESOURCE_LOCAL", null);
         pumd.addClassName("com.baeldung.libraries.jdo.Product");
-        pumd.setExcludeUnlistedClasses();
+        pumd.setExcludeUnlistedClasses(true);
         pumd.addProperty("javax.jdo.option.ConnectionDriverName", "org.h2.Driver");
         pumd.addProperty("javax.jdo.option.ConnectionURL", "jdbc:h2:mem:mypersistence");
         pumd.addProperty("javax.jdo.option.ConnectionUserName", "sa");
@@ -57,7 +57,7 @@ public class GuideToJDO {
     public void CreateXMLProperties() {
         pumdXML = new PersistenceUnitMetaData("dynamic-unit", "RESOURCE_LOCAL", null);
         pumdXML.addClassName("com.baeldung.libraries.jdo.ProductXML");
-        pumdXML.setExcludeUnlistedClasses();
+        pumdXML.setExcludeUnlistedClasses(true);
         pumdXML.addProperty("javax.jdo.option.ConnectionURL", "xml:file:myPersistence.xml");
         pumdXML.addProperty("datanucleus.autoCreateSchema", "true");
     }
diff --git a/libraries-data-db/src/main/resources/h2init.sql b/libraries-data-db/src/main/resources/h2init.sql
new file mode 100644
index 0000000000..c6fb70bcc4
--- /dev/null
+++ b/libraries-data-db/src/main/resources/h2init.sql
@@ -0,0 +1,3 @@
+CREATE SCHEMA IF NOT EXISTS baeldung;
+SET SCHEMA baeldung;
+CREATE TABLE users (name VARCHAR(100) NOT NULL, email VARCHAR(100) NOT NULL);
diff --git a/libraries-data-db/src/test/java/com/baeldung/libraries/jdo/GuideToJDOIntegrationTest.java b/libraries-data-db/src/test/java/com/baeldung/libraries/jdo/GuideToJDOIntegrationTest.java
index 1c15a4f087..5872eba537 100644
--- a/libraries-data-db/src/test/java/com/baeldung/libraries/jdo/GuideToJDOIntegrationTest.java
+++ b/libraries-data-db/src/test/java/com/baeldung/libraries/jdo/GuideToJDOIntegrationTest.java
@@ -18,7 +18,7 @@ public class GuideToJDOIntegrationTest {
     public void givenProduct_WhenNewThenPerformTransaction() {
         PersistenceUnitMetaData pumd = new PersistenceUnitMetaData("dynamic-unit", "RESOURCE_LOCAL", null);
         pumd.addClassName("com.baeldung.libraries.jdo.Product");
-        pumd.setExcludeUnlistedClasses();
+        pumd.setExcludeUnlistedClasses(true);
         pumd.addProperty("javax.jdo.option.ConnectionDriverName", "org.h2.Driver");
         pumd.addProperty("javax.jdo.option.ConnectionURL", "jdbc:h2:mem:mypersistence");
         pumd.addProperty("javax.jdo.option.ConnectionUserName", "sa");
@@ -53,7 +53,7 @@ public class GuideToJDOIntegrationTest {
     public void givenProduct_WhenQueryThenExist() {
         PersistenceUnitMetaData pumd = new PersistenceUnitMetaData("dynamic-unit", "RESOURCE_LOCAL", null);
         pumd.addClassName("com.baeldung.libraries.jdo.Product");
-        pumd.setExcludeUnlistedClasses();
+        pumd.setExcludeUnlistedClasses(true);
         pumd.addProperty("javax.jdo.option.ConnectionDriverName", "org.h2.Driver");
         pumd.addProperty("javax.jdo.option.ConnectionURL", "jdbc:h2:mem:mypersistence");
         pumd.addProperty("javax.jdo.option.ConnectionUserName", "sa");
diff --git a/libraries-data-db/src/test/java/com/baeldung/libraries/ormlite/ORMLiteIntegrationTest.java b/libraries-data-db/src/test/java/com/baeldung/libraries/ormlite/ORMLiteIntegrationTest.java
index 139e52632a..58c757d8a5 100644
--- a/libraries-data-db/src/test/java/com/baeldung/libraries/ormlite/ORMLiteIntegrationTest.java
+++ b/libraries-data-db/src/test/java/com/baeldung/libraries/ormlite/ORMLiteIntegrationTest.java
@@ -80,6 +80,8 @@ public class ORMLiteIntegrationTest {
             wrappedIterable.forEach(lib -> {
                 System.out.println(lib.getName());
             });
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
 
     }
@@ -162,7 +164,7 @@ public class ORMLiteIntegrationTest {
     }
 
     @AfterClass
-    public static void tearDown() throws SQLException, IOException {
+    public static void tearDown() throws Exception {
         connectionSource.close();
     }
 }
diff --git a/libraries-data-io/pom.xml b/libraries-data-io/pom.xml
index 640bf1ba07..2e126610d4 100644
--- a/libraries-data-io/pom.xml
+++ b/libraries-data-io/pom.xml
@@ -46,9 +46,9 @@
             <version>${google-sheets.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>${jaxb-api.version}</version>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${jaxb-runtime.version}</version>
         </dependency>
         <dependency>
             <groupId>org.docx4j</groupId>
@@ -104,8 +104,8 @@
         <opencsv.version>4.1</opencsv.version>
         <google-api.version>1.23.0</google-api.version>
         <google-sheets.version>v4-rev493-1.21.0</google-sheets.version>
-        <docx4j.version>3.3.5</docx4j.version>
-        <jaxb-api.version>2.1</jaxb-api.version>
+        <docx4j.version>6.1.2</docx4j.version>
+        <jaxb-runtime.version>2.3.1</jaxb-runtime.version>
         <gson.version>2.8.7</gson.version>
         <yamlbeans.version>1.15</yamlbeans.version>
         <apache-thrift.version>0.14.2</apache-thrift.version>
diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
index 85edf8b69a..6ba48a9d66 100644
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    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">
+         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>libraries-data</artifactId>
     <name>libraries-data</name>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.ignite</groupId>
             <artifactId>ignite-spring-data</artifactId>
-            <version>${ignite.version}</version>
+            <version>${ignite-spring-data.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
@@ -58,6 +58,11 @@
             <artifactId>crunch-core</artifactId>
             <version>${org.apache.crunch.crunch-core.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>${javassist.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-client</artifactId>
@@ -133,11 +138,42 @@
             <groupId>com.googlecode.jmapper-framework</groupId>
             <artifactId>jmapper-core</artifactId>
             <version>${jmapper.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.thoughtworks.xstream</groupId>
+                    <artifactId>xstream</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.16</version>
+        </dependency>
+
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                        --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.misc=ALL-UNNAMED
+                        --add-opens java.base/sun.nio.ch=ALL-UNNAMED
+                        --add-opens java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED
+                        --add-opens jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED
+                        --add-opens java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED
+                        --add-opens java.base/java.io=ALL-UNNAMED
+                        --add-opens java.base/java.nio=ALL-UNNAMED
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -166,11 +202,14 @@
     </build>
 
     <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <assembly.plugin.version>2.3</assembly.plugin.version>
         <httpclient.version>3.1</httpclient.version>
         <storm.version>1.2.2</storm.version>
         <kafka.version>3.3.1</kafka.version>
-        <ignite.version>2.4.0</ignite.version>
+        <ignite.version>2.14.0</ignite.version>
+        <ignite-spring-data.version>2.9.1</ignite-spring-data.version>
         <gson.version>2.9.1</gson.version>
         <cache.version>1.1.1</cache.version>
         <flink.version>1.5.0</flink.version>
@@ -178,6 +217,7 @@
         <org.apache.crunch.crunch-core.version>1.0.0</org.apache.crunch.crunch-core.version>
         <org.apache.hadoop.hadoop-client>2.2.0</org.apache.hadoop.hadoop-client>
         <jmapper.version>1.6.0.1</jmapper.version>
+        <javassist.version>3.29.2-GA</javassist.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/libraries-data/src/test/java/com/baeldung/crunch/StopWordFilterUnitTest.java b/libraries-data/src/test/java/com/baeldung/crunch/StopWordFilterUnitTest.java
index fffefc2bfb..0bb03016d8 100644
--- a/libraries-data/src/test/java/com/baeldung/crunch/StopWordFilterUnitTest.java
+++ b/libraries-data/src/test/java/com/baeldung/crunch/StopWordFilterUnitTest.java
@@ -7,6 +7,7 @@ import static org.junit.Assert.assertTrue;
 import org.apache.crunch.FilterFn;
 import org.apache.crunch.PCollection;
 import org.apache.crunch.impl.mem.MemPipeline;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import com.google.common.collect.ImmutableList;
diff --git a/libraries-data/src/test/java/com/baeldung/crunch/ToUpperCaseWithCounterFnUnitTest.java b/libraries-data/src/test/java/com/baeldung/crunch/ToUpperCaseWithCounterFnUnitTest.java
index 76294d273d..00c508e605 100644
--- a/libraries-data/src/test/java/com/baeldung/crunch/ToUpperCaseWithCounterFnUnitTest.java
+++ b/libraries-data/src/test/java/com/baeldung/crunch/ToUpperCaseWithCounterFnUnitTest.java
@@ -6,6 +6,7 @@ import org.apache.crunch.PCollection;
 import org.apache.crunch.impl.mem.MemPipeline;
 import org.apache.crunch.types.writable.Writables;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import com.google.common.collect.ImmutableList;
diff --git a/libraries-files/pom.xml b/libraries-files/pom.xml
index b36dc150a8..e4b3ffcdb2 100644
--- a/libraries-files/pom.xml
+++ b/libraries-files/pom.xml
@@ -38,22 +38,24 @@
             <version>${jackson.version}</version>
         </dependency>
         <dependency>
-	    <groupId>com.itextpdf</groupId>
-	    <artifactId>itext7-core</artifactId>
-	    <version>7.2.4</version>
-	    <type>pom</type>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>itext7-core</artifactId>
+            <version>${itext7-core.version}</version>
+            <type>pom</type>
         </dependency>
-	<dependency>
-	    <groupId>org.assertj</groupId>
-	    <artifactId>assertj-core</artifactId>
-	    <version>3.23.1</version>
-	    <scope>test</scope>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
     <properties>
         <org.ini4j.version>0.5.4</org.ini4j.version>
         <commons-configuration2>2.8.0</commons-configuration2>
+        <itext7-core.version>7.2.4</itext7-core.version>
+        <assertj-core.version>3.23.1</assertj-core.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/libraries-http-2/src/test/java/com/baeldung/okhttp/download/BinaryFileDownloaderIntegrationTest.java b/libraries-http-2/src/test/java/com/baeldung/okhttp/download/BinaryFileDownloaderIntegrationTest.java
index 6f0f705350..1ee668523a 100644
--- a/libraries-http-2/src/test/java/com/baeldung/okhttp/download/BinaryFileDownloaderIntegrationTest.java
+++ b/libraries-http-2/src/test/java/com/baeldung/okhttp/download/BinaryFileDownloaderIntegrationTest.java
@@ -7,7 +7,8 @@ import org.junit.Rule;
 import org.junit.Test;
 
 import java.io.File;
-import java.io.FileOutputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -25,7 +26,7 @@ public class BinaryFileDownloaderIntegrationTest {
         String fileName = "download.txt";
 
         ProgressCallback progressCallback = progress -> assertEquals(100.0, progress, .0);
-        try (BinaryFileWriter writer = new BinaryFileWriter(new FileOutputStream(fileName), progressCallback); BinaryFileDownloader tested = new BinaryFileDownloader(new OkHttpClient(), writer)) {
+        try (BinaryFileWriter writer = new BinaryFileWriter(Files.newOutputStream(Paths.get(fileName)), progressCallback); BinaryFileDownloader tested = new BinaryFileDownloader(new OkHttpClient(), writer)) {
             long downloaded = tested.download(server.url("/greetings").toString());
             assertEquals(body.length(), downloaded);
             File downloadedFile = new File(fileName);
diff --git a/libraries-http/pom.xml b/libraries-http/pom.xml
index 0077a5047e..18ba571f60 100644
--- a/libraries-http/pom.xml
+++ b/libraries-http/pom.xml
@@ -52,11 +52,6 @@
             <artifactId>async-http-client</artifactId>
             <version>${async.http.client.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
diff --git a/libraries-7/README.md b/libraries-jdk8/README.md
similarity index 73%
rename from libraries-7/README.md
rename to libraries-jdk8/README.md
index 6f0a7d2505..fa2126c89a 100644
--- a/libraries-7/README.md
+++ b/libraries-jdk8/README.md
@@ -1,4 +1,4 @@
-## Libraries-7
+## Libraries-jdk8
 
 This module contains articles about various Java libraries. 
 These are small libraries that are relatively easy to use and do not require any separate module of their own.
@@ -8,5 +8,7 @@ The code examples related to different libraries are each in their own module.
 Remember, for advanced libraries like [Jackson](/jackson) and [JUnit](/testing-modules) we already have separate modules. Please make sure to have a look at the existing modules in such cases.
 
 ### Relevant articles
-- [Guide to Simple Binary Encoding](https://www.baeldung.com/java-sbe)
+- [Introduction to Chronicle Queue](https://www.baeldung.com/java-chronicle-queue)
+- [A Guide to the Reflections Library](https://www.baeldung.com/reflections-library)
+
 - More articles [[<-- prev]](/libraries-6)
diff --git a/libraries-jdk8/pom.xml b/libraries-jdk8/pom.xml
new file mode 100644
index 0000000000..31582e0bdd
--- /dev/null
+++ b/libraries-jdk8/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>libraries-jdk8</artifactId>
+
+    <parent>
+        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <!-- Reflections -->
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>${reflections.version}</version>
+        </dependency>
+        <!-- Chronicle -->
+        <dependency>
+            <groupId>net.openhft</groupId>
+            <artifactId>chronicle</artifactId>
+            <version>${chronicle.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.sun.java</groupId>
+                    <artifactId>tools</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <reflections.version>0.9.11</reflections.version>
+        <chronicle.version>3.6.4</chronicle.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/libraries/src/main/java/com/baeldung/chronicle/queue/ChronicleQueue.java b/libraries-jdk8/src/main/java/com/baeldung/chronicle/queue/ChronicleQueue.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/chronicle/queue/ChronicleQueue.java
rename to libraries-jdk8/src/main/java/com/baeldung/chronicle/queue/ChronicleQueue.java
diff --git a/libraries-6/src/main/java/com/baeldung/reflections/ReflectionsApp.java b/libraries-jdk8/src/main/java/reflections/ReflectionsApp.java
similarity index 91%
rename from libraries-6/src/main/java/com/baeldung/reflections/ReflectionsApp.java
rename to libraries-jdk8/src/main/java/reflections/ReflectionsApp.java
index 4f5b6dd183..39d0fafb10 100644
--- a/libraries-6/src/main/java/com/baeldung/reflections/ReflectionsApp.java
+++ b/libraries-jdk8/src/main/java/reflections/ReflectionsApp.java
@@ -1,4 +1,4 @@
-package com.baeldung.reflections;
+package reflections;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -30,14 +30,14 @@ public class ReflectionsApp {
     }
 
     public Set<Method> getDateDeprecatedMethods() {
-        Reflections reflections = new Reflections(java.util.Date.class, new MethodAnnotationsScanner());
+        Reflections reflections = new Reflections(Date.class, new MethodAnnotationsScanner());
         Set<Method> deprecatedMethodsSet = reflections.getMethodsAnnotatedWith(Deprecated.class);
         return deprecatedMethodsSet;
     }
 
     @SuppressWarnings("rawtypes")
     public Set<Constructor> getDateDeprecatedConstructors() {
-        Reflections reflections = new Reflections(java.util.Date.class, new MethodAnnotationsScanner());
+        Reflections reflections = new Reflections(Date.class, new MethodAnnotationsScanner());
         Set<Constructor> constructorsSet = reflections.getConstructorsAnnotatedWith(Deprecated.class);
         return constructorsSet;
     }
diff --git a/libraries/src/test/java/com/baeldung/chronicle/queue/ChronicleQueueIntegrationTest.java b/libraries-jdk8/src/test/java/com/baeldung/chronicle/queue/ChronicleQueueIntegrationTest.java
similarity index 95%
rename from libraries/src/test/java/com/baeldung/chronicle/queue/ChronicleQueueIntegrationTest.java
rename to libraries-jdk8/src/test/java/com/baeldung/chronicle/queue/ChronicleQueueIntegrationTest.java
index 00e9500318..7e0bcb7d33 100644
--- a/libraries/src/test/java/com/baeldung/chronicle/queue/ChronicleQueueIntegrationTest.java
+++ b/libraries-jdk8/src/test/java/com/baeldung/chronicle/queue/ChronicleQueueIntegrationTest.java
@@ -8,6 +8,8 @@ import java.nio.file.Files;
 
 import org.junit.Test;
 
+import com.baeldung.chronicle.queue.ChronicleQueue;
+
 import net.openhft.chronicle.Chronicle;
 import net.openhft.chronicle.ChronicleQueueBuilder;
 import net.openhft.chronicle.ExcerptTailer;
@@ -15,6 +17,7 @@ import net.openhft.chronicle.tools.ChronicleTools;
 
 public class ChronicleQueueIntegrationTest {
 
+//    @Ignore
     @Test
     public void givenSetOfValues_whenWriteToQueue_thenWriteSuccesfully() throws IOException {
         File queueDir = Files.createTempDirectory("chronicle-queue").toFile();
diff --git a/libraries-6/src/test/java/com/baeldung/reflections/ReflectionsUnitTest.java b/libraries-jdk8/src/test/java/reflections/ReflectionsUnitTest.java
similarity index 97%
rename from libraries-6/src/test/java/com/baeldung/reflections/ReflectionsUnitTest.java
rename to libraries-jdk8/src/test/java/reflections/ReflectionsUnitTest.java
index b86094b6f4..5104855208 100644
--- a/libraries-6/src/test/java/com/baeldung/reflections/ReflectionsUnitTest.java
+++ b/libraries-jdk8/src/test/java/reflections/ReflectionsUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.reflections;
+package reflections;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
diff --git a/libraries-primitive/pom.xml b/libraries-primitive/pom.xml
index badcfc443d..114ec64848 100644
--- a/libraries-primitive/pom.xml
+++ b/libraries-primitive/pom.xml
@@ -3,7 +3,6 @@
     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>
-    <groupId>com.baeldung</groupId>
     <artifactId>libraries-primitive</artifactId>
     <version>1.0-SNAPSHOT</version>
     <name>libraries-primitive</name>
diff --git a/libraries-security/pom.xml b/libraries-security/pom.xml
index 6d3bbcd26c..62c476a82c 100644
--- a/libraries-security/pom.xml
+++ b/libraries-security/pom.xml
@@ -96,8 +96,26 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+        </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <scribejava.version>5.6.0</scribejava.version>
         <passay.version>1.3.1</passay.version>
diff --git a/libraries-server-2/pom.xml b/libraries-server-2/pom.xml
index 7377fa3fa9..cf5d016d9f 100644
--- a/libraries-server-2/pom.xml
+++ b/libraries-server-2/pom.xml
@@ -73,6 +73,7 @@
     <properties>
         <jetty.version>9.4.27.v20200227</jetty.version>
         <alpn.version>8.1.11.v20170118</alpn.version>
+        <maven-war-plugin.version>3.2.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/libraries-testing/pom.xml b/libraries-testing/pom.xml
index 2aaad59e09..2c7f231fdc 100644
--- a/libraries-testing/pom.xml
+++ b/libraries-testing/pom.xml
@@ -153,6 +153,31 @@
             <version>${archunit.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>2.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.3.0</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -171,25 +196,33 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
     <properties>
         <asciidoctor.version>1.5.7.1</asciidoctor.version>
         <serenity.version>1.9.9</serenity.version>
-        <serenity.jbehave.version>1.9.0</serenity.jbehave.version>
+        <serenity.jbehave.version>1.46.0</serenity.jbehave.version>
         <serenity.jira.version>1.9.0</serenity.jira.version>
-        <serenity.plugin.version>1.9.27</serenity.plugin.version>
+        <serenity.plugin.version>3.6.12</serenity.plugin.version>
         <jsonassert.version>1.5.0</jsonassert.version>
         <awaitility.version>3.0.0</awaitility.version>
         <hoverfly-java.version>0.8.1</hoverfly-java.version>
         <spring.version>4.3.8.RELEASE</spring.version>
-        <spring-mock-mvc.version>4.1.1</spring-mock-mvc.version>
+        <spring-mock-mvc.version>5.3.0</spring-mock-mvc.version>
         <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
         <dbunit.version>2.7.0</dbunit.version>
-        <archunit.version>0.14.1</archunit.version>
+        <archunit.version>0.23.1</archunit.version>
         <modelassert.version>1.0.0</modelassert.version>
-        <h2.version>2.1.214</h2.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 7bef56deb0..2ab345c469 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-api-jdo</artifactId>
-            <version>${datanucleus.version}</version>
+            <version>${datanucleus-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
@@ -86,17 +86,7 @@
             <artifactId>datanucleus-jdo-query</artifactId>
             <version>${datanucleus-jdo-query.version}</version>
         </dependency>
-        <dependency>
-            <groupId>net.openhft</groupId>
-            <artifactId>chronicle</artifactId>
-            <version>${chronicle.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.sun.java</groupId>
-                    <artifactId>tools</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
@@ -180,6 +170,23 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED
+                        --add-exports=java.base/sun.nio.ch=ALL-UNNAMED
+                        --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED
+                        --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+                        --add-opens=jdk.compiler/com.sun.tools.javac=ALL-UNNAMED
+                        --add-opens=java.base/java.lang=ALL-UNNAMED
+                        --add-opens=java.base/java.lang.reflect=ALL-UNNAMED
+                        --add-opens=java.base/java.io=ALL-UNNAMED
+                        --add-opens=java.base/java.util=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
             <!-- JDO Plugin -->
             <plugin>
                 <groupId>org.datanucleus</groupId>
@@ -273,16 +280,16 @@
         <protonpack.version>1.15</protonpack.version>
         <google-api.version>1.23.0</google-api.version>
         <jets3t-version>0.9.4.0006L</jets3t-version>
-        <javax.jdo.version>3.2.0-m7</javax.jdo.version>
-        <datanucleus.version>5.1.1</datanucleus.version>
-        <datanucleus-maven-plugin.version>5.0.2</datanucleus-maven-plugin.version>
+        <javax.jdo.version>3.2.1</javax.jdo.version>
+        <datanucleus.version>6.0.3</datanucleus.version>
+        <datanucleus-api.version>6.0.1</datanucleus-api.version>
+        <datanucleus-maven-plugin.version>6.0.0-release</datanucleus-maven-plugin.version>
         <datanucleus-xml.version>5.0.0-release</datanucleus-xml.version>
-        <datanucleus-jdo-query.version>5.0.2</datanucleus-jdo-query.version>
-        <chronicle.version>3.6.4</chronicle.version>
+        <datanucleus-jdo-query.version>6.0.1</datanucleus-jdo-query.version>
         <spring.version>4.3.8.RELEASE</spring.version>
         <spring-mock-mvc.version>3.0.3</spring-mock-mvc.version>
         <quartz.version>2.3.0</quartz.version>
-        <javaassist.version>3.21.0-GA</javaassist.version>
+        <javaassist.version>3.29.2-GA</javaassist.version>
         <jool.version>0.9.12</jool.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
         <commons-net.version>3.6</commons-net.version>
diff --git a/linux-bash/command-line-arguments/src/main/bash/README.md b/linux-bash-modules/command-line-arguments/src/main/bash/README.md
similarity index 100%
rename from linux-bash/command-line-arguments/src/main/bash/README.md
rename to linux-bash-modules/command-line-arguments/src/main/bash/README.md
diff --git a/linux-bash/command-line-arguments/src/main/bash/userReg-flags.sh b/linux-bash-modules/command-line-arguments/src/main/bash/userReg-flags.sh
similarity index 100%
rename from linux-bash/command-line-arguments/src/main/bash/userReg-flags.sh
rename to linux-bash-modules/command-line-arguments/src/main/bash/userReg-flags.sh
diff --git a/linux-bash/command-line-arguments/src/main/bash/userReg-positional-parameter.sh b/linux-bash-modules/command-line-arguments/src/main/bash/userReg-positional-parameter.sh
similarity index 100%
rename from linux-bash/command-line-arguments/src/main/bash/userReg-positional-parameter.sh
rename to linux-bash-modules/command-line-arguments/src/main/bash/userReg-positional-parameter.sh
diff --git a/linux-bash/command-line-arguments/src/main/bash/users-loop.sh b/linux-bash-modules/command-line-arguments/src/main/bash/users-loop.sh
similarity index 100%
rename from linux-bash/command-line-arguments/src/main/bash/users-loop.sh
rename to linux-bash-modules/command-line-arguments/src/main/bash/users-loop.sh
diff --git a/linux-bash/command-line-arguments/src/main/bash/users-shift-operator.sh b/linux-bash-modules/command-line-arguments/src/main/bash/users-shift-operator.sh
similarity index 100%
rename from linux-bash/command-line-arguments/src/main/bash/users-shift-operator.sh
rename to linux-bash-modules/command-line-arguments/src/main/bash/users-shift-operator.sh
diff --git a/linux-bash/functions/src/main/bash/README.md b/linux-bash-modules/functions/src/main/bash/README.md
similarity index 100%
rename from linux-bash/functions/src/main/bash/README.md
rename to linux-bash-modules/functions/src/main/bash/README.md
diff --git a/linux-bash/functions/src/main/bash/functions.sh b/linux-bash-modules/functions/src/main/bash/functions.sh
similarity index 100%
rename from linux-bash/functions/src/main/bash/functions.sh
rename to linux-bash-modules/functions/src/main/bash/functions.sh
diff --git a/linux-bash/functions/src/main/bash/infile b/linux-bash-modules/functions/src/main/bash/infile
similarity index 100%
rename from linux-bash/functions/src/main/bash/infile
rename to linux-bash-modules/functions/src/main/bash/infile
diff --git a/linux-bash/json/README.md b/linux-bash-modules/json/README.md
similarity index 100%
rename from linux-bash/json/README.md
rename to linux-bash-modules/json/README.md
diff --git a/linux-bash/json/src/main/bash/fruit.json b/linux-bash-modules/json/src/main/bash/fruit.json
similarity index 100%
rename from linux-bash/json/src/main/bash/fruit.json
rename to linux-bash-modules/json/src/main/bash/fruit.json
diff --git a/linux-bash/json/src/main/bash/fruits.json b/linux-bash-modules/json/src/main/bash/fruits.json
similarity index 100%
rename from linux-bash/json/src/main/bash/fruits.json
rename to linux-bash-modules/json/src/main/bash/fruits.json
diff --git a/linux-bash/json/src/main/bash/jq.sh b/linux-bash-modules/json/src/main/bash/jq.sh
similarity index 100%
rename from linux-bash/json/src/main/bash/jq.sh
rename to linux-bash-modules/json/src/main/bash/jq.sh
diff --git a/linux-bash/json/src/main/bash/wikipedia.json b/linux-bash-modules/json/src/main/bash/wikipedia.json
similarity index 100%
rename from linux-bash/json/src/main/bash/wikipedia.json
rename to linux-bash-modules/json/src/main/bash/wikipedia.json
diff --git a/linux-bash/loops/README.md b/linux-bash-modules/loops/README.md
similarity index 100%
rename from linux-bash/loops/README.md
rename to linux-bash-modules/loops/README.md
diff --git a/linux-bash/loops/src/main/bash/find_directories.sh b/linux-bash-modules/loops/src/main/bash/find_directories.sh
similarity index 100%
rename from linux-bash/loops/src/main/bash/find_directories.sh
rename to linux-bash-modules/loops/src/main/bash/find_directories.sh
diff --git a/linux-bash/loops/src/main/bash/loop_directories.sh b/linux-bash-modules/loops/src/main/bash/loop_directories.sh
similarity index 100%
rename from linux-bash/loops/src/main/bash/loop_directories.sh
rename to linux-bash-modules/loops/src/main/bash/loop_directories.sh
diff --git a/linux-bash/read/README.md b/linux-bash-modules/read/README.md
similarity index 100%
rename from linux-bash/read/README.md
rename to linux-bash-modules/read/README.md
diff --git a/linux-bash/read/src/main/bash/file.csv b/linux-bash-modules/read/src/main/bash/file.csv
similarity index 100%
rename from linux-bash/read/src/main/bash/file.csv
rename to linux-bash-modules/read/src/main/bash/file.csv
diff --git a/linux-bash/read/src/main/bash/read_inputs.sh b/linux-bash-modules/read/src/main/bash/read_inputs.sh
similarity index 100%
rename from linux-bash/read/src/main/bash/read_inputs.sh
rename to linux-bash-modules/read/src/main/bash/read_inputs.sh
diff --git a/linux-bash/text/README.md b/linux-bash-modules/text/README.md
similarity index 100%
rename from linux-bash/text/README.md
rename to linux-bash-modules/text/README.md
diff --git a/linux-bash/text/src/main/bash/append_multiple_lines.sh b/linux-bash-modules/text/src/main/bash/append_multiple_lines.sh
similarity index 100%
rename from linux-bash/text/src/main/bash/append_multiple_lines.sh
rename to linux-bash-modules/text/src/main/bash/append_multiple_lines.sh
diff --git a/linux-bash/text/src/main/bash/remove_characters.sh b/linux-bash-modules/text/src/main/bash/remove_characters.sh
similarity index 100%
rename from linux-bash/text/src/main/bash/remove_characters.sh
rename to linux-bash-modules/text/src/main/bash/remove_characters.sh
diff --git a/logging-modules/log-mdc/pom.xml b/logging-modules/log-mdc/pom.xml
index c329a9dbdb..8e2bd2a426 100644
--- a/logging-modules/log-mdc/pom.xml
+++ b/logging-modules/log-mdc/pom.xml
@@ -97,6 +97,7 @@
         <log4j2.version>2.17.1</log4j2.version>
         <disruptor.version>3.3.6</disruptor.version>
         <jbosslogging.version>3.3.0.Final</jbosslogging.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/logging-modules/log4j2/${sys b/logging-modules/log4j2/${sys
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/logging-modules/log4j2/pom.xml b/logging-modules/log4j2/pom.xml
index c3a3f4e0f9..da2984442c 100644
--- a/logging-modules/log4j2/pom.xml
+++ b/logging-modules/log4j2/pom.xml
@@ -63,55 +63,27 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <proc>none</proc>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <test.mime>json</test.mime>
+                        <logging.folder.path>${java.io.tmpdir}/${maven.build.timestamp}/logfile.json</logging.folder.path>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>integration-lite-first</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <excludes>
-                                        <exclude>**/*ManualTest.java</exclude>
-                                        <exclude>**/*LiveTest.java</exclude>
-                                    </excludes>
-                                    <includes>
-                                        <include>**/*IntegrationTest.java</include>
-                                        <include>**/*IntTest.java</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <test.mime>json</test.mime>
-                                <logging.folder.path>${java.io.tmpdir}/${maven.build.timestamp}/logfile.json</logging.folder.path>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
     <properties>
-        <commons-dbcp2.version>2.1.1</commons-dbcp2.version>
-        <log4j-core.version>2.17.1</log4j-core.version>
+        <commons-dbcp2.version>2.9.0</commons-dbcp2.version>
+        <log4j-core.version>2.19.0</log4j-core.version>
         <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
     </properties>
 
diff --git a/logging-modules/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingIntegrationTest.java b/logging-modules/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingIntegrationTest.java
index 3e94e4e430..06fbb33b9d 100644
--- a/logging-modules/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingIntegrationTest.java
+++ b/logging-modules/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingIntegrationTest.java
@@ -21,7 +21,7 @@ import com.baeldung.logging.log4j2.tests.jdbc.ConnectionFactory;
 
 @RunWith(JUnit4.class)
 public class CustomLoggingIntegrationTest {
-    
+
     private static String logFilePath = System.getProperty("logging.folder.path");
     
     @BeforeClass
@@ -34,7 +34,7 @@ public class CustomLoggingIntegrationTest {
     }
 
     @Test
-    public void givenLoggerWithDefaultConfig_whenLogToConsole_thanOK() throws Exception {
+    public void givenLoggerWithDefaultConfig_whenLogToConsole_thenOK() throws Exception {
         Logger logger = LogManager.getLogger(getClass());
         Exception e = new RuntimeException("This is only a test!");
 
@@ -43,7 +43,7 @@ public class CustomLoggingIntegrationTest {
     }
 
     @Test
-    public void givenLoggerWithConsoleConfig_whenLogToConsoleInColors_thanOK() throws Exception {
+    public void givenLoggerWithConsoleConfig_whenLogToConsoleInColors_thenOK() throws Exception {
         Logger logger = LogManager.getLogger("CONSOLE_PATTERN_APPENDER_MARKER");
         Exception e = new RuntimeException("This is only a test!");
 
@@ -56,7 +56,7 @@ public class CustomLoggingIntegrationTest {
     }
 
     @Test
-    public void givenLoggerWithConsoleConfig_whenFilterByMarker_thanOK() throws Exception {
+    public void givenLoggerWithConsoleConfig_whenFilterByMarker_thenOK() throws Exception {
         Logger logger = LogManager.getLogger("CONSOLE_PATTERN_APPENDER_MARKER");
         Marker appError = MarkerManager.getMarker("APP_ERROR");
         Marker connectionTrace = MarkerManager.getMarker("CONN_TRACE");
@@ -66,7 +66,7 @@ public class CustomLoggingIntegrationTest {
     }
 
     @Test
-    public void givenLoggerWithConsoleConfig_whenFilterByThreadContext_thanOK() throws Exception {
+    public void givenLoggerWithConsoleConfig_whenFilterByThreadContext_thenOK() throws Exception {
         Logger logger = LogManager.getLogger("CONSOLE_PATTERN_APPENDER_THREAD_CONTEXT");
         ThreadContext.put("userId", "1000");
         logger.info("This is a log-visible user login. Maybe from an admin account?");
@@ -75,7 +75,7 @@ public class CustomLoggingIntegrationTest {
     }
 
     @Test
-    public void givenLoggerWithAsyncConfig_whenLogToJsonFile_thanOK() throws Exception {
+    public void givenLoggerWithAsyncConfig_whenLogToJsonFile_thenOK() throws Exception {
         Logger logger = LogManager.getLogger("ASYNC_JSON_FILE_APPENDER");
 
         final int count = 88;
@@ -90,7 +90,7 @@ public class CustomLoggingIntegrationTest {
     }
 
     @Test
-    public void givenLoggerWithFailoverConfig_whenLog_thanOK() throws Exception {
+    public void givenLoggerWithFailoverConfig_whenLog_thenOK() throws Exception {
         Logger logger = LogManager.getLogger("FAIL_OVER_SYSLOG_APPENDER");
         Exception e = new RuntimeException("This is only a test!");
 
@@ -103,7 +103,7 @@ public class CustomLoggingIntegrationTest {
     }
 
     @Test
-    public void givenLoggerWithJdbcConfig_whenLogToDataSource_thanOK() throws Exception {
+    public void givenLoggerWithJdbcConfig_whenLogToDataSource_thenOK() throws Exception {
         Logger logger = LogManager.getLogger("JDBC_APPENDER");
 
         final int count = 88;
@@ -122,7 +122,7 @@ public class CustomLoggingIntegrationTest {
     }
 
     @Test
-    public void givenLoggerWithRollingFileConfig_whenLogToXMLFile_thanOK() throws Exception {
+    public void givenLoggerWithRollingFileConfig_whenLogToXMLFile_thenOK() throws Exception {
         Logger logger = LogManager.getLogger("XML_ROLLING_FILE_APPENDER");
 
         final int count = 88;
diff --git a/logging-modules/log4j2/src/test/resources/log4j2.xml b/logging-modules/log4j2/src/test/resources/log4j2.xml
index 050e0aa705..6516d9884c 100644
--- a/logging-modules/log4j2/src/test/resources/log4j2.xml
+++ b/logging-modules/log4j2/src/test/resources/log4j2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration xmlns:xi="http://www.w3.org/2001/XInclude" 
+<Configuration xmlns:xi="http://www.w3.org/2001/XInclude"
     packages="com.baeldung" status="WARN">
     <Appenders>
         <xi:include
@@ -20,7 +20,7 @@
                 <KeyValuePair key="myCustomField" value="myCustomValue" />
             </JsonLayout>
         </Console>
-        <File name="JSONLogfileAppender" fileName="${sys:logging.folder.path}">
+        <File name="JSONLogfileAppender" fileName="${sys:logging.folder.path}" >
             <JSONLayout compact="true" eventEol="true" />
             <BurstFilter level="INFO" rate="2" maxBurst="10" />
         </File>
diff --git a/lombok-modules/lombok-2/README.md b/lombok-modules/lombok-2/README.md
index d3b1287346..fcee23fc82 100644
--- a/lombok-modules/lombok-2/README.md
+++ b/lombok-modules/lombok-2/README.md
@@ -9,4 +9,7 @@ This module contains articles about Project Lombok.
 - [Lombok Using @With Annotations](https://www.baeldung.com/lombok-with-annotations)
 - [Lombok’s @ToString Annotation](https://www.baeldung.com/lombok-tostring)
 - [Jackson’s Deserialization With Lombok](https://www.baeldung.com/java-jackson-deserialization-lombok)
+- [Constructor Injection in Spring with Lombok](https://www.baeldung.com/spring-injection-lombok)
+- [@StandardException Annotation in Lombok](https://www.baeldung.com/lombok-standardexception-annotation)
+- [Lombok EqualsAndHashCode Annotation](https://www.baeldung.com/java-lombok-equalsandhashcode)
 - More articles: [[<-- prev]](../lombok)
diff --git a/lombok-modules/lombok-2/pom.xml b/lombok-modules/lombok-2/pom.xml
index 0a7ad27ad6..b805e6a31e 100644
--- a/lombok-modules/lombok-2/pom.xml
+++ b/lombok-modules/lombok-2/pom.xml
@@ -25,6 +25,10 @@
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+         <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/spring-core-4/src/main/java/com/baeldung/lombok/ApologizeService.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/ApologizeService.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/lombok/ApologizeService.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/ApologizeService.java
diff --git a/spring-core-4/src/main/java/com/baeldung/lombok/FarewellService.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/FarewellService.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/lombok/FarewellService.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/FarewellService.java
diff --git a/spring-core-4/src/main/java/com/baeldung/lombok/GreetingService.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/GreetingService.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/lombok/GreetingService.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/GreetingService.java
diff --git a/spring-core-4/src/main/java/com/baeldung/lombok/ThankingService.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/ThankingService.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/lombok/ThankingService.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/ThankingService.java
diff --git a/spring-core-4/src/main/java/com/baeldung/lombok/Translator.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/Translator.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/lombok/Translator.java
rename to lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/Translator.java
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/BasicAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/BasicAccount.java
deleted file mode 100644
index a9332735c7..0000000000
--- a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/BasicAccount.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.baeldung.lombok.accessors.model;
-
-import java.math.BigDecimal;
-
-public class BasicAccount {
-    private String name;
-    private BigDecimal balance;
-
-    public BigDecimal getBalance() {
-        return this.balance;
-    }
-
-    public void setBalance(BigDecimal newBalance) {
-        this.balance = newBalance;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public void setName(String accountName) {
-        this.name = accountName;
-    }
-}
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/FinalAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/FinalAccount.java
new file mode 100644
index 0000000000..72e712d246
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/FinalAccount.java
@@ -0,0 +1,15 @@
+package com.baeldung.lombok.accessors.model;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+@Accessors(makeFinal = true)
+@Getter
+@Setter
+public class FinalAccount {
+    private String name;
+    private BigDecimal balance;
+}
\ No newline at end of file
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/FinalChainedFluentAccount.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/FinalChainedFluentAccount.java
new file mode 100644
index 0000000000..4951f370e7
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/accessors/model/FinalChainedFluentAccount.java
@@ -0,0 +1,15 @@
+package com.baeldung.lombok.accessors.model;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+@Accessors(makeFinal = true, fluent = true, chain = true)
+@Getter
+@Setter
+public class FinalChainedFluentAccount {
+    private String name;
+    private BigDecimal balance;
+}
\ No newline at end of file
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/Employee.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/Employee.java
new file mode 100644
index 0000000000..6f0ac60cca
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/Employee.java
@@ -0,0 +1,14 @@
+package com.baeldung.lombok.equalsandhashcode;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+
+@Getter
+@EqualsAndHashCode
+@AllArgsConstructor
+public class Employee {
+    private String name;
+    private int id;
+    private int age;
+}
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/EmployeeDelomboked.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/EmployeeDelomboked.java
new file mode 100644
index 0000000000..afae2d4c17
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/EmployeeDelomboked.java
@@ -0,0 +1,57 @@
+package com.baeldung.lombok.equalsandhashcode;
+
+import lombok.Getter;
+
+@Getter
+public class EmployeeDelomboked {
+
+    private String name;
+    private int id;
+    private int age;
+
+    public EmployeeDelomboked() {
+    }
+
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (!(o instanceof Employee)) {
+            return false;
+        } else {
+            Employee other = (Employee) o;
+            if (!other.canEqual(this)) {
+                return false;
+            } else if (this.getId() != other.getId()) {
+                return false;
+            } else if (this.getAge() != other.getAge()) {
+                return false;
+            } else {
+                Object this$name = this.getName();
+                Object other$name = other.getName();
+                if (this$name == null) {
+                    if (other$name == null) {
+                        return true;
+                    }
+                } else if (this$name.equals(other$name)) {
+                    return true;
+                }
+
+                return false;
+            }
+        }
+    }
+
+    protected boolean canEqual(Object other) {
+        return other instanceof Employee;
+    }
+
+    public int hashCode() {
+        final int PRIME = 59;
+        int result = 1;
+        result = result * PRIME + this.getId();
+        result = result * PRIME + this.getAge();
+        Object $name = this.getName();
+        result = result * PRIME + ($name == null ? 43 : $name.hashCode());
+        return result;
+    }
+}
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/commonissue/Employee.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/commonissue/Employee.java
new file mode 100644
index 0000000000..91090a4a8c
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/commonissue/Employee.java
@@ -0,0 +1,20 @@
+package com.baeldung.lombok.equalsandhashcode.commonissue;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@EqualsAndHashCode
+@AllArgsConstructor
+@NoArgsConstructor
+public class Employee {
+    private String name;
+    private int id;
+    private int age;
+    private Manager manager;
+}
+
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/commonissue/EmployeeV2.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/commonissue/EmployeeV2.java
new file mode 100644
index 0000000000..02bbbacaed
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/commonissue/EmployeeV2.java
@@ -0,0 +1,17 @@
+package com.baeldung.lombok.equalsandhashcode.commonissue;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@EqualsAndHashCode(exclude = "manager")
+@AllArgsConstructor
+public class EmployeeV2 {
+    private String name;
+    private int id;
+    private int age;
+    private ManagerV2 manager;
+}
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/commonissue/Manager.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/commonissue/Manager.java
new file mode 100644
index 0000000000..aa6221d54a
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/commonissue/Manager.java
@@ -0,0 +1,16 @@
+package com.baeldung.lombok.equalsandhashcode.commonissue;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@EqualsAndHashCode
+@AllArgsConstructor
+public class Manager {
+    private String name;
+    private Employee assistantManager;
+}
+
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/commonissue/ManagerV2.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/commonissue/ManagerV2.java
new file mode 100644
index 0000000000..67068341f3
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/commonissue/ManagerV2.java
@@ -0,0 +1,16 @@
+package com.baeldung.lombok.equalsandhashcode.commonissue;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@EqualsAndHashCode
+@AllArgsConstructor
+public class ManagerV2 {
+    private String name;
+    private EmployeeV2 assistantManager;
+}
+
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/exclude/classlevel/Employee.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/exclude/classlevel/Employee.java
new file mode 100644
index 0000000000..64c95d0e7b
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/exclude/classlevel/Employee.java
@@ -0,0 +1,15 @@
+package com.baeldung.lombok.equalsandhashcode.exclude.classlevel;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+
+@Getter
+@EqualsAndHashCode(exclude = {"id", "age"})
+@AllArgsConstructor
+public class Employee {
+    private String name;
+    private int id;
+    private int age;
+}
+
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/exclude/classlevel/EmployeeDelomboked.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/exclude/classlevel/EmployeeDelomboked.java
new file mode 100644
index 0000000000..edf70689e1
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/exclude/classlevel/EmployeeDelomboked.java
@@ -0,0 +1,37 @@
+package com.baeldung.lombok.equalsandhashcode.exclude.classlevel;
+
+
+import lombok.Getter;
+
+@Getter
+public class EmployeeDelomboked {
+    private String name;
+    private int id;
+    private int age;
+
+    @Override
+    public boolean equals(final Object o) {
+        if (o == this) return true;
+        if (!(o instanceof Employee)) return false;
+        final Employee other = (Employee) o;
+        if (!other.canEqual((Object) this)) return false;
+        final Object this$name = this.getName();
+        final Object other$name = other.getName();
+        if (this$name == null ? other$name != null : !this$name.equals(other$name)) return false;
+        return true;
+    }
+
+    protected boolean canEqual(final Object other) {
+        return other instanceof Employee;
+    }
+
+    @Override
+    public int hashCode() {
+        final int PRIME = 59;
+        int result = 1;
+        final Object $name = this.getName();
+        result = result * PRIME + ($name == null ? 43 : $name.hashCode());
+        return result;
+    }
+}
+
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/exclude/fieldlevel/Employee.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/exclude/fieldlevel/Employee.java
new file mode 100644
index 0000000000..a03d1fc43a
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/exclude/fieldlevel/Employee.java
@@ -0,0 +1,18 @@
+package com.baeldung.lombok.equalsandhashcode.exclude.fieldlevel;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+
+@Getter
+@EqualsAndHashCode
+@AllArgsConstructor
+public class Employee {
+    private String name;
+    @EqualsAndHashCode.Exclude
+    private int id;
+    @EqualsAndHashCode.Exclude
+    private int age;
+}
+
+
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/exclude/fieldlevel/EmployeeDelomboked.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/exclude/fieldlevel/EmployeeDelomboked.java
new file mode 100644
index 0000000000..f30ab6f709
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/exclude/fieldlevel/EmployeeDelomboked.java
@@ -0,0 +1,31 @@
+package com.baeldung.lombok.equalsandhashcode.exclude.fieldlevel;
+
+
+import lombok.Getter;
+
+@Getter
+public class EmployeeDelomboked {
+    private String name;
+    private int id;
+    private int age;
+
+    public boolean equals(final Object o) {
+        if (o == this) return true;
+        if (!(o instanceof com.baeldung.lombok.equalsandhashcode.exclude.fieldlevel.Employee)) return false;
+        final com.baeldung.lombok.equalsandhashcode.exclude.fieldlevel.Employee other = (com.baeldung.lombok.equalsandhashcode.exclude.fieldlevel.Employee) o;
+        if (!other.canEqual((Object) this)) return false;
+        final Object this$name = this.getName();
+        final Object other$name = other.getName();
+        if (this$name == null ? other$name != null : !this$name.equals(other$name)) return false;
+        return true;
+    }
+
+    public int hashCode() {
+        final int PRIME = 59;
+        int result = 1;
+        final Object $name = this.getName();
+        result = result * PRIME + ($name == null ? 43 : $name.hashCode());
+        return result;
+    }
+}
+
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/include/classlevel/Employee.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/include/classlevel/Employee.java
new file mode 100644
index 0000000000..e353c27dfd
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/include/classlevel/Employee.java
@@ -0,0 +1,15 @@
+package com.baeldung.lombok.equalsandhashcode.include.classlevel;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(of = {"name", "id"})
+@AllArgsConstructor
+public class Employee {
+    private String name;
+    private int id;
+    private int age;
+}
+
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/include/fieldlevel/Employee.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/include/fieldlevel/Employee.java
new file mode 100644
index 0000000000..c1d4ab5b0f
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/include/fieldlevel/Employee.java
@@ -0,0 +1,18 @@
+package com.baeldung.lombok.equalsandhashcode.include.fieldlevel;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+
+@Getter
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
+@AllArgsConstructor
+public class Employee {
+    @EqualsAndHashCode.Include
+    private String name;
+    @EqualsAndHashCode.Include
+    private int id;
+    private int age;
+}
+
+
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/include/methodlevel/Employee.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/include/methodlevel/Employee.java
new file mode 100644
index 0000000000..3de8cc2c69
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/include/methodlevel/Employee.java
@@ -0,0 +1,20 @@
+package com.baeldung.lombok.equalsandhashcode.include.methodlevel;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+
+@Getter
+@EqualsAndHashCode
+@AllArgsConstructor
+public class Employee {
+    private String name;
+    private int id;
+    private int age;
+
+    @EqualsAndHashCode.Include
+    public boolean hasOddId() {
+        return id % 2 != 0;
+    }
+}
+
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/include/methodlevel/EmployeeDelomboked.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/include/methodlevel/EmployeeDelomboked.java
new file mode 100644
index 0000000000..f25b996fe1
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/include/methodlevel/EmployeeDelomboked.java
@@ -0,0 +1,40 @@
+package com.baeldung.lombok.equalsandhashcode.include.methodlevel;
+
+import lombok.Getter;
+
+@Getter
+public class EmployeeDelomboked {
+    private String name;
+    private int id;
+    private int age;
+
+    public boolean hasOddId() {
+        return id % 2 != 0;
+    }
+
+    public boolean equals(final Object o) {
+        if (o == this) return true;
+        if (!(o instanceof Employee)) return false;
+        final Employee other = (Employee) o;
+        if (!other.canEqual((Object) this)) return false;
+        if (this.getId() != other.getId()) return false;
+        if (this.getAge() != other.getAge()) return false;
+        if (this.hasOddId() != other.hasOddId()) return false;
+        final Object this$name = this.getName();
+        final Object other$name = other.getName();
+        if (this$name == null ? other$name != null : !this$name.equals(other$name)) return false;
+        return true;
+    }
+
+    public int hashCode() {
+        final int PRIME = 59;
+        int result = 1;
+        result = result * PRIME + this.getId();
+        result = result * PRIME + this.getAge();
+        result = result * PRIME + (this.hasOddId() ? 79 : 97);
+        final Object $name = this.getName();
+        result = result * PRIME + ($name == null ? 43 : $name.hashCode());
+        return result;
+    }
+}
+
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/inheritance/Employee.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/inheritance/Employee.java
new file mode 100644
index 0000000000..de63755cfc
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/inheritance/Employee.java
@@ -0,0 +1,16 @@
+package com.baeldung.lombok.equalsandhashcode.inheritance;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@EqualsAndHashCode
+@AllArgsConstructor
+public class Employee {
+    private String name;
+    private int id;
+    private int age;
+}
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/inheritance/Manager.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/inheritance/Manager.java
new file mode 100644
index 0000000000..e943940c32
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/inheritance/Manager.java
@@ -0,0 +1,20 @@
+package com.baeldung.lombok.equalsandhashcode.inheritance;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+public class Manager extends Employee {
+    private String departmentName;
+    private int uid;
+
+    public Manager(String departmentName, int uid, String name, int id, int age) {
+        super(name, id, age);
+        this.departmentName = departmentName;
+        this.uid = uid;
+    }
+}
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/inheritance/ManagerDelomboked.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/inheritance/ManagerDelomboked.java
new file mode 100644
index 0000000000..e14b4a1f10
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/inheritance/ManagerDelomboked.java
@@ -0,0 +1,37 @@
+package com.baeldung.lombok.equalsandhashcode.inheritance;
+
+import lombok.Getter;
+
+@Getter
+public class ManagerDelomboked extends Employee {
+    private String departmentName;
+    private int uid;
+
+    public ManagerDelomboked(String departmentName, int uid, String name, int id, int age) {
+        super(name, id, age);
+        this.departmentName = departmentName;
+        this.uid = uid;
+    }
+
+    public boolean equals(final Object o) {
+        if (o == this) return true;
+        if (!(o instanceof com.baeldung.lombok.equalsandhashcode.inheritance.Manager)) return false;
+        final com.baeldung.lombok.equalsandhashcode.inheritance.Manager other = (com.baeldung.lombok.equalsandhashcode.inheritance.Manager) o;
+        if (!other.canEqual((Object) this)) return false;
+        if (!super.equals(o)) return false;
+        if (this.getUid() != other.getUid()) return false;
+        final Object this$departmentName = this.getDepartmentName();
+        final Object other$departmentName = other.getDepartmentName();
+        if (this$departmentName == null ? other$departmentName != null : !this$departmentName.equals(other$departmentName)) return false;
+        return true;
+    }
+
+    public int hashCode() {
+        final int PRIME = 59;
+        int result = super.hashCode();
+        result = result * PRIME + this.getUid();
+        final Object $departmentName = this.getDepartmentName();
+        result = result * PRIME + ($departmentName == null ? 43 : $departmentName.hashCode());
+        return result;
+    }
+}
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/inheritance/ManagerV2.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/inheritance/ManagerV2.java
new file mode 100644
index 0000000000..b5bdfd0891
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/equalsandhashcode/inheritance/ManagerV2.java
@@ -0,0 +1,19 @@
+package com.baeldung.lombok.equalsandhashcode.inheritance;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = false)
+public class ManagerV2 extends Employee {
+    private String departmentName;
+    private int uid;
+
+    public ManagerV2(String departmentName, int uid, String name, int id, int age) {
+        super(name, id, age);
+        this.departmentName = departmentName;
+        this.uid = uid;
+    }
+}
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/standardexception/CustomException.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/standardexception/CustomException.java
new file mode 100644
index 0000000000..bee85b3398
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/standardexception/CustomException.java
@@ -0,0 +1,7 @@
+package com.baeldung.lombok.standardexception;
+
+import lombok.experimental.StandardException;
+
+@StandardException
+public class CustomException extends NumberFormatException {
+}
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/standardexception/CustomNumberFormatException.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/standardexception/CustomNumberFormatException.java
new file mode 100644
index 0000000000..fbd98cac16
--- /dev/null
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/standardexception/CustomNumberFormatException.java
@@ -0,0 +1,11 @@
+package com.baeldung.lombok.standardexception;
+
+public class CustomNumberFormatException extends NumberFormatException {
+    public CustomNumberFormatException() {
+        super();
+    }
+
+    public CustomNumberFormatException(String s) {
+        super(s);
+    }
+}
\ No newline at end of file
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/ValExample.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/ValExample.java
index b7ecd95fa8..f436ef81dd 100644
--- a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/ValExample.java
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/ValExample.java
@@ -1,7 +1,6 @@
 package com.baeldung.lombok.valvar;
 
 import lombok.val;
-import lombok.var;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/VarExample.java b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/VarExample.java
index 6fabf66590..138264db09 100644
--- a/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/VarExample.java
+++ b/lombok-modules/lombok-2/src/main/java/com/baeldung/lombok/valvar/VarExample.java
@@ -1,6 +1,5 @@
 package com.baeldung.lombok.valvar;
 
-import lombok.var;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/spring-core-4/src/test/java/com/baeldung/lombok/ApologizeServiceAutowiringIntegrationTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/ApologizeServiceAutowiringIntegrationTest.java
similarity index 100%
rename from spring-core-4/src/test/java/com/baeldung/lombok/ApologizeServiceAutowiringIntegrationTest.java
rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/ApologizeServiceAutowiringIntegrationTest.java
diff --git a/spring-core-4/src/test/java/com/baeldung/lombok/ApologizeServiceIntegrationTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/ApologizeServiceIntegrationTest.java
similarity index 100%
rename from spring-core-4/src/test/java/com/baeldung/lombok/ApologizeServiceIntegrationTest.java
rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/ApologizeServiceIntegrationTest.java
diff --git a/spring-core-4/src/test/java/com/baeldung/lombok/FarewellAutowiringIntegrationTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/FarewellAutowiringIntegrationTest.java
similarity index 100%
rename from spring-core-4/src/test/java/com/baeldung/lombok/FarewellAutowiringIntegrationTest.java
rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/FarewellAutowiringIntegrationTest.java
diff --git a/spring-core-4/src/test/java/com/baeldung/lombok/FarewellServiceIntegrationTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/FarewellServiceIntegrationTest.java
similarity index 100%
rename from spring-core-4/src/test/java/com/baeldung/lombok/FarewellServiceIntegrationTest.java
rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/FarewellServiceIntegrationTest.java
diff --git a/spring-core-4/src/test/java/com/baeldung/lombok/GreetingServiceIntegrationTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/GreetingServiceIntegrationTest.java
similarity index 100%
rename from spring-core-4/src/test/java/com/baeldung/lombok/GreetingServiceIntegrationTest.java
rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/GreetingServiceIntegrationTest.java
diff --git a/spring-core-4/src/test/java/com/baeldung/lombok/TestConfig.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/TestConfig.java
similarity index 100%
rename from spring-core-4/src/test/java/com/baeldung/lombok/TestConfig.java
rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/TestConfig.java
diff --git a/spring-core-4/src/test/java/com/baeldung/lombok/ThankingServiceAutowiringIntegrationTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/ThankingServiceAutowiringIntegrationTest.java
similarity index 100%
rename from spring-core-4/src/test/java/com/baeldung/lombok/ThankingServiceAutowiringIntegrationTest.java
rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/ThankingServiceAutowiringIntegrationTest.java
diff --git a/spring-core-4/src/test/java/com/baeldung/lombok/ThankingServiceIntegrationTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/ThankingServiceIntegrationTest.java
similarity index 100%
rename from spring-core-4/src/test/java/com/baeldung/lombok/ThankingServiceIntegrationTest.java
rename to lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/ThankingServiceIntegrationTest.java
diff --git a/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/accessors/AccessorsUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/accessors/AccessorsUnitTest.java
index 04f38bfc32..a1f54d6b4a 100644
--- a/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/accessors/AccessorsUnitTest.java
+++ b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/accessors/AccessorsUnitTest.java
@@ -1,26 +1,36 @@
 package com.baeldung.lombok.accessors;
 
-import com.baeldung.lombok.accessors.model.*;
+import com.baeldung.lombok.accessors.model.ChainedAccount;
+import com.baeldung.lombok.accessors.model.ChainedFluentAccount;
+import com.baeldung.lombok.accessors.model.FinalAccount;
+import com.baeldung.lombok.accessors.model.FinalChainedFluentAccount;
+import com.baeldung.lombok.accessors.model.FluentAccount;
+import com.baeldung.lombok.accessors.model.PrefixedAccount;
+import com.baeldung.lombok.accessors.model.PrefixedFluentAccount;
+import com.baeldung.lombok.accessors.model.StandardAccount;
 import org.junit.Test;
 
+import java.lang.reflect.Modifier;
 import java.math.BigDecimal;
+import java.util.Arrays;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class AccessorsUnitTest {
 
     @Test
-    public void givenBasicAccount_thenUseBasicAccessors() {
-        BasicAccount account = new BasicAccount();
-        account.setName("Basic Accessors");
+    public void whenStandardAccount_thenHaveStandardAccessors() {
+        StandardAccount account = new StandardAccount();
+        account.setName("Standard Accessors");
         account.setBalance(BigDecimal.TEN);
 
-        assertEquals("Basic Accessors", account.getName());
+        assertEquals("Standard Accessors", account.getName());
         assertEquals(BigDecimal.TEN, account.getBalance());
     }
 
     @Test
-    public void givenFluentAccount_thenUseFluentAccessors() {
+    public void whenFluentAccount_thenHaveFluentAccessors() {
         FluentAccount account = new FluentAccount();
         account.name("Fluent Account");
         account.balance(BigDecimal.TEN);
@@ -30,7 +40,7 @@ public class AccessorsUnitTest {
     }
 
     @Test
-    public void givenChainedAccount_thenUseChainedAccessors() {
+    public void whenChainedAccount_thenHaveChainedAccessors() {
         ChainedAccount account = new ChainedAccount();
         account.setName("Chained Account").setBalance(BigDecimal.TEN);
 
@@ -39,7 +49,7 @@ public class AccessorsUnitTest {
     }
 
     @Test
-    public void givenChainedFluentAccount_thenUseChainedFluentAccessors() {
+    public void whenChainedFluentAccount_thenHaveChainedFluentAccessors() {
         ChainedFluentAccount account = new ChainedFluentAccount()
           .name("Fluent Account")
           .balance(BigDecimal.TEN);
@@ -49,7 +59,7 @@ public class AccessorsUnitTest {
     }
 
     @Test
-    public void givenPrefixedAccount_thenRemovePrefixFromAccessors() {
+    public void whenPrefixedAccount_thenRemovePrefixFromAccessors() {
         PrefixedAccount account = new PrefixedAccount();
         account.setName("Prefixed Fields");
         account.setBalance(BigDecimal.TEN);
@@ -61,7 +71,7 @@ public class AccessorsUnitTest {
     }
 
     @Test
-    public void givenPrefixedFluentAccount_thenRemovePrefixFromAccessors() {
+    public void whenPrefixedFluentAccount_thenRemovePrefixFromAccessors() {
         PrefixedFluentAccount account = new PrefixedFluentAccount();
         account
           .name("Prefixed Fluent Fields")
@@ -71,4 +81,38 @@ public class AccessorsUnitTest {
         assertEquals(BigDecimal.TEN, account.balance());
     }
 
-}
+    @Test
+    public void whenFinalAccount_thenHaveFinalAccessors() {
+        FinalAccount account = new FinalAccount();
+        account.setName("Final Account");
+        account.setBalance(BigDecimal.TEN);
+
+        assertEquals("Final Account", account.getName());
+        assertEquals(BigDecimal.TEN, account.getBalance());
+
+        //verify if all getters and setters are final methods
+        boolean getterSettersAreFinal = Arrays.stream(FinalAccount.class.getMethods())
+          .filter(method -> method.getName().matches("^(get|set)(Name|Balance)$"))
+          .allMatch(method -> Modifier.isFinal(method.getModifiers()));
+        assertTrue(getterSettersAreFinal);
+
+    }
+
+    @Test
+    public void whenFinalChainedFluentAccount_thenHaveFinalAccessors() {
+        FinalChainedFluentAccount account = new FinalChainedFluentAccount();
+        account
+          .name("Final Chained Fluent Account")
+          .balance(BigDecimal.TEN);
+
+        assertEquals("Final Chained Fluent Account", account.name());
+        assertEquals(BigDecimal.TEN, account.balance());
+
+        //verify if all getters and setters are final methods
+        boolean getterSettersAreFinal = Arrays.stream(FinalAccount.class.getMethods())
+          .filter(method -> method.getName().matches("^(name|balance)$"))
+          .allMatch(method -> Modifier.isFinal(method.getModifiers()));
+        assertTrue(getterSettersAreFinal);
+    }
+
+}
\ No newline at end of file
diff --git a/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/EqualsAndHashCodeUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/EqualsAndHashCodeUnitTest.java
new file mode 100644
index 0000000000..614e94ea59
--- /dev/null
+++ b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/EqualsAndHashCodeUnitTest.java
@@ -0,0 +1,20 @@
+package com.baeldung.lombok.equalsandhashcode;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+public class EqualsAndHashCodeUnitTest {
+
+    @Test
+    public void whenUsingEqualsAndHashCodeOnClassLevel_thenTwoObjectsAreEqualAndHaveSameHashCodeIfAllFieldsAreSame() {
+        Employee employee = new Employee("Nimi", 15, 22);
+        Employee employeeTwo = new Employee("Nimi", 15, 22);
+        Employee employeeThree = new Employee("Mannat", 15, 22);
+        assertEquals(employee, employeeTwo);
+        assertNotEquals(employee, employeeThree);
+        assertEquals(employee.hashCode(), employeeTwo.hashCode());
+        assertNotEquals(employee.hashCode(), employeeThree.hashCode());
+    }
+}
diff --git a/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/commonissue/EqualsAndHashCodeUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/commonissue/EqualsAndHashCodeUnitTest.java
new file mode 100644
index 0000000000..207e4e0636
--- /dev/null
+++ b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/commonissue/EqualsAndHashCodeUnitTest.java
@@ -0,0 +1,34 @@
+package com.baeldung.lombok.equalsandhashcode.commonissue;
+
+import org.junit.Test;
+
+public class EqualsAndHashCodeUnitTest {
+
+    @Test(expected = StackOverflowError.class)
+    public void whenUsingEqualsAndHashInObjectWithCircularDependency_thenCallingEqualsAndHasCodeWillThrowStackOverFlowError() {
+        Manager manager = new Manager("Mannat", null);
+
+        Employee employee = new Employee("Nimi", 15, 22, manager);
+
+        manager.setAssistantManager(employee);
+
+        employee.setManager(manager);
+
+        int hash = employee.hashCode();
+
+    }
+
+    @Test
+    public void whenUsingEqualsAndHashInObjectAndExcludingCircularDependencyField_thenNoStackOverFlowError() {
+        ManagerV2 manager = new ManagerV2("Mannat", null);
+
+        EmployeeV2 employee = new EmployeeV2("Nimi", 15, 22, manager);
+
+        manager.setAssistantManager(employee);
+
+        employee.setManager(manager);
+
+        int hash = employee.hashCode();
+
+    }
+}
diff --git a/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/exclude/classlevel/EqualsAndHashCodeUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/exclude/classlevel/EqualsAndHashCodeUnitTest.java
new file mode 100644
index 0000000000..be086ff7df
--- /dev/null
+++ b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/exclude/classlevel/EqualsAndHashCodeUnitTest.java
@@ -0,0 +1,17 @@
+package com.baeldung.lombok.equalsandhashcode.exclude.classlevel;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class EqualsAndHashCodeUnitTest {
+
+    @Test
+    public void whenUsingEqualsAndHashCodeOnClassLevelAndExcludingFields_thenTwoObjectsAreEqualAndHaveSameHashCodeEvenIfExcludedFieldsAreNotSame() {
+        Employee employee = new Employee("Nimi", 15, 22);
+        Employee employeeTwo = new Employee("Nimi", 17, 21);
+
+        assertEquals(employee, employeeTwo);
+        assertEquals(employee.hashCode(), employeeTwo.hashCode());
+    }
+}
diff --git a/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/exclude/fieldLevel/EqualsAndHashCodeUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/exclude/fieldLevel/EqualsAndHashCodeUnitTest.java
new file mode 100644
index 0000000000..832b188509
--- /dev/null
+++ b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/exclude/fieldLevel/EqualsAndHashCodeUnitTest.java
@@ -0,0 +1,18 @@
+package com.baeldung.lombok.equalsandhashcode.exclude.fieldLevel;
+
+import com.baeldung.lombok.equalsandhashcode.exclude.fieldlevel.Employee;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class EqualsAndHashCodeUnitTest {
+
+    @Test
+    public void whenUsingEqualsAndHashCodeWithExcludingFields_thenTwoObjectsAreEqualAndHaveSameHashCodeEvenIfExcludedFieldsAreNotSame() {
+        Employee employee = new Employee("Nimi", 15, 22);
+        Employee employeeTwo = new Employee("Nimi", 17, 21);
+
+        assertEquals(employee, employeeTwo);
+        assertEquals(employee.hashCode(), employeeTwo.hashCode());
+    }
+}
diff --git a/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/include/classlevel/EqualsAndHashCodeUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/include/classlevel/EqualsAndHashCodeUnitTest.java
new file mode 100644
index 0000000000..1641966fd2
--- /dev/null
+++ b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/include/classlevel/EqualsAndHashCodeUnitTest.java
@@ -0,0 +1,21 @@
+package com.baeldung.lombok.equalsandhashcode.include.classlevel;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class EqualsAndHashCodeUnitTest {
+
+    @Test
+    public void whenUsingEqualsAndHashCodeOnClassLevelAndIncludeFields_thenTwoObjectsAreEqualAndHaveSameHashCodeIfIncludedFieldsAreSame() {
+        Employee employee = new Employee("Nimi", 15, 22);
+        Employee employeeTwo = new Employee("Nimi", 15, 22);
+        Employee employeeThree = new Employee("Nimi", 15, 23);
+
+        assertEquals(employee, employeeTwo);
+        assertEquals(employee, employeeThree);
+
+        assertEquals(employee.hashCode(), employeeTwo.hashCode());
+        assertEquals(employee.hashCode(), employeeThree.hashCode());
+    }
+}
diff --git a/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/include/fieldlevel/EqualsAndHashCodeUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/include/fieldlevel/EqualsAndHashCodeUnitTest.java
new file mode 100644
index 0000000000..dcf6123d2a
--- /dev/null
+++ b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/include/fieldlevel/EqualsAndHashCodeUnitTest.java
@@ -0,0 +1,21 @@
+package com.baeldung.lombok.equalsandhashcode.include.fieldlevel;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class EqualsAndHashCodeUnitTest {
+
+    @Test
+    public void whenUsingEqualsAndHashCodeOnFieldLevel_thenTwoObjectsAreEqualAndHaveSameHashCodeIfIncludedFieldsAreSame() {
+        Employee employee = new Employee("Nimi", 15, 22);
+        Employee employeeTwo = new Employee("Nimi", 15, 22);
+        Employee employeeThree = new Employee("Nimi", 15, 23);
+
+        assertEquals(employee, employeeTwo);
+        assertEquals(employee, employeeThree);
+
+        assertEquals(employee.hashCode(), employeeTwo.hashCode());
+        assertEquals(employee.hashCode(), employeeThree.hashCode());
+    }
+}
diff --git a/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/include/methodlevel/EqualsAndHashCodeUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/include/methodlevel/EqualsAndHashCodeUnitTest.java
new file mode 100644
index 0000000000..79d673b4a4
--- /dev/null
+++ b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/include/methodlevel/EqualsAndHashCodeUnitTest.java
@@ -0,0 +1,22 @@
+package com.baeldung.lombok.equalsandhashcode.include.methodlevel;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+public class EqualsAndHashCodeUnitTest {
+
+    @Test
+    public void whenUsingEqualsAndHashCodeOnMethodLevel_thenTwoObjectsAreEqualAndHaveSameHashCodeIfMethodsReturnSameValue() {
+        Employee employee = new Employee("Nimi", 15, 22);
+        Employee employeeTwo = new Employee("Nimi", 15, 22);
+        Employee employeeThree = new Employee("Nimi", 15, 23);
+
+        assertEquals(employee, employeeTwo);
+        assertNotEquals(employee, employeeThree);
+
+        assertEquals(employee.hashCode(), employeeTwo.hashCode());
+        assertNotEquals(employee.hashCode(), employeeThree.hashCode());
+    }
+}
diff --git a/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/inheritance/EqualsAndHashCodeUnitTest.java b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/inheritance/EqualsAndHashCodeUnitTest.java
new file mode 100644
index 0000000000..abf71fe83f
--- /dev/null
+++ b/lombok-modules/lombok-2/src/test/java/com/baeldung/lombok/equalsandhashcode/inheritance/EqualsAndHashCodeUnitTest.java
@@ -0,0 +1,29 @@
+package com.baeldung.lombok.equalsandhashcode.inheritance;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+public class EqualsAndHashCodeUnitTest {
+
+    @Test
+    public void whenUsingEqualsAndHashCodeAndCallSuperIsTrue_thenTwoObjectsAreEqualAndHaveSameHashCodeIfAllFieldsIncludingParentsFieldsAreSame() {
+        Manager manager = new Manager("Opto", 444, "Nimi", 15, 22);
+        Manager managerTwo = new Manager("Opto", 444, "Nimi", 15, 22);
+        Manager managerThree = new Manager("Opto", 444, "Nimi", 15, 23);
+
+        assertEquals(manager, managerTwo);
+        assertNotEquals(managerTwo, managerThree);
+
+    }
+
+    @Test
+    public void whenUsingEqualsAndHashCodeAndCallSuperIsFalse_thenTwoObjectsAreEqualAndHaveSameHashCodeEvenIfAllParentsFieldsAreNotSame() {
+        ManagerV2 manager = new ManagerV2("Opto", 444, "Nimi", 15, 22);
+        ManagerV2 managerTwo = new ManagerV2("Opto", 444, "Nimi", 15, 22);
+        ManagerV2 managerThree = new ManagerV2("Opto", 444, "Nimi", 14, 21);
+        assertEquals(manager, managerTwo);
+        assertEquals(managerTwo, managerThree);
+    }
+}
diff --git a/lombok-modules/lombok-custom/pom.xml b/lombok-modules/lombok-custom/pom.xml
index c119900c8a..1f7f630772 100644
--- a/lombok-modules/lombok-custom/pom.xml
+++ b/lombok-modules/lombok-custom/pom.xml
@@ -53,11 +53,27 @@
         </profile>
     </profiles>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <!-- lombok: https://projectlombok.org/changelog.html -->
         <lombok.version>1.14.8</lombok.version>
         <metainf-services.version>1.8</metainf-services.version>
         <eclipse.jdt.core.version>3.3.0-v_771</eclipse.jdt.core.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/lombok-modules/lombok/pom.xml b/lombok-modules/lombok/pom.xml
index 1be22f0bc2..57b2a5a999 100644
--- a/lombok-modules/lombok/pom.xml
+++ b/lombok-modules/lombok/pom.xml
@@ -40,41 +40,19 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.projectlombok</groupId>
-                <artifactId>lombok-maven-plugin</artifactId>
-                <version>${delombok-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>delombok</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>delombok</goal>
-                        </goals>
-                        <configuration>
-                            <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
-                            <outputDirectory>${project.build.directory}/delombok</outputDirectory>
-                            <addOutputDirectory>false</addOutputDirectory>
-                            <formatPreferences>
-                                <javaLangAsFQN>skip</javaLangAsFQN>
-                            </formatPreferences>
-                            <verbose>false</verbose>
-                        </configuration>
-                    </execution>
-                    <!-- This is for delomboking also your tests sources. -->
-                    <!--<execution> <id>test-delombok</id> -->
-                    <!-- <phase>generate-test-sources</phase> <goals> <goal>testDelombok</goal> </goals> -->
-                    <!--<configuration> <verbose>false</verbose> </configuration> </execution> -->
-                </executions>
-            </plugin>
-        </plugins>
     </build>
 
     <properties>
+        <lombok.version>edge-SNAPSHOT</lombok.version>
         <hibernate-jpa-2.1-api.version>1.0.0.Final</hibernate-jpa-2.1-api.version>
         <delombok-maven-plugin.version>1.18.20.0</delombok-maven-plugin.version>
         <annotations.version>23.0.0</annotations.version>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>projectlombok.org</id>
+            <url>https://projectlombok.org/edge-releases</url>
+        </repository>
+    </repositories>
 </project>
\ No newline at end of file
diff --git a/lombok-modules/pom.xml b/lombok-modules/pom.xml
index 7ca303af9d..f2bfdb51c0 100644
--- a/lombok-modules/pom.xml
+++ b/lombok-modules/pom.xml
@@ -18,10 +18,21 @@
     <modules>
         <module>lombok</module>
         <module>lombok-2</module>
-        <module>lombok-custom</module>
+<!--        <module>lombok-custom</module>--> <!-- this module uses legacy jdk-8 features (tools.jar), so can't upgrade to jdk9 or above-->
     </modules>
 
     <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+        </plugins>
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -32,4 +43,9 @@
         </pluginManagement>
     </build>
 
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/mapstruct/README.md b/mapstruct/README.md
index 384bcbaa14..46a9f8b213 100644
--- a/mapstruct/README.md
+++ b/mapstruct/README.md
@@ -9,3 +9,4 @@ This module contains articles about MapStruct.
 - [Using Multiple Source Objects with MapStruct](https://www.baeldung.com/mapstruct-multiple-source-objects)
 - [Ignoring Unmapped Properties with MapStruct](https://www.baeldung.com/mapstruct-ignore-unmapped-properties)
 - [Mapping Collections with MapStruct](https://www.baeldung.com/java-mapstruct-mapping-collections)
+- [Use Mapper in Another Mapper with Mapstruct and Java](https://www.baeldung.com/java-mapstruct-nested-mapping)
diff --git a/mapstruct/src/main/java/com/baeldung/dto/ArticleDTO.java b/mapstruct/src/main/java/com/baeldung/dto/ArticleDTO.java
new file mode 100644
index 0000000000..708167de94
--- /dev/null
+++ b/mapstruct/src/main/java/com/baeldung/dto/ArticleDTO.java
@@ -0,0 +1,12 @@
+package com.baeldung.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ArticleDTO {
+    private int id;
+    private String name;
+    private PersonDTO author;
+}
diff --git a/mapstruct/src/main/java/com/baeldung/entity/Article.java b/mapstruct/src/main/java/com/baeldung/entity/Article.java
new file mode 100644
index 0000000000..4aff8f4166
--- /dev/null
+++ b/mapstruct/src/main/java/com/baeldung/entity/Article.java
@@ -0,0 +1,12 @@
+package com.baeldung.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class Article {
+    private int id;
+    private String name;
+    private Person author;
+}
diff --git a/mapstruct/src/main/java/com/baeldung/mapper/ArticleMapper.java b/mapstruct/src/main/java/com/baeldung/mapper/ArticleMapper.java
new file mode 100644
index 0000000000..b5b47f6b3b
--- /dev/null
+++ b/mapstruct/src/main/java/com/baeldung/mapper/ArticleMapper.java
@@ -0,0 +1,20 @@
+package com.baeldung.mapper;
+
+import com.baeldung.dto.ArticleDTO;
+import com.baeldung.dto.PersonDTO;
+import com.baeldung.entity.Article;
+import com.baeldung.entity.Person;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+@Mapper
+public interface ArticleMapper {
+    
+    ArticleMapper INSTANCE = Mappers.getMapper(ArticleMapper.class);
+    
+    ArticleDTO articleToArticleDto(Article article);
+
+    default PersonDTO personToPersonDto(Person person) {
+        return Mappers.getMapper(PersonMapper.class).personToPersonDTO(person);
+    }
+}
diff --git a/mapstruct/src/main/java/com/baeldung/mapper/ArticleUsingPersonMapper.java b/mapstruct/src/main/java/com/baeldung/mapper/ArticleUsingPersonMapper.java
new file mode 100644
index 0000000000..c1ea0797ed
--- /dev/null
+++ b/mapstruct/src/main/java/com/baeldung/mapper/ArticleUsingPersonMapper.java
@@ -0,0 +1,16 @@
+package com.baeldung.mapper;
+
+import com.baeldung.dto.ArticleDTO;
+import com.baeldung.dto.PersonDTO;
+import com.baeldung.entity.Article;
+import com.baeldung.entity.Person;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(uses = PersonMapper.class)
+public interface ArticleUsingPersonMapper {
+
+    ArticleUsingPersonMapper INSTANCE = Mappers.getMapper(ArticleUsingPersonMapper.class);
+
+    ArticleDTO articleToArticleDto(Article article);
+}
diff --git a/mapstruct/src/test/java/com/baeldung/mapper/ArticleMapperUnitTest.java b/mapstruct/src/test/java/com/baeldung/mapper/ArticleMapperUnitTest.java
new file mode 100644
index 0000000000..2470915a01
--- /dev/null
+++ b/mapstruct/src/test/java/com/baeldung/mapper/ArticleMapperUnitTest.java
@@ -0,0 +1,49 @@
+package com.baeldung.mapper;
+
+import com.baeldung.dto.ArticleDTO;
+import com.baeldung.dto.CarDTO;
+import com.baeldung.entity.Article;
+import com.baeldung.entity.Car;
+import com.baeldung.entity.Person;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class ArticleMapperUnitTest {
+
+    @Test
+    public void givenArticle_whenMaps_thenProducesCorrectDto() {
+        
+        Article entity  = new Article();
+        entity.setId(1);
+        entity.setName("Mapstruct Mapping");
+        Person author = new Person();
+        author.setId("1");
+        author.setName("John");
+        entity.setAuthor(author);
+
+        ArticleDTO articleDTO = ArticleMapper.INSTANCE.articleToArticleDto(entity);
+
+        assertEquals(articleDTO.getId(), entity.getId());
+        assertEquals(articleDTO.getName(), entity.getName());
+        assertEquals(articleDTO.getAuthor().getName(), entity.getAuthor().getName());
+    }
+
+    @Test
+    public void givenArticle_whenMapsWithUses_thenProducesCorrectDto() {
+
+        Article entity  = new Article();
+        entity.setId(1);
+        entity.setName("Mapstruct Mapping");
+        Person author = new Person();
+        author.setId("1");
+        author.setName("John");
+        entity.setAuthor(author);
+
+        ArticleDTO articleDTO = ArticleUsingPersonMapper.INSTANCE.articleToArticleDto(entity);
+
+        assertEquals(articleDTO.getId(), entity.getId());
+        assertEquals(articleDTO.getName(), entity.getName());
+        assertEquals(articleDTO.getAuthor().getName(), entity.getAuthor().getName());
+    }
+}
diff --git a/maven-modules/animal-sniffer-mvn-plugin/pom.xml b/maven-modules/animal-sniffer-mvn-plugin/pom.xml
index 1756adc27d..0b508651af 100644
--- a/maven-modules/animal-sniffer-mvn-plugin/pom.xml
+++ b/maven-modules/animal-sniffer-mvn-plugin/pom.xml
@@ -42,7 +42,7 @@
     </build>
 
     <properties>
-        <animal-sniffer-maven-plugin.version>1.16</animal-sniffer-maven-plugin.version>
+        <animal-sniffer-maven-plugin.version>1.22</animal-sniffer-maven-plugin.version>
         <org.codehaus.mojo.signature.java16.version>1.0</org.codehaus.mojo.signature.java16.version>
     </properties>
 
diff --git a/maven-modules/dependency-exclusion/README.md b/maven-modules/dependency-exclusion/README.md
new file mode 100644
index 0000000000..e9eee1be4d
--- /dev/null
+++ b/maven-modules/dependency-exclusion/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Exclude a Dependency in a Maven Plugin](https://www.baeldung.com/mvn-plugin-dependency-exclusion)
diff --git a/dependeny-exclusion/core-java-exclusions/pom.xml b/maven-modules/dependency-exclusion/core-java-exclusions/pom.xml
similarity index 80%
rename from dependeny-exclusion/core-java-exclusions/pom.xml
rename to maven-modules/dependency-exclusion/core-java-exclusions/pom.xml
index cf1f6d1e1b..9fd09f83e2 100644
--- a/dependeny-exclusion/core-java-exclusions/pom.xml
+++ b/maven-modules/dependency-exclusion/core-java-exclusions/pom.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         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="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>core-java-exclusions</artifactId>
-    <version>0.0.0-SNAPSHOT</version>
     <name>core-java-exclusions</name>
     <packaging>jar</packaging>
 
@@ -14,6 +13,15 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -30,24 +38,17 @@
                         </property>
                     </properties>
                 </configuration>
-                <dependencies>
+                <!-- Activate this for understanding the article only -->
+                <!-- <dependencies>
                     <dependency>
-                        <!-- Deactivate JUnit 4.7 engine by overriding it with an empty dummy -->
+                        Deactivate JUnit 4.7 engine by overriding it with an empty dummy
                         <groupId>org.apache.maven.surefire</groupId>
                         <artifactId>surefire-junit47</artifactId>
                         <version>dummy</version>
                     </dependency>
-                </dependencies>
+                </dependencies> -->
             </plugin>
         </plugins>
     </build>
 
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
 </project>
diff --git a/dependeny-exclusion/core-java-exclusions/src/test/java/com/sample/project/tests/ExcludeDirectDependencyUnitTest.java b/maven-modules/dependency-exclusion/core-java-exclusions/src/test/java/com/sample/project/tests/ExcludeDirectDependencyUnitTest.java
similarity index 100%
rename from dependeny-exclusion/core-java-exclusions/src/test/java/com/sample/project/tests/ExcludeDirectDependencyUnitTest.java
rename to maven-modules/dependency-exclusion/core-java-exclusions/src/test/java/com/sample/project/tests/ExcludeDirectDependencyUnitTest.java
diff --git a/maven-modules/dependency-exclusion/dummy-surefire-junit47/pom.xml b/maven-modules/dependency-exclusion/dummy-surefire-junit47/pom.xml
new file mode 100644
index 0000000000..93c5f7591f
--- /dev/null
+++ b/maven-modules/dependency-exclusion/dummy-surefire-junit47/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    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>
+    <groupId>org.apache.maven.surefire</groupId>
+    <artifactId>surefire-junit47</artifactId>
+    <version>dummy</version>
+
+    <parent>
+        <groupId>com.baeldung.dependency-exclusion</groupId>
+        <artifactId>dependency-exclusion</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+</project>
diff --git a/dependeny-exclusion/pom.xml b/maven-modules/dependency-exclusion/pom.xml
similarity index 96%
rename from dependeny-exclusion/pom.xml
rename to maven-modules/dependency-exclusion/pom.xml
index ac83cc161a..13de16a57c 100644
--- a/dependeny-exclusion/pom.xml
+++ b/maven-modules/dependency-exclusion/pom.xml
@@ -10,9 +10,8 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
+        <artifactId>maven-modules</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
     </parent>
 
     <properties>
diff --git a/maven-modules/maven-integration-test/pom.xml b/maven-modules/maven-integration-test/pom.xml
index 56c243e3c5..4483bb2d55 100644
--- a/maven-modules/maven-integration-test/pom.xml
+++ b/maven-modules/maven-integration-test/pom.xml
@@ -267,6 +267,7 @@
     </profiles>
 
     <properties>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
         <maven.resources.version>3.0.2</maven.resources.version>
         <maven.compiler.version>3.8.0</maven.compiler.version>
         <maven.failsafe.version>2.22.0</maven.failsafe.version>
diff --git a/maven-modules/maven-plugins/jaxws/pom.xml b/maven-modules/maven-plugins/jaxws/pom.xml
index 5783907140..a7c4740acb 100644
--- a/maven-modules/maven-plugins/jaxws/pom.xml
+++ b/maven-modules/maven-plugins/jaxws/pom.xml
@@ -11,6 +11,36 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
+    <dependencies>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.3.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-ri</artifactId>
+            <version>2.3.0</version>
+            <type>pom</type>
+        </dependency>
+    </dependencies>
+
     <build>
         <plugins>
             <plugin>
diff --git a/maven-modules/maven-polyglot/maven-polyglot-json-extension/pom.xml b/maven-modules/maven-polyglot/maven-polyglot-json-extension/pom.xml
index ade8974e0e..280b7a7c7b 100644
--- a/maven-modules/maven-polyglot/maven-polyglot-json-extension/pom.xml
+++ b/maven-modules/maven-polyglot/maven-polyglot-json-extension/pom.xml
@@ -48,7 +48,7 @@
 
     <properties>
         <maven-core.version>3.5.4</maven-core.version>
-        <plexus.component.version>1.7.1</plexus.component.version>
+        <plexus.component.version>2.1.1</plexus.component.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/maven-modules/maven-reactor/README.md b/maven-modules/maven-reactor/README.md
new file mode 100644
index 0000000000..745ced5e82
--- /dev/null
+++ b/maven-modules/maven-reactor/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Maven Reactor](https://www.baeldung.com/java-maven-reactor)
diff --git a/maven-modules/maven-reactor/patient-data/pom.xml b/maven-modules/maven-reactor/patient-data/pom.xml
new file mode 100644
index 0000000000..9526549c48
--- /dev/null
+++ b/maven-modules/maven-reactor/patient-data/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  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>patient-data</artifactId>
+  <name>patient-data</name>
+  <parent>
+    <groupId>com.baeldung</groupId>
+    <artifactId>maven-reactor</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>com.baeldung</groupId>
+      <artifactId>patient-domain</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/maven-modules/maven-reactor/patient-data/src/Main.java b/maven-modules/maven-reactor/patient-data/src/Main.java
new file mode 100644
index 0000000000..69420efcac
--- /dev/null
+++ b/maven-modules/maven-reactor/patient-data/src/Main.java
@@ -0,0 +1,6 @@
+public class Main {
+
+  public static void main(String[] args) {
+    System.out.println("Hello world!");
+  }
+}
\ No newline at end of file
diff --git a/maven-modules/maven-reactor/patient-domain/pom.xml b/maven-modules/maven-reactor/patient-domain/pom.xml
new file mode 100644
index 0000000000..5cb5abe81e
--- /dev/null
+++ b/maven-modules/maven-reactor/patient-domain/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  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>patient-domain</artifactId>
+  <name>patient-domain</name>
+  <parent>
+    <groupId>com.baeldung</groupId>
+    <artifactId>maven-reactor</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+</project>
\ No newline at end of file
diff --git a/maven-modules/maven-reactor/patient-domain/src/Main.java b/maven-modules/maven-reactor/patient-domain/src/Main.java
new file mode 100644
index 0000000000..69420efcac
--- /dev/null
+++ b/maven-modules/maven-reactor/patient-domain/src/Main.java
@@ -0,0 +1,6 @@
+public class Main {
+
+  public static void main(String[] args) {
+    System.out.println("Hello world!");
+  }
+}
\ No newline at end of file
diff --git a/maven-modules/maven-reactor/patient-web/pom.xml b/maven-modules/maven-reactor/patient-web/pom.xml
new file mode 100644
index 0000000000..68d797ec63
--- /dev/null
+++ b/maven-modules/maven-reactor/patient-web/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  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>patient-web</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <name>patient-web</name>
+  <parent>
+    <groupId>com.baeldung</groupId>
+    <artifactId>maven-reactor</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <dependencies>
+    <dependency>
+      <groupId>com.baeldung</groupId>
+      <artifactId>patient-data</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.baeldung</groupId>
+      <artifactId>patient-domain</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/maven-modules/maven-reactor/patient-web/src/Main.java b/maven-modules/maven-reactor/patient-web/src/Main.java
new file mode 100644
index 0000000000..69420efcac
--- /dev/null
+++ b/maven-modules/maven-reactor/patient-web/src/Main.java
@@ -0,0 +1,6 @@
+public class Main {
+
+  public static void main(String[] args) {
+    System.out.println("Hello world!");
+  }
+}
\ No newline at end of file
diff --git a/maven-modules/maven-reactor/pom.xml b/maven-modules/maven-reactor/pom.xml
new file mode 100644
index 0000000000..a41fbd7374
--- /dev/null
+++ b/maven-modules/maven-reactor/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  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>maven-reactor</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <name>maven-reactor</name>
+  <packaging>pom</packaging>
+  <description>Sample multi-module project to explain maven reactor</description>
+  <parent>
+    <groupId>com.baeldung</groupId>
+    <artifactId>maven-modules</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+  <modules>
+    <module>patient-web</module>
+    <module>patient-data</module>
+    <module>patient-domain</module>
+  </modules>
+
+</project>
\ No newline at end of file
diff --git a/maven-modules/pom.xml b/maven-modules/pom.xml
index 412e26f041..f7bba3a8ff 100644
--- a/maven-modules/pom.xml
+++ b/maven-modules/pom.xml
@@ -16,32 +16,35 @@
 
     <modules>
         <module>animal-sniffer-mvn-plugin</module>
+        <module>compiler-plugin-java-9</module>
+        <module>dependency-exclusion</module>
+        <module>host-maven-repo-example</module>
         <module>maven-archetype</module>
-        <!-- <module>compiler-plugin-java-9</module> --> <!-- We haven't upgraded to java 9. -->
+        <module>maven-builder-plugin</module>
+        <module>maven-classifier</module>
         <module>maven-copy-files</module>
         <module>maven-custom-plugin</module>
         <module>maven-exec-plugin</module>
-        <!-- <module>maven-generate-war</module> --> <!-- We haven't upgraded to java 11. -->
+        <module>maven-generate-war</module>
         <module>maven-integration-test</module>
         <module>maven-multi-source</module>
+        <module>maven-parent-pom-resolution</module>
         <module>maven-plugins</module>
         <module>maven-polyglot</module>
+        <module>maven-printing-plugins</module>
         <module>maven-properties</module>
         <!-- <module>maven-proxy</module> --> <!-- Not a maven project -->
+        <module>maven-reactor</module>
+        <module>maven-repositories</module>
+        <module>maven-simple</module>
+        <module>maven-surefire-plugin</module>
         <module>maven-unused-dependencies</module>
         <module>maven-war-plugin</module>
+        <module>spring-bom</module>
         <module>optional-dependencies</module>
         <module>version-collision</module>
         <module>version-overriding-plugins</module>
         <module>versions-maven-plugin</module>
-        <module>maven-printing-plugins</module>
-        <module>maven-builder-plugin</module>
-        <module>host-maven-repo-example</module>
-        <module>maven-surefire-plugin</module>
-        <module>maven-parent-pom-resolution</module>
-        <module>maven-simple</module>
-        <module>maven-classifier</module>
-        <module>maven-repositories</module>
     </modules>
 
     <dependencyManagement>
@@ -61,4 +64,18 @@
         </dependencies>
     </dependencyManagement>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file
diff --git a/spring-bom/README.md b/maven-modules/spring-bom/README.md
similarity index 100%
rename from spring-bom/README.md
rename to maven-modules/spring-bom/README.md
diff --git a/spring-bom/pom.xml b/maven-modules/spring-bom/pom.xml
similarity index 93%
rename from spring-bom/pom.xml
rename to maven-modules/spring-bom/pom.xml
index 7ba21ee285..93d0bdc458 100644
--- a/spring-bom/pom.xml
+++ b/maven-modules/spring-bom/pom.xml
@@ -10,8 +10,8 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <artifactId>maven-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
 
     <dependencyManagement>
diff --git a/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldApp.java b/maven-modules/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldApp.java
similarity index 100%
rename from spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldApp.java
rename to maven-modules/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldApp.java
diff --git a/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldBean.java b/maven-modules/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldBean.java
similarity index 100%
rename from spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldBean.java
rename to maven-modules/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldBean.java
diff --git a/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldConfig.java b/maven-modules/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldConfig.java
similarity index 100%
rename from spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldConfig.java
rename to maven-modules/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldConfig.java
diff --git a/spring-bom/src/main/resources/logback.xml b/maven-modules/spring-bom/src/main/resources/logback.xml
similarity index 100%
rename from spring-bom/src/main/resources/logback.xml
rename to maven-modules/spring-bom/src/main/resources/logback.xml
diff --git a/spring-bom/src/test/java/com/baeldung/SpringContextTest.java b/maven-modules/spring-bom/src/test/java/com/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-bom/src/test/java/com/baeldung/SpringContextTest.java
rename to maven-modules/spring-bom/src/test/java/com/baeldung/SpringContextTest.java
diff --git a/maven-modules/version-collision/dependencyconvergence.xml b/maven-modules/version-collision/dependencyconvergence.xml
new file mode 100644
index 0000000000..8f57cbf1d5
--- /dev/null
+++ b/maven-modules/version-collision/dependencyconvergence.xml
@@ -0,0 +1,22 @@
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <version>3.3.0</version>
+            <executions>
+                <execution>
+                    <id>enforce</id>
+                    <configuration>
+                        <rules>
+                            <dependencyConvergence/>
+                        </rules>
+                    </configuration>
+                    <goals>
+                        <goal>enforce</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+</build>
\ No newline at end of file
diff --git a/maven-modules/version-collision/dependencyconvergence_exclude_scenario.xml b/maven-modules/version-collision/dependencyconvergence_exclude_scenario.xml
new file mode 100644
index 0000000000..32b0462a11
--- /dev/null
+++ b/maven-modules/version-collision/dependencyconvergence_exclude_scenario.xml
@@ -0,0 +1,26 @@
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <version>3.3.0</version>
+            <executions>
+                <execution>
+                    <id>enforce</id>
+                    <configuration>
+                        <rules>
+                            <dependencyConvergence>
+                                <excludes>
+                                    <exclude>com.google.guava:guava</exclude>
+                                </excludes>
+                            </dependencyConvergence>
+                        </rules>
+                    </configuration>
+                    <goals>
+                        <goal>enforce</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+</build>
\ No newline at end of file
diff --git a/maven-modules/version-collision/dependencyconvergence_include_scenario.xml b/maven-modules/version-collision/dependencyconvergence_include_scenario.xml
new file mode 100644
index 0000000000..9e4680fc91
--- /dev/null
+++ b/maven-modules/version-collision/dependencyconvergence_include_scenario.xml
@@ -0,0 +1,26 @@
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <version>3.3.0</version>
+            <executions>
+                <execution>
+                    <id>enforce</id>
+                    <configuration>
+                        <rules>
+                            <dependencyConvergence>
+                                <includes>
+                                    <include>com.google.guava:guava</include>
+                                </includes>
+                            </dependencyConvergence>
+                        </rules>
+                    </configuration>
+                    <goals>
+                        <goal>enforce</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+</build>
\ No newline at end of file
diff --git a/messaging-modules/apache-camel/README.md b/messaging-modules/apache-camel/README.md
new file mode 100644
index 0000000000..6196893adc
--- /dev/null
+++ b/messaging-modules/apache-camel/README.md
@@ -0,0 +1,9 @@
+## Apache Camel
+
+This module contains articles about Apache Camel
+
+### Relevant Articles
+
+- [Introduction To Apache Camel](http://www.baeldung.com/apache-camel-intro)
+- [Unmarshalling a JSON Array Using camel-jackson](https://www.baeldung.com/java-camel-jackson-json-array)
+
diff --git a/messaging-modules/apache-camel/pom.xml b/messaging-modules/apache-camel/pom.xml
new file mode 100644
index 0000000000..bb20f178aa
--- /dev/null
+++ b/messaging-modules/apache-camel/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.baeldung.apache.camel</groupId>
+    <artifactId>apache-camel</artifactId>
+    <name>apache-camel</name>
+    <packaging>jar</packaging>
+    <url>http://maven.apache.org</url>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>messaging-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core</artifactId>
+            <version>${env.camel.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-spring-javaconfig</artifactId>
+            <version>${env.camel.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-jackson</artifactId>
+            <version>${env.camel.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test</artifactId>
+            <version>${env.camel.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <env.camel.version>3.14.7</env.camel.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/file/FileProcessor.java b/messaging-modules/apache-camel/src/main/java/com/baeldung/camel/apache/file/FileProcessor.java
similarity index 100%
rename from messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/file/FileProcessor.java
rename to messaging-modules/apache-camel/src/main/java/com/baeldung/camel/apache/file/FileProcessor.java
diff --git a/messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/file/FileRouter.java b/messaging-modules/apache-camel/src/main/java/com/baeldung/camel/apache/file/FileRouter.java
similarity index 100%
rename from messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/file/FileRouter.java
rename to messaging-modules/apache-camel/src/main/java/com/baeldung/camel/apache/file/FileRouter.java
diff --git a/messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/jackson/Fruit.java b/messaging-modules/apache-camel/src/main/java/com/baeldung/camel/apache/jackson/Fruit.java
similarity index 100%
rename from messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/jackson/Fruit.java
rename to messaging-modules/apache-camel/src/main/java/com/baeldung/camel/apache/jackson/Fruit.java
diff --git a/messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/jackson/FruitList.java b/messaging-modules/apache-camel/src/main/java/com/baeldung/camel/apache/jackson/FruitList.java
similarity index 100%
rename from messaging-modules/spring-apache-camel/src/main/java/com/baeldung/camel/apache/jackson/FruitList.java
rename to messaging-modules/apache-camel/src/main/java/com/baeldung/camel/apache/jackson/FruitList.java
diff --git a/messaging-modules/spring-apache-camel/src/main/resources/camel-context-test.xml b/messaging-modules/apache-camel/src/main/resources/camel-context-test.xml
similarity index 100%
rename from messaging-modules/spring-apache-camel/src/main/resources/camel-context-test.xml
rename to messaging-modules/apache-camel/src/main/resources/camel-context-test.xml
diff --git a/spring-caching/src/main/resources/logback.xml b/messaging-modules/apache-camel/src/main/resources/logback.xml
similarity index 100%
rename from spring-caching/src/main/resources/logback.xml
rename to messaging-modules/apache-camel/src/main/resources/logback.xml
diff --git a/messaging-modules/spring-apache-camel/src/test/java/com/apache/baeldung/camel/jackson/FruitArrayJacksonUnmarshalUnitTest.java b/messaging-modules/apache-camel/src/test/java/com/apache/baeldung/camel/jackson/FruitArrayJacksonUnmarshalUnitTest.java
similarity index 100%
rename from messaging-modules/spring-apache-camel/src/test/java/com/apache/baeldung/camel/jackson/FruitArrayJacksonUnmarshalUnitTest.java
rename to messaging-modules/apache-camel/src/test/java/com/apache/baeldung/camel/jackson/FruitArrayJacksonUnmarshalUnitTest.java
diff --git a/messaging-modules/spring-apache-camel/src/test/java/com/apache/baeldung/camel/jackson/FruitListJacksonUnmarshalUnitTest.java b/messaging-modules/apache-camel/src/test/java/com/apache/baeldung/camel/jackson/FruitListJacksonUnmarshalUnitTest.java
similarity index 100%
rename from messaging-modules/spring-apache-camel/src/test/java/com/apache/baeldung/camel/jackson/FruitListJacksonUnmarshalUnitTest.java
rename to messaging-modules/apache-camel/src/test/java/com/apache/baeldung/camel/jackson/FruitListJacksonUnmarshalUnitTest.java
diff --git a/messaging-modules/spring-apache-camel/src/test/java/com/apache/camel/file/processor/FileProcessorIntegrationTest.java b/messaging-modules/apache-camel/src/test/java/com/apache/camel/file/processor/FileProcessorIntegrationTest.java
similarity index 100%
rename from messaging-modules/spring-apache-camel/src/test/java/com/apache/camel/file/processor/FileProcessorIntegrationTest.java
rename to messaging-modules/apache-camel/src/test/java/com/apache/camel/file/processor/FileProcessorIntegrationTest.java
diff --git a/messaging-modules/spring-apache-camel/src/test/resources/json/fruit-array.json b/messaging-modules/apache-camel/src/test/resources/json/fruit-array.json
similarity index 100%
rename from messaging-modules/spring-apache-camel/src/test/resources/json/fruit-array.json
rename to messaging-modules/apache-camel/src/test/resources/json/fruit-array.json
diff --git a/messaging-modules/spring-apache-camel/src/test/resources/json/fruit-list.json b/messaging-modules/apache-camel/src/test/resources/json/fruit-list.json
similarity index 100%
rename from messaging-modules/spring-apache-camel/src/test/resources/json/fruit-list.json
rename to messaging-modules/apache-camel/src/test/resources/json/fruit-list.json
diff --git a/apache-rocketmq/README.md b/messaging-modules/apache-rocketmq/README.md
similarity index 100%
rename from apache-rocketmq/README.md
rename to messaging-modules/apache-rocketmq/README.md
diff --git a/apache-rocketmq/pom.xml b/messaging-modules/apache-rocketmq/pom.xml
similarity index 90%
rename from apache-rocketmq/pom.xml
rename to messaging-modules/apache-rocketmq/pom.xml
index 48399b6d51..a362644de3 100644
--- a/apache-rocketmq/pom.xml
+++ b/messaging-modules/apache-rocketmq/pom.xml
@@ -9,8 +9,8 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <artifactId>messaging-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/apache-rocketmq/src/main/java/com/baeldung/rocketmq/consumer/CartEventConsumer.java b/messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/consumer/CartEventConsumer.java
similarity index 100%
rename from apache-rocketmq/src/main/java/com/baeldung/rocketmq/consumer/CartEventConsumer.java
rename to messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/consumer/CartEventConsumer.java
diff --git a/apache-rocketmq/src/main/java/com/baeldung/rocketmq/event/CartItemEvent.java b/messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/event/CartItemEvent.java
similarity index 100%
rename from apache-rocketmq/src/main/java/com/baeldung/rocketmq/event/CartItemEvent.java
rename to messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/event/CartItemEvent.java
diff --git a/apache-rocketmq/src/main/java/com/baeldung/rocketmq/producer/CartEventProducer.java b/messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/producer/CartEventProducer.java
similarity index 100%
rename from apache-rocketmq/src/main/java/com/baeldung/rocketmq/producer/CartEventProducer.java
rename to messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/producer/CartEventProducer.java
diff --git a/apache-rocketmq/src/main/java/com/baeldung/rocketmq/transaction/TransactionListenerImpl.java b/messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/transaction/TransactionListenerImpl.java
similarity index 100%
rename from apache-rocketmq/src/main/java/com/baeldung/rocketmq/transaction/TransactionListenerImpl.java
rename to messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/transaction/TransactionListenerImpl.java
diff --git a/apache-rocketmq/src/main/resources/application.properties b/messaging-modules/apache-rocketmq/src/main/resources/application.properties
similarity index 100%
rename from apache-rocketmq/src/main/resources/application.properties
rename to messaging-modules/apache-rocketmq/src/main/resources/application.properties
diff --git a/messaging-modules/pom.xml b/messaging-modules/pom.xml
index 8bda46f5cd..71ff25d71b 100644
--- a/messaging-modules/pom.xml
+++ b/messaging-modules/pom.xml
@@ -15,9 +15,12 @@
     </parent>
 
     <modules>
+        <module>apache-camel</module>
+        <module>apache-rocketmq</module>
         <module>jgroups</module>
         <module>rabbitmq</module>
         <module>spring-amqp</module>
+        <module>spring-apache-camel</module>
         <module>spring-jms</module>
     </modules>
 
diff --git a/messaging-modules/rabbitmq/README.md b/messaging-modules/rabbitmq/README.md
index 93bb795d7b..8cfcca3378 100644
--- a/messaging-modules/rabbitmq/README.md
+++ b/messaging-modules/rabbitmq/README.md
@@ -9,3 +9,4 @@ This module contains articles about RabbitMQ.
 - [Channels and Connections in RabbitMQ](https://www.baeldung.com/java-rabbitmq-channels-connections)
 - [Create Dynamic Queues in RabbitMQ](https://www.baeldung.com/rabbitmq-dynamic-queues)
 
+
diff --git a/messaging-modules/spring-apache-camel/README.md b/messaging-modules/spring-apache-camel/README.md
index 535c61cbef..66079d4e83 100644
--- a/messaging-modules/spring-apache-camel/README.md
+++ b/messaging-modules/spring-apache-camel/README.md
@@ -4,10 +4,8 @@ This module contains articles about Spring with Apache Camel
 
 ### Relevant Articles
 
-- [Introduction To Apache Camel](http://www.baeldung.com/apache-camel-intro)
 - [Integration Patterns With Apache Camel](http://www.baeldung.com/camel-integration-patterns)
 - [Using Apache Camel with Spring](http://www.baeldung.com/spring-apache-camel-tutorial)
-- [Unmarshalling a JSON Array Using camel-jackson](https://www.baeldung.com/java-camel-jackson-json-array)
 - [Apache Camel with Spring Boot](https://www.baeldung.com/apache-camel-spring-boot)
 - [Apache Camel Routes Testing in Spring Boot](https://www.baeldung.com/spring-boot-apache-camel-routes-testing)
 - [Apache Camel Conditional Routing](https://www.baeldung.com/spring-apache-camel-conditional-routing)
diff --git a/messaging-modules/spring-apache-camel/pom.xml b/messaging-modules/spring-apache-camel/pom.xml
index ec7557666c..65533d7649 100644
--- a/messaging-modules/spring-apache-camel/pom.xml
+++ b/messaging-modules/spring-apache-camel/pom.xml
@@ -47,17 +47,6 @@
             <artifactId>camel-spring-javaconfig</artifactId>
             <version>${env.camel.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-jackson</artifactId>
-            <version>${env.camel.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test</artifactId>
-            <version>${env.camel.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.camel.springboot</groupId>
             <artifactId>camel-servlet-starter</artifactId>
diff --git a/messaging-modules/spring-jms/pom.xml b/messaging-modules/spring-jms/pom.xml
index b94a31c0c5..ef1e0cb3a8 100644
--- a/messaging-modules/spring-jms/pom.xml
+++ b/messaging-modules/spring-jms/pom.xml
@@ -44,19 +44,19 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.6.1</version>
+            <version>${mockito-core.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq.tooling</groupId>
             <artifactId>activemq-junit</artifactId>
-            <version>5.16.5</version>
+            <version>${activemq-junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.17.3</version>
+            <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -67,7 +67,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>${maven-war-plugin.version}</version>
                     <configuration>
                         <warSourceDirectory>src/main/webapp</warSourceDirectory>
                         <warName>spring-jms</warName>
@@ -83,6 +82,10 @@
         <springframework.version>4.3.4.RELEASE</springframework.version>
         <activemq.version>5.14.1</activemq.version>
         <spring-boot-test.version>1.5.10.RELEASE</spring-boot-test.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
+        <mockito-core.version>4.6.1</mockito-core.version>
+        <activemq-junit.version>5.16.5</activemq-junit.version>
+        <testcontainers.version>1.17.3</testcontainers.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/microservices-modules/micronaut/pom.xml b/microservices-modules/micronaut/pom.xml
index 8647d1a3a7..2cc91bc510 100644
--- a/microservices-modules/micronaut/pom.xml
+++ b/microservices-modules/micronaut/pom.xml
@@ -138,7 +138,7 @@
         <!-- <exec.mainClass>com.baeldung.micronaut.helloworld.server.ServerApplication</exec.mainClass> -->
         <exec.mainClass>com.baeldung.micronaut.vs.springboot.CompareApplication</exec.mainClass>
         <micronaut.version>1.0.0.RC2</micronaut.version>
-        <jdk.version>1.8</jdk.version>
+        <jdk.version>17</jdk.version>
         <annotation.api.version>1.3.2</annotation.api.version>
         <reactor.version>3.1.6.RELEASE</reactor.version>
         <compiler.plugin.version>3.7.0</compiler.plugin.version>
diff --git a/microservices-modules/open-liberty/pom.xml b/microservices-modules/open-liberty/pom.xml
index c4b0fd0b82..1c2e948765 100644
--- a/microservices-modules/open-liberty/pom.xml
+++ b/microservices-modules/open-liberty/pom.xml
@@ -95,14 +95,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>${version.maven-war-plugin}</version>
             </plugin>
         </plugins>
     </build>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <failOnMissingWebXml>false</failOnMissingWebXml>
@@ -111,7 +108,6 @@
         <version.microprofile>3.2</version.microprofile>
         <version.derby>10.14.2.0</version.derby>
         <version.liberty-maven-plugin>3.3-M3</version.liberty-maven-plugin>
-        <version.maven-war-plugin>3.2.3</version.maven-war-plugin>
         <version.yasson>1.0.5</version.yasson>
         <version.cxf-rt-rs-client>3.2.6</version.cxf-rt-rs-client>
         <version.javax.json>1.0.4</version.javax.json>
diff --git a/microservices-modules/pom.xml b/microservices-modules/pom.xml
index a9cd8d2cd9..2111390481 100644
--- a/microservices-modules/pom.xml
+++ b/microservices-modules/pom.xml
@@ -22,4 +22,8 @@
         <module>rest-express</module>
     </modules>
 
+    <properties>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/microservices-modules/rest-express/pom.xml b/microservices-modules/rest-express/pom.xml
index f222998340..eda27ec164 100644
--- a/microservices-modules/rest-express/pom.xml
+++ b/microservices-modules/rest-express/pom.xml
@@ -23,15 +23,6 @@
     <artifactId>rest-express</artifactId>
     <packaging>jar</packaging>
 
-    <properties>
-        <RestExpress.plugin.version>0.3.3</RestExpress.plugin.version>
-        <metrics-graphite.version>3.1.2</metrics-graphite.version>
-        <HyperExpressPlugin.version>2.6</HyperExpressPlugin.version>
-        <RestExpress.version>0.11.3</RestExpress.version>
-        <Syntaxe.version>1.0</Syntaxe.version>
-        <repoexpress-mongodb.version>0.4.8</repoexpress-mongodb.version>
-        <junit4.version>4.11</junit4.version>
-    </properties>
 
     <dependencies>
         <dependency>
@@ -94,17 +85,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>${exec-maven-plugin.version}</version>
                 <configuration>
                     <mainClass>com.baeldung.restexpress.Main</mainClass>
                 </configuration>
@@ -112,7 +97,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.1</version>
+                <version>${maven-shade-plugin.version}</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <filters>
@@ -146,8 +131,22 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
-                <version>2.0</version>
+                <version>${versions-maven-plugin.version}</version>
             </plugin>
         </plugins>
     </reporting>
+
+    <properties>
+        <RestExpress.plugin.version>0.3.3</RestExpress.plugin.version>
+        <metrics-graphite.version>3.1.2</metrics-graphite.version>
+        <HyperExpressPlugin.version>2.6</HyperExpressPlugin.version>
+        <RestExpress.version>0.11.3</RestExpress.version>
+        <Syntaxe.version>1.0</Syntaxe.version>
+        <repoexpress-mongodb.version>0.4.8</repoexpress-mongodb.version>
+        <junit4.version>4.11</junit4.version>
+        <exec-maven-plugin.version>1.2.1</exec-maven-plugin.version>
+        <maven-shade-plugin.version>2.4.1</maven-shade-plugin.version>
+        <versions-maven-plugin.version>2.0</versions-maven-plugin.version>
+    </properties>
+
 </project>
diff --git a/orika/pom.xml b/orika/pom.xml
index c18bb58a51..5ff898e6bd 100644
--- a/orika/pom.xml
+++ b/orika/pom.xml
@@ -21,6 +21,21 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <orika-core.version>1.5.0</orika-core.version>
     </properties>
diff --git a/osgi/pom.xml b/osgi/pom.xml
index 3fa2dcdf02..ecc8758ef9 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -67,6 +67,17 @@
     </dependencyManagement>
 
     <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+        </plugins>
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -84,6 +95,8 @@
         <javax.json.version>1.1</javax.json.version>
         <osgi.version>6.0.0</osgi.version>
         <maven-bundle-plugin.version>3.3.0</maven-bundle-plugin.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/parent-boot-2/pom.xml b/parent-boot-2/pom.xml
index a1f16c4a64..3f6ad8ef8a 100644
--- a/parent-boot-2/pom.xml
+++ b/parent-boot-2/pom.xml
@@ -94,7 +94,7 @@
         <rest-assured.version>3.3.0</rest-assured.version>
         <!-- plugins -->
         <thin.version>1.0.22.RELEASE</thin.version>
-        <spring-boot.version>2.7.8</spring-boot.version>
+        <spring-boot.version>2.7.11</spring-boot.version>
         <aspectjweaver.version>1.9.1</aspectjweaver.version>
         <mysql-connector-java.version>8.0.31</mysql-connector-java.version>
     </properties>
diff --git a/parent-spring-5/pom.xml b/parent-spring-5/pom.xml
index 80a8c7d77d..fd3cd734c6 100644
--- a/parent-spring-5/pom.xml
+++ b/parent-spring-5/pom.xml
@@ -24,7 +24,7 @@
     </dependencies>
 
     <properties>
-        <spring.version>5.3.24</spring.version>
+        <spring.version>5.3.25</spring.version>
         <spring-security.version>5.7.3</spring-security.version>
         <spring-boot-starter-test.version>1.5.10.RELEASE</spring-boot-starter-test.version>
     </properties>
diff --git a/patterns-modules/clean-architecture/README.md b/patterns-modules/clean-architecture/README.md
index aad8608447..4ff1e4c93e 100644
--- a/patterns-modules/clean-architecture/README.md
+++ b/patterns-modules/clean-architecture/README.md
@@ -1,3 +1,4 @@
 ### Relevant Articles:
 
 - [Clean Architecture with Spring Boot](https://www.baeldung.com/spring-boot-clean-architecture)
+- [Anemic vs. Rich Domain Objects](https://www.baeldung.com/java-anemic-vs-rich-domain-objects)
diff --git a/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/richdomainmodel/Player.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/richdomainmodel/Player.java
new file mode 100644
index 0000000000..f683b1158d
--- /dev/null
+++ b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/richdomainmodel/Player.java
@@ -0,0 +1,35 @@
+package com.baeldung.pattern.richdomainmodel;
+
+public class Player {
+    private int points ;
+    final String name;
+
+    public Player(String name) {
+        this(name, 0);
+    }
+
+    private Player(String name, int points) {
+        this.name = name;
+        this.points = 0;
+    }
+
+    public void gainPoint() {
+        points++;
+    }
+
+    public boolean hasScoreBiggerThan(Score score) {
+        return this.points > score.points();
+    }
+
+    public int pointsDifference(Player other) {
+        return points - other.points;
+    }
+
+    public String name() {
+        return name;
+    }
+
+    public String score() {
+        return Score.from(points).label();
+    }
+}
\ No newline at end of file
diff --git a/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/richdomainmodel/Score.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/richdomainmodel/Score.java
new file mode 100644
index 0000000000..da5823763c
--- /dev/null
+++ b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/richdomainmodel/Score.java
@@ -0,0 +1,29 @@
+package com.baeldung.pattern.richdomainmodel;
+
+import java.util.Arrays;
+
+public enum Score {
+    LOVE(0, "Love"), FIFTEEN(1, "Fifteen"), THIRTY(2, "Thirty"), FORTY(3, "Forty");
+
+    private final int points;
+    private final String label;
+
+    Score(int points, String label) {
+        this.points = points;
+        this.label = label;
+    }
+
+    public static Score from(int value) {
+        return Arrays.stream(values())
+          .filter(v -> v.points == value)
+          .findFirst()
+          .orElseThrow(() -> new IllegalArgumentException("no such element: " + value));
+    }
+
+    public int points() {
+        return points;
+    }
+    public String label() {
+        return label;
+    }
+}
\ No newline at end of file
diff --git a/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/richdomainmodel/TennisGame.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/richdomainmodel/TennisGame.java
new file mode 100644
index 0000000000..30811a2eb9
--- /dev/null
+++ b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/richdomainmodel/TennisGame.java
@@ -0,0 +1,71 @@
+package com.baeldung.pattern.richdomainmodel;
+
+public class TennisGame {
+    private final Player server;
+    private final Player receiver;
+
+    public TennisGame(String server, String receiver) {
+        this.server = new Player(server);
+        this.receiver = new Player(receiver);
+    }
+
+    public void wonPoint(String playerName) {
+        if(server.name().equals(playerName)) {
+            server.gainPoint();
+        } else {
+            receiver.gainPoint();
+        }
+    }
+
+    public String getScore() {
+        if (gameContinues()) {
+            return getGameScore();
+        }
+        return "Win for " + leadingPlayer().name();
+    }
+
+    private String getGameScore() {
+        if (isScoreEqual()) {
+            return getEqualScore();
+        }
+        if (isAdvantage()) {
+            return "Advantage " + leadingPlayer().name();
+        }
+        return getSimpleScore();
+    }
+
+    private boolean isScoreEqual() {
+        return server.pointsDifference(receiver) == 0;
+    }
+
+    private boolean isAdvantage() {
+        return leadingPlayer().hasScoreBiggerThan(Score.FORTY)
+          && Math.abs(server.pointsDifference(receiver)) == 1;
+    }
+
+    private boolean isGameFinished() {
+        return leadingPlayer().hasScoreBiggerThan(Score.FORTY)
+          && Math.abs(server.pointsDifference(receiver)) >= 2;
+    }
+
+    private Player leadingPlayer() {
+        if (server.pointsDifference(receiver) > 0) {
+            return server;
+        }
+        return receiver;
+    }
+
+    private boolean gameContinues() {
+        return !isGameFinished();
+    }
+    private String getSimpleScore() {
+        return String.format("%s-%s", server.score(), receiver.score());
+    }
+
+    private String getEqualScore() {
+        if (server.hasScoreBiggerThan(Score.THIRTY)) {
+            return "Deuce";
+        }
+        return String.format("%s-All", server.score());
+    }
+}
diff --git a/patterns-modules/clean-architecture/src/test/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserUnitTest.java b/patterns-modules/clean-architecture/src/test/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserUnitTest.java
index 505ea47e3f..e2a9cd9d14 100644
--- a/patterns-modules/clean-architecture/src/test/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserUnitTest.java
+++ b/patterns-modules/clean-architecture/src/test/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserUnitTest.java
@@ -1,15 +1,36 @@
 package com.baeldung.pattern.cleanarchitecture.usercreation;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.*;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
 
 import org.junit.jupiter.api.Test;
 
 class UserUnitTest {
 
+    UserRegisterDsGateway userDsGateway = mock(UserRegisterDsGateway.class);
+    UserPresenter userPresenter = mock(UserPresenter.class);
+    UserFactory userFactory = mock(UserFactory.class);
+    UserInputBoundary interactor = new UserRegisterInteractor(userDsGateway, userPresenter, userFactory);
+
     @Test
     void given123Password_whenPasswordIsNotValid_thenIsFalse() {
         User user = new CommonUser("Baeldung", "123");
 
         assertThat(user.passwordIsValid()).isFalse();
     }
+
+    @Test
+    void givenBaeldungUserAnd123456Password_whenCreate_thenSaveItAndPrepareSuccessView() {
+
+        User user = new CommonUser("baeldung", "123456");
+        UserRequestModel userRequestModel = new UserRequestModel(user.getName(), user.getPassword());
+        when(userFactory.create(anyString(), anyString())).thenReturn(new CommonUser(user.getName(), user.getPassword()));
+
+        interactor.create(userRequestModel);
+
+        verify(userDsGateway, times(1)).save(any(UserDsRequestModel.class));
+        verify(userPresenter, times(1)).prepareSuccessView(any(UserResponseModel.class));
+    }
 }
diff --git a/patterns-modules/clean-architecture/src/test/java/com/baeldung/pattern/richdomainmodel/RichDomainModelUnitTest.java b/patterns-modules/clean-architecture/src/test/java/com/baeldung/pattern/richdomainmodel/RichDomainModelUnitTest.java
new file mode 100644
index 0000000000..b620c7e0e2
--- /dev/null
+++ b/patterns-modules/clean-architecture/src/test/java/com/baeldung/pattern/richdomainmodel/RichDomainModelUnitTest.java
@@ -0,0 +1,33 @@
+package com.baeldung.pattern.richdomainmodel;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+public class RichDomainModelUnitTest {
+
+    @Test
+    public void givenATennisGame_whenReceiverWinsThreePoints_thenScoreIsFortyLove() {
+        TennisGame game = new TennisGame("server", "receiver");
+
+        game.wonPoint("server");
+        game.wonPoint("server");
+        game.wonPoint("server");
+
+        assertThat(game.getScore())
+          .isEqualTo("Forty-Love");
+    }
+
+    @Test
+    public void givenATennisGame_whenEachPlayerWonTwoPoints_thenScoreIsThirtyAll() {
+        TennisGame game = new TennisGame("server", "receiver");
+
+        game.wonPoint("server");
+        game.wonPoint("server");
+        game.wonPoint("receiver");
+        game.wonPoint("receiver");
+
+        assertThat(game.getScore())
+          .isEqualTo("Thirty-All");
+    }
+}
\ No newline at end of file
diff --git a/patterns-modules/cqrs-es/pom.xml b/patterns-modules/cqrs-es/pom.xml
index 737eb00b9b..ee5820ff96 100644
--- a/patterns-modules/cqrs-es/pom.xml
+++ b/patterns-modules/cqrs-es/pom.xml
@@ -18,11 +18,7 @@
             <artifactId>lombok</artifactId>
             <version>${lombok.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
+        
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/patterns-modules/design-patterns-behavioral-2/README.md b/patterns-modules/design-patterns-behavioral-2/README.md
index 9618a9c458..db4dd8d719 100644
--- a/patterns-modules/design-patterns-behavioral-2/README.md
+++ b/patterns-modules/design-patterns-behavioral-2/README.md
@@ -1,2 +1,3 @@
 ### Relevant Articles:
 - [Memento Design Pattern in Java](https://www.baeldung.com/java-memento-design-pattern)
+- [Difference Between Fluent Interface and Builder Pattern in Java](https://www.baeldung.com/java-fluent-interface-vs-builder-pattern)
diff --git a/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/HtmlDocument.java b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/HtmlDocument.java
new file mode 100644
index 0000000000..db0f988908
--- /dev/null
+++ b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/HtmlDocument.java
@@ -0,0 +1,46 @@
+package com.baeldung.fluentinterface;
+
+import static java.util.Arrays.stream;
+import static java.util.stream.Collectors.joining;
+
+public class HtmlDocument {
+	private final String content;
+
+	private HtmlDocument(String html) {
+		this.content = html;
+	}
+
+	public HtmlDocument() {
+		this("");
+	}
+
+	public String html() {
+		return String.format("<html>%s</html>", content);
+	}
+
+	public HtmlDocument header(String header) {
+		return new HtmlDocument(String.format("%s <h1>%s</h1>", content, header));
+	}
+
+	public HtmlDocument secondaryHeader(String header) {
+		return new HtmlDocument(String.format("%s <h2>%s</h2>", content, header));
+	}
+
+	public HtmlDocument paragraph(String paragraph) {
+		return new HtmlDocument(String.format("%s <p>%s</p>", content, paragraph));
+	}
+
+	public HtmlDocument horizontalLine() {
+		return new HtmlDocument(String.format("%s <hr>", content));
+	}
+
+	public HtmlDocument orderedList(String... items) {
+		String listItems = stream(items).map(el -> String.format("<li>%s</li>", el)).collect(joining());
+		return new HtmlDocument(String.format("%s <ol>%s</ol>", content, listItems));
+	}
+
+	public HtmlDocument unorderedList(String... items) {
+		String listItems = stream(items).map(el -> String.format("<li>%s</li>", el)).collect(joining());
+		return new HtmlDocument(String.format("%s <ul>%s</ul>", content, listItems));
+	}
+}
\ No newline at end of file
diff --git a/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/LargeHtmlDocument.java b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/LargeHtmlDocument.java
new file mode 100644
index 0000000000..fff8c97b5b
--- /dev/null
+++ b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/LargeHtmlDocument.java
@@ -0,0 +1,40 @@
+package com.baeldung.fluentinterface;
+
+import com.baeldung.fluentinterface.components.HtmlElement;
+import com.baeldung.fluentinterface.components.HtmlHeader;
+import com.baeldung.fluentinterface.components.HtmlList;
+
+import static java.lang.String.format;
+import static java.util.Arrays.stream;
+import static java.util.stream.Collectors.joining;
+
+public class LargeHtmlDocument {
+	private final String content;
+
+	private LargeHtmlDocument(String html) {
+		this.content = html;
+	}
+
+	public LargeHtmlDocument() {
+		this("");
+	}
+
+	public String html() {
+		return format("<html>%s</html>", content);
+	}
+
+	public LargeHtmlDocument head(HtmlElement head) {
+		return new LargeHtmlDocument(format("%s <head>%s</head>", content, head.html()));
+	}
+	public LargeHtmlDocument body(HtmlElement body) {
+		return new LargeHtmlDocument(format("%s <body>%s</body>", content, body.html()));
+	}
+	public LargeHtmlDocument footer(HtmlElement footer) {
+		return new LargeHtmlDocument(format("%s <footer>%s</footer>", content, footer.html()));
+	}
+
+	private LargeHtmlDocument append(String html) {
+		return new LargeHtmlDocument(format("%s %s", content, html));
+	}
+
+}
\ No newline at end of file
diff --git a/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/User.java b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/User.java
new file mode 100644
index 0000000000..1606369c26
--- /dev/null
+++ b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/User.java
@@ -0,0 +1,65 @@
+package com.baeldung.fluentinterface;
+
+public class User {
+	private String firstName;
+	private String lastName;
+	private String email;
+	private String username;
+	private Long id;
+
+	public String name() {
+		return firstName + " " + lastName;
+	}
+
+	public User(String firstName, String lastName, String email, String username, Long id) {
+		this.firstName = firstName;
+		this.lastName = lastName;
+		this.email = email;
+		this.username = username;
+		this.id = id;
+	}
+
+	public static Builder builder() {
+		return new Builder();
+	}
+
+	public static class Builder {
+		private String firstName;
+		private String lastName;
+		private String email;
+		private String username;
+		private Long id;
+
+		private Builder() {
+		}
+
+		public Builder firstName(String firstName) {
+			this.firstName = firstName;
+			return this;
+		}
+
+		public Builder lastName(String lastName) {
+			this.lastName = lastName;
+			return this;
+		}
+
+		public Builder email(String email) {
+			this.email = email;
+			return this;
+		}
+
+		public Builder username(String username) {
+			this.username = username;
+			return this;
+		}
+
+		public Builder id(Long id) {
+			this.id = id;
+			return this;
+		}
+
+		public User build() {
+			return new User(firstName, lastName, email, username, id);
+		}
+	}
+}
diff --git a/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/components/HorizontalLine.java b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/components/HorizontalLine.java
new file mode 100644
index 0000000000..66979b98f9
--- /dev/null
+++ b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/components/HorizontalLine.java
@@ -0,0 +1,8 @@
+package com.baeldung.fluentinterface.components;
+
+public class HorizontalLine implements HtmlElement {
+	@Override
+	public String html() {
+		return "<hr>";
+	}
+}
diff --git a/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/components/HtmlDiv.java b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/components/HtmlDiv.java
new file mode 100644
index 0000000000..7625401444
--- /dev/null
+++ b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/components/HtmlDiv.java
@@ -0,0 +1,29 @@
+package com.baeldung.fluentinterface.components;
+
+public class HtmlDiv implements HtmlElement {
+
+	private final String content;
+
+	public HtmlDiv(String content) {
+		this.content = content;
+	}
+
+	public HtmlDiv() {
+		this.content = "";
+	}
+
+	public HtmlDiv append(HtmlElement element) {
+		return new HtmlDiv(content + element.html());
+	}
+	public HtmlDiv text(String text) {
+		return new HtmlDiv(content + text);
+	}
+	public HtmlDiv paragraph(String text) {
+		return new HtmlDiv(content + text);
+	}
+
+	@Override
+	public String html() {
+		return String.format("<div>%s</div>", content);
+	}
+}
diff --git a/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/components/HtmlElement.java b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/components/HtmlElement.java
new file mode 100644
index 0000000000..ff46dc0029
--- /dev/null
+++ b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/components/HtmlElement.java
@@ -0,0 +1,5 @@
+package com.baeldung.fluentinterface.components;
+
+public interface HtmlElement {
+	String html();
+}
diff --git a/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/components/HtmlHeader.java b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/components/HtmlHeader.java
new file mode 100644
index 0000000000..12c400014d
--- /dev/null
+++ b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/components/HtmlHeader.java
@@ -0,0 +1,34 @@
+package com.baeldung.fluentinterface.components;
+
+public class HtmlHeader implements HtmlElement {
+
+	private final Type type;
+	private final String value;
+
+	public HtmlHeader(Type type, String value) {
+		this.type = type;
+		this.value = value;
+	}
+
+	@Override
+	public String html() {
+		return String.format("<%s>%s</%s>", type.tag(), value, type.tag());
+	}
+
+	public enum Type {
+		PRIMARY("h1"),
+		SECONDARY("h2"),
+		THIRD("h3"),
+		FOURTH("h4");
+
+		private final String tag;
+
+		Type(String tag) {
+			this.tag = tag;
+		}
+
+		public String tag() {
+			return tag;
+		}
+	}
+}
diff --git a/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/components/HtmlList.java b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/components/HtmlList.java
new file mode 100644
index 0000000000..030c9aaa5c
--- /dev/null
+++ b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/components/HtmlList.java
@@ -0,0 +1,39 @@
+package com.baeldung.fluentinterface.components;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static java.lang.String.format;
+import static java.util.stream.Collectors.joining;
+
+public class HtmlList implements HtmlElement {
+
+	private final Type type;
+	private final List<String> items;
+
+	public HtmlList(Type type, String... items) {
+		this.type = type;
+		this.items = Arrays.asList(items);
+	}
+
+	@Override
+	public String html() {
+		String listItems = items.stream().map(el -> format("<li>%s</li>", el)).collect(joining());
+		return String.format("<%s>%s</%s>", type.tag(), listItems, type.tag());
+	}
+
+	public enum Type {
+		ORDERED("ol"),
+		UNORDERED("ul");
+
+		private final String tag;
+
+		Type(String tag) {
+			this.tag = tag;
+		}
+
+		public String tag() {
+			return tag;
+		}
+	}
+}
diff --git a/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/components/HtmlSpan.java b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/components/HtmlSpan.java
new file mode 100644
index 0000000000..2bdf55eb72
--- /dev/null
+++ b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/fluentinterface/components/HtmlSpan.java
@@ -0,0 +1,27 @@
+package com.baeldung.fluentinterface.components;
+
+public class HtmlSpan implements HtmlElement {
+
+	private final String content;
+
+	public HtmlSpan(String content) {
+		this.content = content;
+	}
+
+	public HtmlSpan() {
+		this.content = "";
+	}
+
+	public HtmlSpan append(HtmlElement element) {
+		return new HtmlSpan(content + element.html());
+	}
+
+	public HtmlSpan paragraph(String text) {
+		return new HtmlSpan(content + text);
+	}
+
+	@Override
+	public String html() {
+		return String.format("<span>%s</span>", content);
+	}
+}
diff --git a/patterns-modules/design-patterns-behavioral-2/src/test/java/com/baeldung/fluentinterface/FluentInterfaceUnitTest.java b/patterns-modules/design-patterns-behavioral-2/src/test/java/com/baeldung/fluentinterface/FluentInterfaceUnitTest.java
new file mode 100644
index 0000000000..bf5aadcf13
--- /dev/null
+++ b/patterns-modules/design-patterns-behavioral-2/src/test/java/com/baeldung/fluentinterface/FluentInterfaceUnitTest.java
@@ -0,0 +1,101 @@
+package com.baeldung.fluentinterface;
+
+import com.baeldung.fluentinterface.components.*;
+import com.baeldung.fluentinterface.components.HtmlHeader.Type;
+import org.junit.jupiter.api.Test;
+
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static com.baeldung.fluentinterface.components.HtmlList.Type.ORDERED;
+import static org.assertj.core.api.Assertions.assertThat;
+
+class FluentInterfaceUnitTest {
+
+	@Test
+	void givenTenNumbers_thenStreamIsProcessedCorrectly() {
+		Stream<Integer> numbers = Stream.of(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+		Stream<String> processedNumbers = numbers.distinct()
+		  .filter(nr -> nr % 2 == 0)
+		  .skip(1)
+		  .limit(4)
+		  .map(nr -> "#" + nr)
+		  .peek(nr -> System.out.println(nr));
+		String result = processedNumbers.collect(Collectors.joining(", "));
+
+		assertThat(result).isEqualTo("#2, #4, #6, #8");
+	}
+
+	@Test
+	void givenUserBuilder_thenCreateUserCorrectly() {
+		User.Builder userBuilder = User.builder();
+		userBuilder = userBuilder
+		  .firstName("John")
+		  .lastName("Doe")
+		  .email("jd@gmail.com")
+		  .username("jd_2000")
+		  .id(1234L);
+
+		User user = userBuilder.build();
+
+		assertThat(user.name()).isEqualTo("John Doe");
+	}
+
+	@Test
+	void givenHtmlDocument_thenGenerateHtmlCorrectly() {
+		HtmlDocument document = new HtmlDocument()
+		  .header("Principles of O.O.P.")
+		  .paragraph("OOP in Java.")
+		  .horizontalLine()
+		  .paragraph("The main pillars of OOP are:")
+		  .orderedList("Encapsulation", "Inheritance", "Abstraction", "Polymorphism");
+		String html = document.html();
+
+		assertThat(html).isEqualToIgnoringWhitespace(
+		  "<html>"
+		  + "<h1>Principles of O.O.P.</h1>"
+		  + "<p>OOP in Java.</p>"
+		  + "<hr>"
+		  + "<p>The main pillars of OOP are:</p>"
+		  + "<ol>"
+		  + "<li>Encapsulation</li>"
+		  + "<li>Inheritance</li>"
+		  + "<li>Abstraction</li>"
+		  + "<li>Polymorphism</li>"
+		  + "</ol>"
+		  + "</html>"
+		);
+	}
+
+	@Test
+	void givenHtmlDocument_thenInstanceIsImmutable() {
+		HtmlDocument document = new HtmlDocument()
+		  .header("Principles of O.O.P.");
+		HtmlDocument updatedDocument = document
+		   .paragraph("OOP in Java.");
+
+		assertThat(document).isNotEqualTo(updatedDocument);
+	}
+
+
+	@Test
+	void givenLargeHtmlDocument_thenGenerateHtmlCorrectly() {
+		String html = new LargeHtmlDocument()
+		  .head(new HtmlHeader(Type.PRIMARY, "title"))
+		  .body(new HtmlDiv()
+			.append(new HtmlSpan()
+			  .paragraph("learning OOP from John Doe")
+			  .append(new HorizontalLine())
+			  .paragraph("The pillars of OOP:")
+			)
+			.append(new HtmlList(ORDERED, "Encapsulation", "Inheritance", "Abstraction", "Polymorphism"))
+		  )
+		  .footer(new HtmlDiv()
+			.paragraph("trademark John Doe")
+		  )
+		  .html();
+
+		String expectedHtml = "<html> <head><h1>title</h1></head> <body><div><span>learning OOP from John Doe<hr>The pillars of OOP:</span><ol><li>Encapsulation</li><li>Inheritance</li><li>Abstraction</li><li>Polymorphism</li></ol></div></body> <footer><div>trademark John Doe</div></footer></html>";
+		assertThat(html).isEqualToIgnoringWhitespace(expectedHtml);
+	}
+}
\ No newline at end of file
diff --git a/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/HighEndComputerBuilder.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/HighEndComputerBuilder.java
index 2ee6f93f9b..e06f1291a6 100644
--- a/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/HighEndComputerBuilder.java
+++ b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/HighEndComputerBuilder.java
@@ -1,5 +1,8 @@
 package com.baeldung.templatemethod.model;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 public class HighEndComputerBuilder extends ComputerBuilder {
 
     @Override
@@ -11,7 +14,7 @@ public class HighEndComputerBuilder extends ComputerBuilder {
     public void setupMotherboard() {
         motherboardSetupStatus.add("Screwing the high-end motherboard to the case.");
         motherboardSetupStatus.add("Pluging in the power supply connectors.");
-        motherboardSetupStatus.forEach(step -> System.out.println(step));
+        motherboardSetupStatus.forEach(step -> log.debug(step));
     }
     
     @Override
diff --git a/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/StandardComputerBuilder.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/StandardComputerBuilder.java
index da2c2e9b2d..f5b953c830 100644
--- a/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/StandardComputerBuilder.java
+++ b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/StandardComputerBuilder.java
@@ -1,5 +1,8 @@
 package com.baeldung.templatemethod.model;
- 
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 public class StandardComputerBuilder extends ComputerBuilder {
 
     @Override
@@ -11,7 +14,7 @@ public class StandardComputerBuilder extends ComputerBuilder {
     public void setupMotherboard() {
         motherboardSetupStatus.add("Screwing the standard motherboard to the case.");
         motherboardSetupStatus.add("Pluging in the power supply connectors.");
-        motherboardSetupStatus.forEach(step -> System.out.println(step));
+        motherboardSetupStatus.forEach(step -> log.debug(step));
     }
     
     @Override
diff --git a/patterns-modules/design-patterns-behavioral/src/test/resources/logback-test.xml b/patterns-modules/design-patterns-behavioral/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..499cc828a2
--- /dev/null
+++ b/patterns-modules/design-patterns-behavioral/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} | %-5p | [%thread] %logger{5}:%L - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/patterns-modules/design-patterns-structural/README.md b/patterns-modules/design-patterns-structural/README.md
index d2102868b2..996b500842 100644
--- a/patterns-modules/design-patterns-structural/README.md
+++ b/patterns-modules/design-patterns-structural/README.md
@@ -6,3 +6,4 @@
 - [The Adapter Pattern in Java](https://www.baeldung.com/java-adapter-pattern)
 - [The Proxy Pattern in Java](https://www.baeldung.com/java-proxy-pattern)
 - [The Bridge Pattern in Java](https://www.baeldung.com/java-bridge-pattern)
+- [Pipeline Design Pattern in Java](https://www.baeldung.com/java-pipeline-design-pattern)
diff --git a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/AdapterPatternDriver.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/AdapterPatternDriver.java
deleted file mode 100644
index 9f696a5f40..0000000000
--- a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/AdapterPatternDriver.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.baeldung.adapter;
-
-import static com.baeldung.util.LoggerUtil.LOG;
-
-public class AdapterPatternDriver {
-    
-    public static void main(String args[]) {
-    	Movable bugattiVeyron = new BugattiVeyron();
-    	MovableAdapter bugattiVeyronAdapter = new MovableAdapterImpl(bugattiVeyron);
-        LOG.info("Bugatti Veyron Super Sport's top speed is " + bugattiVeyronAdapter.getSpeed() + " Kmph.");
-
-        Movable mcLaren = new McLaren();
-        MovableAdapter mcLarenAdapter = new MovableAdapterImpl(mcLaren);
-        LOG.info("McLaren F1 top speed is " + mcLarenAdapter.getSpeed() + " Kmph.");
-
-        Movable astonMartin = new AstonMartin();
-        MovableAdapter astonMartinAdapter = new MovableAdapterImpl(astonMartin);
-        LOG.info("McLaren F1 top speed is " + astonMartinAdapter.getSpeed() + " Kmph.");
-    }
-}
diff --git a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/AstonMartin.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/AstonMartin.java
deleted file mode 100644
index c6aa0c525a..0000000000
--- a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/AstonMartin.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.baeldung.adapter;
-
-public class AstonMartin implements Movable {
-    @Override
-    public double getSpeed() {
-        return 220;
-    }
-}
diff --git a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/BugattiVeyron.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/BugattiVeyron.java
deleted file mode 100644
index e7d47d138a..0000000000
--- a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/BugattiVeyron.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.baeldung.adapter;
-
-public class BugattiVeyron implements Movable {
-    @Override
-    public double getSpeed() {
-        return 268;
-    }
-}
diff --git a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/IteratorAdapter.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/IteratorAdapter.java
new file mode 100644
index 0000000000..0abf333068
--- /dev/null
+++ b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/IteratorAdapter.java
@@ -0,0 +1,24 @@
+package com.baeldung.adapter;
+
+import java.util.Enumeration;
+import java.util.Iterator;
+
+public class IteratorAdapter<E> implements Iterator<E> {
+
+    private Enumeration<E> enumeration;
+
+    public IteratorAdapter(Enumeration<E> enumeration) {
+        this.enumeration = enumeration;
+    }
+
+    @Override
+    public boolean hasNext() {
+        return enumeration.hasMoreElements();
+    }
+
+    @Override
+    public E next() {
+        return enumeration.nextElement();
+    }
+
+}
diff --git a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/McLaren.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/McLaren.java
deleted file mode 100644
index 4ca1cde856..0000000000
--- a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/McLaren.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.baeldung.adapter;
-
-public class McLaren implements Movable {
-    @Override
-    public double getSpeed() {
-        return 241;
-    }
-}
diff --git a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/Movable.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/Movable.java
deleted file mode 100644
index bec0bee568..0000000000
--- a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/Movable.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.baeldung.adapter;
-
-public interface Movable {
-    // returns speed in MPH 
-    double getSpeed();
-}
\ No newline at end of file
diff --git a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/MovableAdapter.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/MovableAdapter.java
deleted file mode 100644
index 8d529e7b13..0000000000
--- a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/MovableAdapter.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.baeldung.adapter;
-
-public interface MovableAdapter {
-    // returns speed in KMPH 
-    double getSpeed();
-}
diff --git a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/MovableAdapterImpl.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/MovableAdapterImpl.java
deleted file mode 100644
index 8f18cc9942..0000000000
--- a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/MovableAdapterImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.baeldung.adapter;
-
-public class MovableAdapterImpl implements MovableAdapter {
-    private Movable luxuryCars;
-    
-    public MovableAdapterImpl(Movable luxuryCars) {
-        this.luxuryCars = luxuryCars;
-    }
-
-    @Override
-    public double getSpeed() {
-        double mph = luxuryCars.getSpeed();
-        return convertMPHtoKMPH(mph);
-    }
-    
-    private double convertMPHtoKMPH(double mph) {
-        return mph * 1.60934;
-    }
-}
diff --git a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/StringTokenizerIteratorAdapter.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/StringTokenizerIteratorAdapter.java
new file mode 100644
index 0000000000..36c17b2609
--- /dev/null
+++ b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/StringTokenizerIteratorAdapter.java
@@ -0,0 +1,29 @@
+package com.baeldung.adapter;
+
+import java.util.Iterator;
+import java.util.StringTokenizer;
+
+public class StringTokenizerIteratorAdapter extends StringTokenizer implements Iterator<String> {
+
+    public StringTokenizerIteratorAdapter(final String str, final String delim, final boolean returnDelims) {
+        super(str, delim, returnDelims);
+    }
+
+    public StringTokenizerIteratorAdapter(final String str, final String delim) {
+        super(str, delim);
+    }
+
+    public StringTokenizerIteratorAdapter(final String str) {
+        super(str);
+    }
+
+    @Override
+    public boolean hasNext() {
+        return hasMoreTokens();
+    }
+
+    @Override
+    public String next() {
+        return nextToken();
+    }
+}
diff --git a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/pipeline/immutable/Pipe.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/pipeline/immutable/Pipe.java
new file mode 100644
index 0000000000..6fdb4c71c3
--- /dev/null
+++ b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/pipeline/immutable/Pipe.java
@@ -0,0 +1,5 @@
+package com.baeldung.pipeline.immutable;
+
+public interface Pipe<IN, OUT> {
+    OUT process(IN input);
+}
diff --git a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/pipeline/immutable/Pipeline.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/pipeline/immutable/Pipeline.java
new file mode 100644
index 0000000000..db46a26d7e
--- /dev/null
+++ b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/pipeline/immutable/Pipeline.java
@@ -0,0 +1,37 @@
+package com.baeldung.pipeline.immutable;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+
+public class Pipeline<IN, OUT> {
+
+    private Collection<Pipe<?, ?>> pipes;
+
+    private Pipeline(Pipe<IN, OUT> pipe) {
+        pipes = Collections.singletonList(pipe);
+    }
+
+    private Pipeline(Collection<Pipe<?, ?>> pipes) {
+        this.pipes = new ArrayList<>(pipes);
+    }
+
+    public static <IN, OUT> Pipeline<IN, OUT> of(Pipe<IN, OUT> pipe) {
+        return new Pipeline<>(pipe);
+    }
+
+
+    public <NEW_OUT> Pipeline<IN, NEW_OUT> withNextPipe(Pipe<OUT, NEW_OUT> pipe) {
+        final ArrayList<Pipe<?, ?>> newPipes = new ArrayList<>(pipes);
+        newPipes.add(pipe);
+        return new Pipeline<>(newPipes);
+    }
+
+    public OUT process(IN input) {
+        Object output = input;
+        for (final Pipe pipe : pipes) {
+            output = pipe.process(output);
+        }
+        return (OUT) output;
+    }
+}
diff --git a/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/pipeline/pipes/Pipe.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/pipeline/pipes/Pipe.java
new file mode 100644
index 0000000000..93f005fdd2
--- /dev/null
+++ b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/pipeline/pipes/Pipe.java
@@ -0,0 +1,9 @@
+package com.baeldung.pipeline.pipes;
+
+public interface Pipe<IN, OUT> {
+    OUT process(IN input);
+
+    default <NEW_OUT> Pipe<IN, NEW_OUT> add(Pipe <OUT, NEW_OUT> pipe) {
+        return input -> pipe.process(process(input));
+    }
+}
diff --git a/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/adapter/AdapterPatternIntegrationTest.java b/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/adapter/AdapterPatternIntegrationTest.java
deleted file mode 100644
index 536caf7341..0000000000
--- a/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/adapter/AdapterPatternIntegrationTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.baeldung.adapter;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class AdapterPatternIntegrationTest {
-    @Test
-    public void givenMovableAdapter_WhenConvertingMPHToKMPH_thenSuccessfullyConverted() {
-        Movable bugattiVeyron = new BugattiVeyron();
-        MovableAdapter bugattiVeyronAdapter = new MovableAdapterImpl(bugattiVeyron);
-        assertEquals(bugattiVeyronAdapter.getSpeed(), 431.30312, 0.00001);
-
-        Movable mcLaren = new McLaren();
-        MovableAdapter mcLarenAdapter = new MovableAdapterImpl(mcLaren);
-        assertEquals(mcLarenAdapter.getSpeed(), 387.85094, 0.00001);
-
-        Movable astonMartin = new AstonMartin();
-        MovableAdapter astonMartinAdapter = new MovableAdapterImpl(astonMartin);
-        assertEquals(astonMartinAdapter.getSpeed(), 354.0548, 0.00001);
-    }
-}
-
diff --git a/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/adapter/IteratorAdapterUnitTest.java b/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/adapter/IteratorAdapterUnitTest.java
new file mode 100644
index 0000000000..19de6c92ba
--- /dev/null
+++ b/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/adapter/IteratorAdapterUnitTest.java
@@ -0,0 +1,34 @@
+package com.baeldung.adapter;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+import org.junit.jupiter.api.Test;
+
+class IteratorAdapterUnitTest {
+
+    public static final String STRING_DATA = "Welcome to baeldung.com";
+    private final StringTokenizer tokenizer = new StringTokenizer(STRING_DATA);
+    private final Iterator<String> tokenizerAdapter = new StringTokenizerIteratorAdapter(STRING_DATA);
+    private final List<String> expectedTokensForString = Arrays.asList("Welcome", "to", "baeldung.com");
+
+    @Test
+    void givenTokenizer_thenAdapterProducesCorrectResult() {
+        List<String> actualTokens = new ArrayList<>();
+        new IteratorAdapter(tokenizer).forEachRemaining(s -> actualTokens.add((String) s));
+        assertEquals(expectedTokensForString, actualTokens);
+    }
+
+    @Test
+    void givenTokenizerAdapter_thenIteratorProducesCorrectResult() {
+        List<String> actualTokens = new ArrayList<>();
+        tokenizerAdapter.forEachRemaining(actualTokens::add);
+        assertEquals(expectedTokensForString, actualTokens);
+    }
+
+
+}
\ No newline at end of file
diff --git a/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/pipeline/BiFunctionPipelineUnitTest.java b/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/pipeline/BiFunctionPipelineUnitTest.java
new file mode 100644
index 0000000000..5f094ad6e8
--- /dev/null
+++ b/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/pipeline/BiFunctionPipelineUnitTest.java
@@ -0,0 +1,22 @@
+package com.baeldung.pipeline;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import org.junit.jupiter.api.Test;
+
+class BiFunctionPipelineUnitTest {
+
+    @Test
+    void whenCombiningFunctionAndBiFunctions_andInitializingPipeline_thenResultIsCorrect() {
+        BiFunction<Integer, Integer, Integer> add = Integer::sum;
+        BiFunction<Integer, Integer, Integer> mul = (a, b) -> a * b;
+        Function<Integer, String> toString = Object::toString;
+        BiFunction<Integer, Integer, String> pipeline = add.andThen(a -> mul.apply(a, 2))
+            .andThen(toString);
+        String result = pipeline.apply(1, 2);
+        String expected = "6";
+        assertEquals(expected, result);
+    }
+}
\ No newline at end of file
diff --git a/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/pipeline/FunctionPipelineUnitTest.java b/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/pipeline/FunctionPipelineUnitTest.java
new file mode 100644
index 0000000000..71bc14a5eb
--- /dev/null
+++ b/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/pipeline/FunctionPipelineUnitTest.java
@@ -0,0 +1,21 @@
+package com.baeldung.pipeline;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.function.Function;
+import org.junit.jupiter.api.Test;
+
+class FunctionPipelineUnitTest {
+
+    @Test
+    void whenCombiningThreeFunctions_andInitializingPipeline_thenResultIsCorrect() {
+        Function<Integer, Integer> square = s -> s * s;
+        Function<Integer, Integer> half = s -> s / 2;
+        Function<Integer, String> toString = Object::toString;
+        Function<Integer, String> pipeline = square.andThen(half)
+            .andThen(toString);
+        String result = pipeline.apply(5);
+        String expected = "12";
+        assertEquals(expected, result);
+    }
+}
\ No newline at end of file
diff --git a/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/pipeline/PipeUnitTest.java b/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/pipeline/PipeUnitTest.java
new file mode 100644
index 0000000000..6a3a988f89
--- /dev/null
+++ b/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/pipeline/PipeUnitTest.java
@@ -0,0 +1,20 @@
+package com.baeldung.pipeline;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.baeldung.pipeline.pipes.Pipe;
+import org.junit.jupiter.api.Test;
+
+class PipeUnitTest {
+
+    @Test
+    void whenCombiningThreePipes_andInitializingPipeline_thenResultIsCorrect() {
+        Pipe<Integer, Integer> square = s -> s * s;
+        Pipe<Integer, Integer> half = s -> s / 2;
+        Pipe<Integer, String> toString = Object::toString;
+        Pipe<Integer, String> pipeline = square.add(half).add(toString);
+        String result = pipeline.process(5);
+        String expected = "12";
+        assertThat(result).isEqualTo(expected);
+    }
+}
\ No newline at end of file
diff --git a/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/pipeline/PipelineUnitTest.java b/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/pipeline/PipelineUnitTest.java
new file mode 100644
index 0000000000..2cbafc6213
--- /dev/null
+++ b/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/pipeline/PipelineUnitTest.java
@@ -0,0 +1,24 @@
+package com.baeldung.pipeline;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.baeldung.pipeline.immutable.Pipe;
+import com.baeldung.pipeline.immutable.Pipeline;
+import org.junit.jupiter.api.Test;
+
+class PipelineUnitTest {
+
+    @Test
+    void whenCombiningThreePipes_andInitializingPipeline_thenResultIsCorrect() {
+        Pipe<Integer, Integer> square = s -> s * s;
+        Pipe<Integer, Integer> half = s -> s / 2;
+        Pipe<Integer, String> toString = Object::toString;
+        Pipeline<Integer, Integer> squarePipeline = Pipeline.of(square);
+        Pipeline<Integer, Integer> squareAndHalfPipeline = squarePipeline.withNextPipe(half);
+        Pipeline<Integer, String> squareHalfAndStringPipeline = squareAndHalfPipeline.withNextPipe(toString);
+
+        String result = squareHalfAndStringPipeline.process(5);
+        String expected = "12";
+        assertThat(result).isEqualTo(expected);
+    }
+}
\ No newline at end of file
diff --git a/patterns-modules/enterprise-patterns/pom.xml b/patterns-modules/enterprise-patterns/pom.xml
index 2c59ae2536..0e9edbff67 100644
--- a/patterns-modules/enterprise-patterns/pom.xml
+++ b/patterns-modules/enterprise-patterns/pom.xml
@@ -65,7 +65,7 @@
 
     <properties>
         <camel.version>3.7.4</camel.version>
-        <spring-boot.version>2.2.2.RELEASE</spring-boot.version>
+        <spring-boot.version>2.7.8</spring-boot.version>
         <log4j2.version>2.17.1</log4j2.version>
     </properties>
 
diff --git a/patterns-modules/front-controller/pom.xml b/patterns-modules/front-controller/pom.xml
index 84de94cee3..567f3fb793 100644
--- a/patterns-modules/front-controller/pom.xml
+++ b/patterns-modules/front-controller/pom.xml
@@ -17,6 +17,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
+            <version>${javax.servlet-api.version}</version>
         </dependency>
     </dependencies>
 
@@ -25,10 +26,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
+                <version>${maven-war-plugin.version}</version>
             </plugin>
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
+                <version>${jetty-maven-plugin.version}</version>
                 <configuration>
                     <webApp>
                         <contextPath>/front-controller</contextPath>
@@ -38,4 +41,10 @@
         </plugins>
     </build>
 
+    <properties>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
+        <jetty-maven-plugin.version>11.0.13</jetty-maven-plugin.version>
+
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/patterns-modules/idd/README.md b/patterns-modules/idd/README.md
new file mode 100644
index 0000000000..7d843af9ea
--- /dev/null
+++ b/patterns-modules/idd/README.md
@@ -0,0 +1 @@
+### Relevant Articles:
diff --git a/patterns-modules/idd/pom.xml b/patterns-modules/idd/pom.xml
new file mode 100644
index 0000000000..e08e058b92
--- /dev/null
+++ b/patterns-modules/idd/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>idd</artifactId>
+    <version>1.0</version>
+    <name>idd</name>
+    <build>
+        
+    </build>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>patterns-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+</project>
\ No newline at end of file
diff --git a/patterns-modules/idd/src/main/java/com/baeldung/idd/CreateHelpRequestDTO.java b/patterns-modules/idd/src/main/java/com/baeldung/idd/CreateHelpRequestDTO.java
new file mode 100644
index 0000000000..87084474db
--- /dev/null
+++ b/patterns-modules/idd/src/main/java/com/baeldung/idd/CreateHelpRequestDTO.java
@@ -0,0 +1,15 @@
+package com.baeldung.idd;
+
+public class CreateHelpRequestDTO {
+
+    private final HelpRequestStatus status;
+
+    public CreateHelpRequestDTO(HelpRequestStatus status) {
+        this.status = status;
+    }
+
+    public HelpRequestStatus getStatus() {
+        return status;
+    }
+
+}
diff --git a/patterns-modules/idd/src/main/java/com/baeldung/idd/HelpRequestDTO.java b/patterns-modules/idd/src/main/java/com/baeldung/idd/HelpRequestDTO.java
new file mode 100644
index 0000000000..2ad0c5f100
--- /dev/null
+++ b/patterns-modules/idd/src/main/java/com/baeldung/idd/HelpRequestDTO.java
@@ -0,0 +1,13 @@
+package com.baeldung.idd;
+
+public class HelpRequestDTO {
+    private HelpRequestStatus status;
+
+    public HelpRequestStatus getStatus() {
+        return status;
+    }
+
+    public HelpRequestDTO(HelpRequestStatus status) {
+        this.status = status;
+    }
+}
diff --git a/patterns-modules/idd/src/main/java/com/baeldung/idd/HelpRequestService.java b/patterns-modules/idd/src/main/java/com/baeldung/idd/HelpRequestService.java
new file mode 100644
index 0000000000..02c0b2531c
--- /dev/null
+++ b/patterns-modules/idd/src/main/java/com/baeldung/idd/HelpRequestService.java
@@ -0,0 +1,11 @@
+package com.baeldung.idd;
+
+import java.util.List;
+
+public interface HelpRequestService {
+    HelpRequestDTO createHelpRequest(CreateHelpRequestDTO createHelpRequestDTO);
+
+    List<HelpRequestDTO> findAllByStatus(HelpRequestStatus status);
+
+    HelpRequestDTO updateHelpRequest(UpdateHelpRequestDTO updateHelpRequestDTO);
+}
diff --git a/patterns-modules/idd/src/main/java/com/baeldung/idd/HelpRequestServiceImpl.java b/patterns-modules/idd/src/main/java/com/baeldung/idd/HelpRequestServiceImpl.java
new file mode 100644
index 0000000000..8ffed62078
--- /dev/null
+++ b/patterns-modules/idd/src/main/java/com/baeldung/idd/HelpRequestServiceImpl.java
@@ -0,0 +1,24 @@
+package com.baeldung.idd;
+
+import java.util.List;
+
+public class HelpRequestServiceImpl implements HelpRequestService {
+
+    @Override
+    public HelpRequestDTO createHelpRequest(CreateHelpRequestDTO createHelpRequestDTO) {
+        // here goes the implementation
+        return new HelpRequestDTO(createHelpRequestDTO.getStatus());
+    }
+
+    @Override
+    public List<HelpRequestDTO> findAllByStatus(HelpRequestStatus status) {
+        // here goes the implementation
+        return List.of(new HelpRequestDTO(status), new HelpRequestDTO(status));
+    }
+
+    @Override
+    public HelpRequestDTO updateHelpRequest(UpdateHelpRequestDTO updateHelpRequestDTO) {
+        // here goes the implementation
+        return new HelpRequestDTO(updateHelpRequestDTO.getStatus());
+    }
+}
diff --git a/patterns-modules/idd/src/main/java/com/baeldung/idd/HelpRequestStatus.java b/patterns-modules/idd/src/main/java/com/baeldung/idd/HelpRequestStatus.java
new file mode 100644
index 0000000000..adb2fb5cc3
--- /dev/null
+++ b/patterns-modules/idd/src/main/java/com/baeldung/idd/HelpRequestStatus.java
@@ -0,0 +1,6 @@
+package com.baeldung.idd;
+
+public enum HelpRequestStatus {
+    OPEN, IN_PROGRESS, CLOSED
+}
+
diff --git a/patterns-modules/idd/src/main/java/com/baeldung/idd/UpdateHelpRequestDTO.java b/patterns-modules/idd/src/main/java/com/baeldung/idd/UpdateHelpRequestDTO.java
new file mode 100644
index 0000000000..04a46e3d27
--- /dev/null
+++ b/patterns-modules/idd/src/main/java/com/baeldung/idd/UpdateHelpRequestDTO.java
@@ -0,0 +1,14 @@
+package com.baeldung.idd;
+
+public class UpdateHelpRequestDTO {
+
+    private final HelpRequestStatus status;
+
+    public UpdateHelpRequestDTO(HelpRequestStatus status) {
+        this.status = status;
+    }
+
+    public HelpRequestStatus getStatus() {
+        return status;
+    }
+}
diff --git a/patterns-modules/idd/src/test/java/com/baeldung/idd/HelpRequestServiceUnitTest.java b/patterns-modules/idd/src/test/java/com/baeldung/idd/HelpRequestServiceUnitTest.java
new file mode 100644
index 0000000000..52cbcaba57
--- /dev/null
+++ b/patterns-modules/idd/src/test/java/com/baeldung/idd/HelpRequestServiceUnitTest.java
@@ -0,0 +1,47 @@
+package com.baeldung.idd;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+public class HelpRequestServiceUnitTest {
+
+    HelpRequestService testHelpRequestService = new HelpRequestService() {
+        @Override
+        public HelpRequestDTO createHelpRequest(CreateHelpRequestDTO createHelpRequestDTO) {
+            return new HelpRequestDTO(HelpRequestStatus.OPEN);
+        }
+
+        @Override
+        public List<HelpRequestDTO> findAllByStatus(HelpRequestStatus status) {
+            return List.of(new HelpRequestDTO(HelpRequestStatus.OPEN));
+        }
+
+        @Override
+        public HelpRequestDTO updateHelpRequest(UpdateHelpRequestDTO updateHelpRequestDTO) {
+            return new HelpRequestDTO(HelpRequestStatus.OPEN);
+        }
+    };
+
+    @Test
+    public void givenHelpRequest_whenCreateHelpRequest_thenHelpRequestIsCreated() {
+        // given
+        CreateHelpRequestDTO createHelpRequestDTO = new CreateHelpRequestDTO(HelpRequestStatus.OPEN);
+
+        // when
+        HelpRequestDTO helpRequestDTO = testHelpRequestService.createHelpRequest(createHelpRequestDTO);
+
+        // then
+        Assertions.assertThat(helpRequestDTO).isNotNull();
+        Assertions.assertThat(helpRequestDTO.getStatus()).isEqualTo(HelpRequestStatus.OPEN);
+    }
+
+    @Test
+    public void givenHelpRequestList_whenFindAllByStatus_shouldContainOnlyStatus() {
+        HelpRequestService helpRequestService = new HelpRequestServiceImpl();
+        List<HelpRequestDTO> allByStatusOpen = helpRequestService.findAllByStatus(HelpRequestStatus.OPEN);
+        Assertions.assertThat(allByStatusOpen).extracting(HelpRequestDTO::getStatus).containsOnly(HelpRequestStatus.OPEN);
+    }
+
+}
diff --git a/patterns-modules/intercepting-filter/pom.xml b/patterns-modules/intercepting-filter/pom.xml
index 8028454ee2..60246e7838 100644
--- a/patterns-modules/intercepting-filter/pom.xml
+++ b/patterns-modules/intercepting-filter/pom.xml
@@ -17,6 +17,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
+            <version>${javax.servlet-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -30,6 +31,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
+                <version>${maven-war-plugin.version}</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
@@ -46,4 +48,8 @@
         </plugins>
     </build>
 
+    <properties>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/patterns-modules/pom.xml b/patterns-modules/pom.xml
index 26d9a76aee..add2b0475b 100644
--- a/patterns-modules/pom.xml
+++ b/patterns-modules/pom.xml
@@ -31,44 +31,7 @@
         <module>clean-architecture</module>
         <module>enterprise-patterns</module>
         <module>coupling</module>
+        <module>idd</module>
     </modules>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.junit.vintage</groupId>
-                <artifactId>junit-vintage-engine</artifactId>
-                <version>${junit-jupiter.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>${javax.servlet-api.version}</version>
-                <scope>provided</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>${maven-war-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-maven-plugin</artifactId>
-                    <version>${jetty-maven-plugin.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <properties>
-        <jetty-maven-plugin.version>9.4.0.v20161208</jetty-maven-plugin.version>
-    </properties>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/pdf-2/pom.xml b/pdf-2/pom.xml
index 653b55a206..ccbb5c9693 100644
--- a/pdf-2/pom.xml
+++ b/pdf-2/pom.xml
@@ -28,12 +28,12 @@
         <dependency>
             <groupId>com.itextpdf</groupId>
             <artifactId>itextpdf</artifactId>
-            <version>5.5.13.3</version>
+            <version>${itextpdf.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>pdfbox</artifactId>
-            <version>3.0.0-RC1</version>
+            <version>${pdfbox.version}</version>
         </dependency>
     </dependencies>
 
@@ -48,8 +48,10 @@
     </build>
 
     <properties>
+        <itextpdf.version>5.5.13.3</itextpdf.version>
         <itextpdf.core.version>7.2.3</itextpdf.core.version>
         <itextpdf.cleanup.version>3.0.1</itextpdf.cleanup.version>
+        <pdfbox.version>3.0.0-RC1</pdfbox.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/pdf/pom.xml b/pdf/pom.xml
index 4bfc7cb621..cead1b2ded 100644
--- a/pdf/pom.xml
+++ b/pdf/pom.xml
@@ -106,7 +106,7 @@
     <properties>
         <pdfbox-tools.version>2.0.25</pdfbox-tools.version>
         <pdf2dom.version>2.0.1</pdf2dom.version>
-        <itextpdf.version>5.5.10</itextpdf.version>
+        <itextpdf.version>5.5.13.3</itextpdf.version>
         <xmlworker.version>5.5.10</xmlworker.version>
         <poi-scratchpad.version>3.15</poi-scratchpad.version>
         <batik-transcoder.version>1.8</batik-transcoder.version>
diff --git a/persistence-modules/activejdbc/pom.xml b/persistence-modules/activejdbc/pom.xml
index 5fdf27a679..a661fc3abb 100644
--- a/persistence-modules/activejdbc/pom.xml
+++ b/persistence-modules/activejdbc/pom.xml
@@ -74,9 +74,9 @@
     </build>
 
     <properties>
-        <activejdbc.version>2.0</activejdbc.version>
+        <activejdbc.version>3.4-j11</activejdbc.version>
         <environments>development.test,development</environments>
-        <mysql.connector.version>5.1.34</mysql.connector.version>
+        <mysql.connector.version>8.0.32</mysql.connector.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/activejdbc/src/main/java/com/baeldung/ActiveJDBCApp.java b/persistence-modules/activejdbc/src/main/java/com/baeldung/ActiveJDBCApp.java
index 8906d3e759..ea600b9721 100644
--- a/persistence-modules/activejdbc/src/main/java/com/baeldung/ActiveJDBCApp.java
+++ b/persistence-modules/activejdbc/src/main/java/com/baeldung/ActiveJDBCApp.java
@@ -4,6 +4,7 @@ package com.baeldung;
 import com.baeldung.model.Employee;
 import com.baeldung.model.Role;
 import org.javalite.activejdbc.Base;
+import org.javalite.activejdbc.DB;
 import org.javalite.activejdbc.LazyList;
 import org.javalite.activejdbc.Model;
 
@@ -11,8 +12,7 @@ public class ActiveJDBCApp
 {
     public static void main( String[] args )
     {
-        try {
-            Base.open();
+        try(final DB open = Base.open()) {
             ActiveJDBCApp app = new ActiveJDBCApp();
             app.create();
             app.update();
diff --git a/persistence-modules/core-java-persistence/pom.xml b/persistence-modules/core-java-persistence/pom.xml
index 5cc1df483f..e8add07fbf 100644
--- a/persistence-modules/core-java-persistence/pom.xml
+++ b/persistence-modules/core-java-persistence/pom.xml
@@ -52,14 +52,21 @@
             <artifactId>spring-boot-starter</artifactId>
             <version>${springframework.boot.spring-boot-starter.version}</version>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql-connector.version}</version>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
     <properties>
-        <commons-dbcp2.version>2.4.0</commons-dbcp2.version>
-        <HikariCP.version>3.2.0</HikariCP.version>
-        <c3p0.version>0.9.5.2</c3p0.version>
-        <springframework.boot.spring-boot-starter.version>1.5.8.RELEASE</springframework.boot.spring-boot-starter.version>
-        <springframework.spring-web.version>4.3.4.RELEASE</springframework.spring-web.version>
+        <commons-dbcp2.version>2.9.0</commons-dbcp2.version>
+        <HikariCP.version>5.0.1</HikariCP.version>
+        <c3p0.version>0.9.5.5</c3p0.version>
+        <springframework.boot.spring-boot-starter.version>3.0.4</springframework.boot.spring-boot-starter.version>
+        <springframework.spring-web.version>6.0.6</springframework.spring-web.version>
+        <mysql-connector.version>8.0.32</mysql-connector.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcmetadata/DatabaseConfig.java b/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcmetadata/DatabaseConfig.java
index 8ad689041e..44cfc75a2b 100644
--- a/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcmetadata/DatabaseConfig.java
+++ b/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcmetadata/DatabaseConfig.java
@@ -1,13 +1,14 @@
 package com.baeldung.jdbcmetadata;
 
-import org.apache.log4j.Logger;
-
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class DatabaseConfig {
-    private static final Logger LOG = Logger.getLogger(DatabaseConfig.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DatabaseConfig.class);
 
     private Connection connection;
 
@@ -17,7 +18,7 @@ public class DatabaseConfig {
             String url = "jdbc:h2:mem:testdb";
             connection = DriverManager.getConnection(url, "sa", "");
         } catch (ClassNotFoundException | SQLException e) {
-            LOG.error(e);
+            LOG.error(e.getMessage());
         }
     }
 
@@ -35,7 +36,7 @@ public class DatabaseConfig {
             connection.createStatement().executeUpdate("create table CUSTOMER (ID int primary key auto_increment, NAME VARCHAR(45))");
             connection.createStatement().executeUpdate("create table CUST_ADDRESS (ID VARCHAR(36), CUST_ID int, ADDRESS VARCHAR(45), FOREIGN KEY (CUST_ID) REFERENCES CUSTOMER(ID))");
         } catch (SQLException e) {
-            LOG.error(e);
+            LOG.error(e.getMessage());
         }
     }
 
@@ -43,7 +44,7 @@ public class DatabaseConfig {
         try {
             connection.createStatement().executeUpdate("CREATE VIEW CUSTOMER_VIEW AS SELECT * FROM CUSTOMER");
         } catch (SQLException e) {
-            LOG.error(e);
+            LOG.error(e.getMessage());
         }
     }
 }
diff --git a/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcmetadata/JdbcMetadataApplication.java b/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcmetadata/JdbcMetadataApplication.java
index 591a14f3b5..f85f227381 100644
--- a/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcmetadata/JdbcMetadataApplication.java
+++ b/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcmetadata/JdbcMetadataApplication.java
@@ -1,12 +1,13 @@
 package com.baeldung.jdbcmetadata;
 
-import org.apache.log4j.Logger;
-
 import java.sql.SQLException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class JdbcMetadataApplication {
 
-    private static final Logger LOG = Logger.getLogger(JdbcMetadataApplication.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JdbcMetadataApplication.class);
 
     public static void main(String[] args) {
         DatabaseConfig databaseConfig = new DatabaseConfig();
diff --git a/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcrowset/DatabaseConfiguration.java b/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcrowset/DatabaseConfiguration.java
index 9cfcff468e..a53c82d3da 100644
--- a/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcrowset/DatabaseConfiguration.java
+++ b/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcrowset/DatabaseConfiguration.java
@@ -5,10 +5,6 @@ import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import javax.sql.rowset.JdbcRowSet;
-import javax.sql.rowset.RowSetFactory;
-import javax.sql.rowset.RowSetProvider;
-
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcrowset/JdbcRowsetApplication.java b/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcrowset/JdbcRowsetApplication.java
index 72c462ac42..163b3a3b58 100644
--- a/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcrowset/JdbcRowsetApplication.java
+++ b/persistence-modules/core-java-persistence/src/main/java/com/baeldung/jdbcrowset/JdbcRowsetApplication.java
@@ -7,8 +7,6 @@ import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import com.sun.rowset.*;
-
 import javax.sql.rowset.CachedRowSet;
 import javax.sql.rowset.FilteredRowSet;
 import javax.sql.rowset.JdbcRowSet;
@@ -25,7 +23,7 @@ public class JdbcRowsetApplication {
 
     public static void main(String[] args) throws Exception {
         SpringApplication.run(JdbcRowsetApplication.class, args);
-        Statement stmt = null;
+        Statement stmt;
         try {
             Connection conn = DatabaseConfiguration.geth2Connection();
 
@@ -41,8 +39,7 @@ public class JdbcRowsetApplication {
             DatabaseConfiguration.initDatabase(stmt);
             // JdbcRowSet Example
             String sql = "SELECT * FROM customers";
-            JdbcRowSet jdbcRS;
-            jdbcRS = new JdbcRowSetImpl(conn);
+            JdbcRowSet jdbcRS = RowSetProvider.newFactory().createJdbcRowSet();
             jdbcRS.setType(ResultSet.TYPE_SCROLL_INSENSITIVE);
             jdbcRS.setCommand(sql);
             jdbcRS.execute();
@@ -58,7 +55,8 @@ public class JdbcRowsetApplication {
             String username = "sa";
             String password = "";
             String url = "jdbc:h2:mem:testdb";
-            CachedRowSet crs = new CachedRowSetImpl();
+            RowSetFactory aFactory = RowSetProvider.newFactory();
+            CachedRowSet crs = aFactory.createCachedRowSet();
             crs.setUsername(username);
             crs.setPassword(password);
             crs.setUrl(url);
@@ -74,7 +72,7 @@ public class JdbcRowsetApplication {
             }
 
             // WebRowSet example
-            WebRowSet wrs = new WebRowSetImpl();
+            WebRowSet wrs = RowSetProvider.newFactory().createWebRowSet();
             wrs.setUsername(username);
             wrs.setPassword(password);
             wrs.setUrl(url);
@@ -84,14 +82,14 @@ public class JdbcRowsetApplication {
             wrs.writeXml(ostream);
 
             // JoinRowSet example
-            CachedRowSetImpl customers = new CachedRowSetImpl();
+            CachedRowSet customers = aFactory.createCachedRowSet();
             customers.setUsername(username);
             customers.setPassword(password);
             customers.setUrl(url);
             customers.setCommand(sql);
             customers.execute();
 
-            CachedRowSetImpl associates = new CachedRowSetImpl();
+            CachedRowSet associates = aFactory.createCachedRowSet();
             associates.setUsername(username);
             associates.setPassword(password);
             associates.setUrl(url);
@@ -99,7 +97,7 @@ public class JdbcRowsetApplication {
             associates.setCommand(associatesSQL);
             associates.execute();
 
-            JoinRowSet jrs = new JoinRowSetImpl();
+            JoinRowSet jrs = RowSetProvider.newFactory().createJoinRowSet();
             final String ID = "id";
             final String NAME = "name";
             jrs.addRowSet(customers, ID);
diff --git a/persistence-modules/core-java-persistence/src/test/java/com/baeldung/jdbcrowset/JdbcRowSetLiveTest.java b/persistence-modules/core-java-persistence/src/test/java/com/baeldung/jdbcrowset/JdbcRowSetLiveTest.java
index ebfb4df102..2b2b35c423 100644
--- a/persistence-modules/core-java-persistence/src/test/java/com/baeldung/jdbcrowset/JdbcRowSetLiveTest.java
+++ b/persistence-modules/core-java-persistence/src/test/java/com/baeldung/jdbcrowset/JdbcRowSetLiveTest.java
@@ -19,11 +19,6 @@ import javax.sql.rowset.WebRowSet;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.sun.rowset.CachedRowSetImpl;
-import com.sun.rowset.JdbcRowSetImpl;
-import com.sun.rowset.JoinRowSetImpl;
-import com.sun.rowset.WebRowSetImpl;
-
 public class JdbcRowSetLiveTest {
     Statement stmt = null;
     String username = "sa";
@@ -51,9 +46,10 @@ public class JdbcRowSetLiveTest {
     public void createJdbcRowSet_SelectCustomers_ThenCorrect() throws Exception {
 
         String sql = "SELECT * FROM customers";
-        JdbcRowSet jdbcRS;
-        Connection conn = DatabaseConfiguration.geth2Connection();
-        jdbcRS = new JdbcRowSetImpl(conn);
+        JdbcRowSet jdbcRS = RowSetProvider.newFactory().createJdbcRowSet();
+        jdbcRS.setUrl("jdbc:h2:mem:testdb");
+        jdbcRS.setUsername("sa");
+        jdbcRS.setPassword("");
         jdbcRS.setType(ResultSet.TYPE_SCROLL_INSENSITIVE);
         jdbcRS.setCommand(sql);
         jdbcRS.execute();
@@ -71,7 +67,7 @@ public class JdbcRowSetLiveTest {
     @Test
     public void createCachedRowSet_DeleteRecord_ThenCorrect() throws Exception {
 
-        CachedRowSet crs = new CachedRowSetImpl();
+        CachedRowSet crs = RowSetProvider.newFactory().createCachedRowSet();
         crs.setUsername(username);
         crs.setPassword(password);
         crs.setUrl(url);
@@ -91,7 +87,7 @@ public class JdbcRowSetLiveTest {
     @Test
     public void createWebRowSet_SelectCustomers_WritetoXML_ThenCorrect() throws SQLException, IOException {
 
-        WebRowSet wrs = new WebRowSetImpl();
+        WebRowSet wrs = RowSetProvider.newFactory().createWebRowSet();
         wrs.setUsername(username);
         wrs.setPassword(password);
         wrs.setUrl(url);
@@ -105,14 +101,14 @@ public class JdbcRowSetLiveTest {
     @Test
     public void createCachedRowSets_DoJoinRowSet_ThenCorrect() throws Exception {
 
-        CachedRowSetImpl customers = new CachedRowSetImpl();
+        CachedRowSet customers = RowSetProvider.newFactory().createCachedRowSet();
         customers.setUsername(username);
         customers.setPassword(password);
         customers.setUrl(url);
         customers.setCommand(sql);
         customers.execute();
 
-        CachedRowSetImpl associates = new CachedRowSetImpl();
+        CachedRowSet associates = RowSetProvider.newFactory().createCachedRowSet();
         associates.setUsername(username);
         associates.setPassword(password);
         associates.setUrl(url);
@@ -120,7 +116,7 @@ public class JdbcRowSetLiveTest {
         associates.setCommand(associatesSQL);
         associates.execute();
 
-        JoinRowSet jrs = new JoinRowSetImpl();
+        JoinRowSet jrs = RowSetProvider.newFactory().createJoinRowSet();
         final String ID = "id";
         final String NAME = "name";
         jrs.addRowSet(customers, ID);
diff --git a/persistence-modules/core-java-persistence/src/test/java/com/baeldung/spring/jdbc/JdbcLiveTest.java b/persistence-modules/core-java-persistence/src/test/java/com/baeldung/spring/jdbc/JdbcLiveTest.java
index c13f94f12a..fe00ca28dc 100644
--- a/persistence-modules/core-java-persistence/src/test/java/com/baeldung/spring/jdbc/JdbcLiveTest.java
+++ b/persistence-modules/core-java-persistence/src/test/java/com/baeldung/spring/jdbc/JdbcLiveTest.java
@@ -1,9 +1,10 @@
 package com.baeldung.spring.jdbc;
 
-import org.apache.log4j.Logger;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.sql.CallableStatement;
 import java.sql.Connection;
@@ -24,7 +25,7 @@ import static org.junit.Assert.assertTrue;
 
 public class JdbcLiveTest {
 
-    private static final Logger LOG = Logger.getLogger(JdbcLiveTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JdbcLiveTest.class);
 
     private Connection con;
 
diff --git a/persistence-modules/core-java-persistence/src/test/java/com/baeldung/spring/jdbc/ResultSetLiveTest.java b/persistence-modules/core-java-persistence/src/test/java/com/baeldung/spring/jdbc/ResultSetLiveTest.java
index 853e78a68d..c77e314141 100644
--- a/persistence-modules/core-java-persistence/src/test/java/com/baeldung/spring/jdbc/ResultSetLiveTest.java
+++ b/persistence-modules/core-java-persistence/src/test/java/com/baeldung/spring/jdbc/ResultSetLiveTest.java
@@ -13,7 +13,6 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.FixMethodOrder;
@@ -25,8 +24,6 @@ import junit.framework.Assert;
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ResultSetLiveTest {
 
-    private static final Logger logger = Logger.getLogger(ResultSetLiveTest.class);
-
     private final Employee expectedEmployee1 = new Employee(1, "John", 1000.0, "Developer");
 
     private final Employee updatedEmployee1 = new Employee(1, "John", 1100.0, "Developer");
diff --git a/persistence-modules/hbase/pom.xml b/persistence-modules/hbase/pom.xml
index e38b73e137..3e6cfe27be 100644
--- a/persistence-modules/hbase/pom.xml
+++ b/persistence-modules/hbase/pom.xml
@@ -33,7 +33,7 @@
     </dependencies>
 
     <properties>
-        <hbase.version>1.3.1</hbase.version>
+        <hbase.version>2.5.3</hbase.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/hbase/src/main/java/com/baeldung/hbase/HbaseClientExample.java b/persistence-modules/hbase/src/main/java/com/baeldung/hbase/HbaseClientExample.java
index 5546f15e36..3a137a6019 100644
--- a/persistence-modules/hbase/src/main/java/com/baeldung/hbase/HbaseClientExample.java
+++ b/persistence-modules/hbase/src/main/java/com/baeldung/hbase/HbaseClientExample.java
@@ -1,7 +1,5 @@
 package com.baeldung.hbase;
 
-
-import com.google.protobuf.ServiceException;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HBaseConfiguration;
@@ -13,11 +11,11 @@ import java.io.IOException;
 //install hbase locally & hbase master start
 public class HbaseClientExample {
 
-    public static void main(String[] args) throws IOException, ServiceException {
+    public static void main(String[] args) throws IOException {
         new HbaseClientExample().connect();
     }
 
-    private void connect() throws IOException, ServiceException {
+    private void connect() throws IOException {
         Configuration config = HBaseConfiguration.create();
 
         String path = this.getClass().getClassLoader().getResource("hbase-site.xml").getPath();
@@ -25,7 +23,7 @@ public class HbaseClientExample {
         config.addResource(new Path(path));
 
         try {
-            HBaseAdmin.checkHBaseAvailable(config);
+            HBaseAdmin.available(config);
         } catch (MasterNotRunningException e) {
             System.out.println("HBase is not running." + e.getMessage());
             return;
diff --git a/persistence-modules/hibernate-annotations/README.md b/persistence-modules/hibernate-annotations/README.md
index 9b68579151..a03fb7e8e3 100644
--- a/persistence-modules/hibernate-annotations/README.md
+++ b/persistence-modules/hibernate-annotations/README.md
@@ -10,3 +10,4 @@ This module contains articles about Annotations used in Hibernate.
 - [Hibernate @WhereJoinTable Annotation](https://www.baeldung.com/hibernate-wherejointable)
 - [Usage of the Hibernate @LazyCollection Annotation](https://www.baeldung.com/hibernate-lazycollection)
 - [@Immutable in Hibernate](https://www.baeldung.com/hibernate-immutable)
+- [Hibernate @CreationTimestamp and @UpdateTimestamp](https://www.baeldung.com/hibernate-creationtimestamp-updatetimestamp)
diff --git a/persistence-modules/hibernate-annotations/pom.xml b/persistence-modules/hibernate-annotations/pom.xml
index 310b409a00..6417421fed 100644
--- a/persistence-modules/hibernate-annotations/pom.xml
+++ b/persistence-modules/hibernate-annotations/pom.xml
@@ -76,13 +76,18 @@
             <version>${org.springframework.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.hypersistence</groupId>
+            <artifactId>hypersistence-utils-hibernate-60</artifactId>
+            <version>3.3.1</version>
+        </dependency>
     </dependencies>
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>5.0.2.RELEASE</org.springframework.version>
-        <org.springframework.data.version>1.10.6.RELEASE</org.springframework.data.version>
-        <hibernate-core.version>5.6.7.Final</hibernate-core.version>
+        <org.springframework.version>6.0.6</org.springframework.version>
+        <org.springframework.data.version>3.0.3</org.springframework.data.version>
+        <hibernate-core.version>6.1.7.Final</hibernate-core.version>
         <maven.deploy.skip>true</maven.deploy.skip>
         <tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
     </properties>
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/creationupdatetimestamp/model/Book.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/creationupdatetimestamp/model/Book.java
new file mode 100644
index 0000000000..0484c31ced
--- /dev/null
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/creationupdatetimestamp/model/Book.java
@@ -0,0 +1,57 @@
+package com.baeldung.hibernate.creationupdatetimestamp.model;
+
+import java.time.Instant;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.UpdateTimestamp;
+
+@Entity
+public class Book {
+    @Id
+    @GeneratedValue
+    private Long id;
+    private String title;
+    @CreationTimestamp
+    private Instant createdOn;
+    @UpdateTimestamp
+    private Instant lastUpdatedOn;
+
+    public Book() {
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Instant getCreatedOn() {
+        return createdOn;
+    }
+
+    public void setCreatedOn(Instant createdOn) {
+        this.createdOn = createdOn;
+    }
+
+    public Instant getLastUpdatedOn() {
+        return lastUpdatedOn;
+    }
+
+    public void setLastUpdatedOn(Instant lastUpdatedOn) {
+        this.lastUpdatedOn = lastUpdatedOn;
+    }
+}
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/AddressType.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/AddressType.java
index c10c67df9a..f50d8fd7cc 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/AddressType.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/AddressType.java
@@ -1,11 +1,11 @@
 package com.baeldung.hibernate.customtypes;
 
 import org.hibernate.HibernateException;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.type.IntegerType;
-import org.hibernate.type.StringType;
-import org.hibernate.type.Type;
+import org.hibernate.metamodel.spi.ValueAccess;
 import org.hibernate.usertype.CompositeUserType;
+import org.hibernate.usertype.UserType;
 
 import java.io.Serializable;
 import java.sql.PreparedStatement;
@@ -14,74 +14,51 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Objects;
 
-public class AddressType implements CompositeUserType {
+public class AddressType implements CompositeUserType<Address>, UserType<Address> {
 
     @Override
-    public String[] getPropertyNames() {
-        return new String[]{"addressLine1", "addressLine2",
-                "city", "country", "zipcode"};
-    }
-
-    @Override
-    public Type[] getPropertyTypes() {
-        return new Type[]{StringType.INSTANCE, StringType.INSTANCE,
-                StringType.INSTANCE, StringType.INSTANCE, IntegerType.INSTANCE};
-    }
-
-    @Override
-    public Object getPropertyValue(Object component, int property) throws HibernateException {
-
-        Address empAdd = (Address) component;
+    public Object getPropertyValue(Address component, int property) throws HibernateException {
 
         switch (property) {
             case 0:
-                return empAdd.getAddressLine1();
+                return component.getAddressLine1();
             case 1:
-                return empAdd.getAddressLine2();
+                return component.getAddressLine2();
             case 2:
-                return empAdd.getCity();
+                return component.getCity();
             case 3:
-                return empAdd.getCountry();
+                return component.getCountry();
             case 4:
-                return Integer.valueOf(empAdd.getZipCode());
+                return component.getZipCode();
+            default:
+                throw new IllegalArgumentException(property +
+                        " is an invalid property index for class type " +
+                        component.getClass().getName());
         }
-
-        throw new IllegalArgumentException(property +
-                " is an invalid property index for class type " +
-                component.getClass().getName());
     }
 
     @Override
-    public void setPropertyValue(Object component, int property, Object value) throws HibernateException {
-
-        Address empAdd = (Address) component;
-
-        switch (property) {
-            case 0:
-                empAdd.setAddressLine1((String) value);
-            case 1:
-                empAdd.setAddressLine2((String) value);
-            case 2:
-                empAdd.setCity((String) value);
-            case 3:
-                empAdd.setCountry((String) value);
-            case 4:
-                empAdd.setZipCode((Integer) value);
-        }
-
-        throw new IllegalArgumentException(property +
-                " is an invalid property index for class type " +
-                component.getClass().getName());
-
+    public Address instantiate(ValueAccess values, SessionFactoryImplementor sessionFactory) {
+        return null;
     }
 
     @Override
-    public Class returnedClass() {
+    public Class<?> embeddable() {
         return Address.class;
     }
 
     @Override
-    public boolean equals(Object x, Object y) throws HibernateException {
+    public int getSqlType() {
+        return Types.VARCHAR;
+    }
+
+    @Override
+    public Class<Address> returnedClass() {
+        return Address.class;
+    }
+
+    @Override
+    public boolean equals(Address x, Address y) {
         if (x == y)
             return true;
 
@@ -92,57 +69,52 @@ public class AddressType implements CompositeUserType {
     }
 
     @Override
-    public int hashCode(Object x) throws HibernateException {
+    public int hashCode(Address x) {
         return x.hashCode();
     }
 
     @Override
-    public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) throws HibernateException, SQLException {
-
+    public Address nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session, Object owner) throws SQLException {
         Address empAdd = new Address();
-        empAdd.setAddressLine1(rs.getString(names[0]));
+        empAdd.setAddressLine1(rs.getString(position));
 
         if (rs.wasNull())
             return null;
 
-        empAdd.setAddressLine2(rs.getString(names[1]));
-        empAdd.setCity(rs.getString(names[2]));
-        empAdd.setCountry(rs.getString(names[3]));
-        empAdd.setZipCode(rs.getInt(names[4]));
+        empAdd.setAddressLine2(rs.getString(position));
+        empAdd.setCity(rs.getString(position));
+        empAdd.setCountry(rs.getString(position));
+        empAdd.setZipCode(rs.getInt(position));
 
         return empAdd;
     }
 
     @Override
-    public void nullSafeSet(PreparedStatement st, Object value, int index, SharedSessionContractImplementor session) throws HibernateException, SQLException {
-
+    public void nullSafeSet(PreparedStatement st, Address value, int index, SharedSessionContractImplementor session) throws SQLException {
         if (Objects.isNull(value))
             st.setNull(index, Types.VARCHAR);
         else {
 
-            Address empAdd = (Address) value;
-            st.setString(index, empAdd.getAddressLine1());
-            st.setString(index + 1, empAdd.getAddressLine2());
-            st.setString(index + 2, empAdd.getCity());
-            st.setString(index + 3, empAdd.getCountry());
-            st.setInt(index + 4, empAdd.getZipCode());
+            st.setString(index, value.getAddressLine1());
+            st.setString(index + 1, value.getAddressLine2());
+            st.setString(index + 2, value.getCity());
+            st.setString(index + 3, value.getCountry());
+            st.setInt(index + 4, value.getZipCode());
         }
     }
 
     @Override
-    public Object deepCopy(Object value) throws HibernateException {
-
+    public Address deepCopy(Address value) {
         if (Objects.isNull(value))
             return null;
 
-        Address oldEmpAdd = (Address) value;
         Address newEmpAdd = new Address();
 
-        newEmpAdd.setAddressLine1(oldEmpAdd.getAddressLine1());
-        newEmpAdd.setAddressLine2(oldEmpAdd.getAddressLine2());
-        newEmpAdd.setCity(oldEmpAdd.getCity());
-        newEmpAdd.setCountry(oldEmpAdd.getCountry());
-        newEmpAdd.setZipCode(oldEmpAdd.getZipCode());
+        newEmpAdd.setAddressLine1(value.getAddressLine1());
+        newEmpAdd.setAddressLine2(value.getAddressLine2());
+        newEmpAdd.setCity(value.getCity());
+        newEmpAdd.setCountry(value.getCountry());
+        newEmpAdd.setZipCode(value.getZipCode());
 
         return newEmpAdd;
     }
@@ -153,17 +125,27 @@ public class AddressType implements CompositeUserType {
     }
 
     @Override
-    public Serializable disassemble(Object value, SharedSessionContractImplementor session) throws HibernateException {
+    public Serializable disassemble(Address value) {
         return (Serializable) deepCopy(value);
     }
 
     @Override
-    public Object assemble(Serializable cached, SharedSessionContractImplementor session, Object owner) throws HibernateException {
-        return deepCopy(cached);
+    public Address assemble(Serializable cached, Object owner) {
+        return deepCopy((Address) cached);
     }
 
     @Override
-    public Object replace(Object original, Object target, SharedSessionContractImplementor session, Object owner) throws HibernateException {
-        return original;
+    public Address replace(Address detached, Address managed, Object owner) {
+        return detached;
+    }
+
+    @Override
+    public boolean isInstance(Object object, SessionFactoryImplementor sessionFactory) {
+        return CompositeUserType.super.isInstance(object, sessionFactory);
+    }
+
+    @Override
+    public boolean isSameClass(Object object, SessionFactoryImplementor sessionFactory) {
+        return CompositeUserType.super.isSameClass(object, sessionFactory);
     }
 }
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringJavaDescriptor.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringJavaDescriptor.java
index 56be9e693f..8f1794b979 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringJavaDescriptor.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringJavaDescriptor.java
@@ -1,14 +1,14 @@
 package com.baeldung.hibernate.customtypes;
 
-import org.hibernate.type.LocalDateType;
 import org.hibernate.type.descriptor.WrapperOptions;
-import org.hibernate.type.descriptor.java.AbstractTypeDescriptor;
 import org.hibernate.type.descriptor.java.ImmutableMutabilityPlan;
-import org.hibernate.type.descriptor.java.MutabilityPlan;
 
 import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 
-public class LocalDateStringJavaDescriptor extends AbstractTypeDescriptor<LocalDate> {
+import io.hypersistence.utils.hibernate.type.array.internal.AbstractArrayTypeDescriptor;
+
+public class LocalDateStringJavaDescriptor extends AbstractArrayTypeDescriptor<LocalDate> {
 
     public static final LocalDateStringJavaDescriptor INSTANCE = new LocalDateStringJavaDescriptor();
 
@@ -18,12 +18,12 @@ public class LocalDateStringJavaDescriptor extends AbstractTypeDescriptor<LocalD
 
     @Override
     public String toString(LocalDate value) {
-        return LocalDateType.FORMATTER.format(value);
+        return DateTimeFormatter.ISO_LOCAL_DATE.format(value);
     }
 
     @Override
-    public LocalDate fromString(String string) {
-        return LocalDate.from(LocalDateType.FORMATTER.parse(string));
+    public LocalDate fromString(CharSequence string) {
+        return LocalDate.from( DateTimeFormatter.ISO_LOCAL_DATE.parse(string));
     }
 
     @Override
@@ -33,7 +33,7 @@ public class LocalDateStringJavaDescriptor extends AbstractTypeDescriptor<LocalD
             return null;
 
         if (String.class.isAssignableFrom(type))
-            return (X) LocalDateType.FORMATTER.format(value);
+            return (X) DateTimeFormatter.ISO_LOCAL_DATE.format(value);
 
         throw unknownUnwrap(type);
     }
@@ -44,7 +44,7 @@ public class LocalDateStringJavaDescriptor extends AbstractTypeDescriptor<LocalD
             return null;
 
         if(String.class.isInstance(value))
-            return LocalDate.from(LocalDateType.FORMATTER.parse((CharSequence) value));
+            return LocalDate.from( DateTimeFormatter.ISO_LOCAL_DATE.parse((CharSequence) value));
 
         throw unknownWrap(value.getClass());
     }
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringType.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringType.java
index c8d37073e8..57a8bcfd08 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringType.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringType.java
@@ -2,18 +2,16 @@ package com.baeldung.hibernate.customtypes;
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.type.AbstractSingleColumnStandardBasicType;
-import org.hibernate.type.DiscriminatorType;
-import org.hibernate.type.descriptor.java.LocalDateJavaDescriptor;
-import org.hibernate.type.descriptor.sql.VarcharTypeDescriptor;
+import org.hibernate.type.descriptor.jdbc.VarcharJdbcType;
 
 import java.time.LocalDate;
 
-public class LocalDateStringType extends AbstractSingleColumnStandardBasicType<LocalDate> implements DiscriminatorType<LocalDate> {
+public class LocalDateStringType extends AbstractSingleColumnStandardBasicType<LocalDate> {
 
     public static final LocalDateStringType INSTANCE = new LocalDateStringType();
 
     public LocalDateStringType() {
-        super(VarcharTypeDescriptor.INSTANCE, LocalDateStringJavaDescriptor.INSTANCE);
+        super(VarcharJdbcType.INSTANCE, LocalDateStringJavaDescriptor.INSTANCE);
     }
 
     @Override
@@ -21,14 +19,12 @@ public class LocalDateStringType extends AbstractSingleColumnStandardBasicType<L
         return "LocalDateString";
     }
 
-    @Override
-    public LocalDate stringToObject(String xml) throws Exception {
+    public LocalDate stringToObject(String xml) {
         return fromString(xml);
     }
 
-    @Override
-    public String objectToSQLString(LocalDate value, Dialect dialect) throws Exception {
-        return '\'' + toString(value) + '\'';
+    public String objectToSQLString(LocalDate value, Dialect dialect) {
+        return '\'' + LocalDateStringJavaDescriptor.INSTANCE.toString(value) + '\'';
     }
 
 }
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/OfficeEmployee.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/OfficeEmployee.java
index 1ffeb0b99d..1a29182764 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/OfficeEmployee.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/OfficeEmployee.java
@@ -1,20 +1,19 @@
 package com.baeldung.hibernate.customtypes;
 
-import org.hibernate.annotations.Columns;
+import org.hibernate.annotations.CompositeType;
 import org.hibernate.annotations.Parameter;
 import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
+import org.hibernate.usertype.UserTypeLegacyBridge;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.AttributeOverrides;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.time.LocalDate;
 
-@TypeDef(name = "PhoneNumber",
-        typeClass = PhoneNumberType.class,
-        defaultForType = PhoneNumber.class)
 @Entity
 @Table(name = "OfficeEmployee")
 public class OfficeEmployee {
@@ -24,25 +23,36 @@ public class OfficeEmployee {
     private long id;
 
     @Column
-    @Type(type = "LocalDateString")
+    @Type(
+            value = UserTypeLegacyBridge.class,
+            parameters = @Parameter(name = UserTypeLegacyBridge.TYPE_NAME_PARAM_KEY, value = "LocalDateString")
+    )
     private LocalDate dateOfJoining;
 
-    @Columns(columns = {@Column(name = "country_code"),
-            @Column(name = "city_code"),
-            @Column(name = "number")})
+    @AttributeOverrides({
+            @AttributeOverride(name = "countryCode", column = @Column(name = "country_code")),
+            @AttributeOverride(name = "cityCode", column = @Column(name = "city_code")),
+            @AttributeOverride(name = "number", column = @Column(name = "number"))
+    })
+    @Type(value = PhoneNumberType.class)
     private PhoneNumber employeeNumber;
 
-    @Columns(columns = {@Column(name = "address_line_1"),
-            @Column(name = "address_line_2"),
-            @Column(name = "city"), @Column(name = "country"),
-            @Column(name = "zip_code")})
-    @Type(type = "com.baeldung.hibernate.customtypes.AddressType")
+    @CompositeType(value = com.baeldung.hibernate.customtypes.AddressType.class)
+    @AttributeOverrides({
+            @AttributeOverride(name = "addressLine1", column = @Column(name = "address_line_1")),
+            @AttributeOverride(name = "addressLine2", column = @Column(name = "address_line_2")),
+            @AttributeOverride(name = "city", column = @Column(name = "city")),
+            @AttributeOverride(name = "country", column = @Column(name = "country")),
+            @AttributeOverride(name = "zipCode", column = @Column(name = "zip_code"))
+    })
     private Address empAddress;
 
-    @Type(type = "com.baeldung.hibernate.customtypes.SalaryType",
+    @Type(value = com.baeldung.hibernate.customtypes.SalaryType.class,
             parameters = {@Parameter(name = "currency", value = "USD")})
-    @Columns(columns = {@Column(name = "amount"),
-            @Column(name = "currency")})
+   @AttributeOverrides({
+            @AttributeOverride(name = "amount", column = @Column(name = "amount")),
+            @AttributeOverride(name = "currency", column = @Column(name = "currency"))
+    })
     private Salary salary;
 
     public Salary getSalary() {
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumber.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumber.java
index 0be6cbc910..a3485ae0dd 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumber.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumber.java
@@ -2,11 +2,11 @@ package com.baeldung.hibernate.customtypes;
 
 import java.util.Objects;
 
-public final class PhoneNumber {
+public class PhoneNumber {
 
-    private final int countryCode;
-    private final int cityCode;
-    private final int number;
+    private int countryCode;
+    private int cityCode;
+    private int number;
 
     public PhoneNumber(int countryCode, int cityCode, int number) {
         this.countryCode = countryCode;
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumberType.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumberType.java
index 79caa3d6fd..0f8df5f315 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumberType.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/PhoneNumberType.java
@@ -1,6 +1,5 @@
 package com.baeldung.hibernate.customtypes;
 
-import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.usertype.UserType;
 
@@ -11,11 +10,11 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Objects;
 
+public class PhoneNumberType implements UserType<PhoneNumber> {
 
-public class PhoneNumberType implements UserType {
     @Override
-    public int[] sqlTypes() {
-        return new int[]{Types.INTEGER, Types.INTEGER, Types.INTEGER};
+    public int getSqlType() {
+        return Types.INTEGER;
     }
 
     @Override
@@ -24,7 +23,7 @@ public class PhoneNumberType implements UserType {
     }
 
     @Override
-    public boolean equals(Object x, Object y) throws HibernateException {
+    public boolean equals(PhoneNumber x, PhoneNumber y) {
         if (x == y)
             return true;
         if (Objects.isNull(x) || Objects.isNull(y))
@@ -34,48 +33,42 @@ public class PhoneNumberType implements UserType {
     }
 
     @Override
-    public int hashCode(Object x) throws HibernateException {
+    public int hashCode(PhoneNumber x) {
         return x.hashCode();
     }
 
     @Override
-    public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) throws HibernateException, SQLException {
-        int countryCode = rs.getInt(names[0]);
+    public PhoneNumber nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session, Object owner) throws SQLException {
+        int countryCode = rs.getInt(position);
 
         if (rs.wasNull())
             return null;
 
-        int cityCode = rs.getInt(names[1]);
-        int number = rs.getInt(names[2]);
-        PhoneNumber employeeNumber = new PhoneNumber(countryCode, cityCode, number);
+        int cityCode = rs.getInt(position);
+        int number = rs.getInt(position);
 
-        return employeeNumber;
+        return new PhoneNumber(countryCode, cityCode, number);
     }
 
     @Override
-    public void nullSafeSet(PreparedStatement st, Object value, int index, SharedSessionContractImplementor session) throws HibernateException, SQLException {
-
+    public void nullSafeSet(PreparedStatement st, PhoneNumber value, int index, SharedSessionContractImplementor session) throws SQLException {
         if (Objects.isNull(value)) {
             st.setNull(index, Types.INTEGER);
             st.setNull(index+1, Types.INTEGER);
             st.setNull(index+2, Types.INTEGER);
         } else {
-            PhoneNumber employeeNumber = (PhoneNumber) value;
-            st.setInt(index,employeeNumber.getCountryCode());
-            st.setInt(index+1,employeeNumber.getCityCode());
-            st.setInt(index+2,employeeNumber.getNumber());
+            st.setInt(index, value.getCountryCode());
+            st.setInt(index+1, value.getCityCode());
+            st.setInt(index+2, value.getNumber());
         }
     }
 
     @Override
-    public Object deepCopy(Object value) throws HibernateException {
+    public PhoneNumber deepCopy(PhoneNumber value) {
         if (Objects.isNull(value))
             return null;
 
-        PhoneNumber empNumber = (PhoneNumber) value;
-        PhoneNumber newEmpNumber = new PhoneNumber(empNumber.getCountryCode(),empNumber.getCityCode(),empNumber.getNumber());
-
-        return newEmpNumber;
+        return new PhoneNumber(value.getCountryCode(), value.getCityCode(), value.getNumber());
     }
 
     @Override
@@ -84,17 +77,17 @@ public class PhoneNumberType implements UserType {
     }
 
     @Override
-    public Serializable disassemble(Object value) throws HibernateException {
+    public Serializable disassemble(PhoneNumber value) {
         return (Serializable) value;
     }
 
     @Override
-    public Object assemble(Serializable cached, Object owner) throws HibernateException {
-        return cached;
+    public PhoneNumber assemble(Serializable cached, Object owner) {
+        return (PhoneNumber) cached;
     }
 
     @Override
-    public Object replace(Object original, Object target, Object owner) throws HibernateException {
-        return original;
+    public PhoneNumber replace(PhoneNumber detached, PhoneNumber managed, Object owner) {
+        return detached;
     }
 }
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/SalaryType.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/SalaryType.java
index 266b85140b..69e34c1363 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/SalaryType.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/customtypes/SalaryType.java
@@ -1,12 +1,12 @@
 package com.baeldung.hibernate.customtypes;
 
 import org.hibernate.HibernateException;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.type.LongType;
-import org.hibernate.type.StringType;
-import org.hibernate.type.Type;
+import org.hibernate.metamodel.spi.ValueAccess;
 import org.hibernate.usertype.CompositeUserType;
 import org.hibernate.usertype.DynamicParameterizedType;
+import org.hibernate.usertype.UserType;
 
 import java.io.Serializable;
 import java.sql.PreparedStatement;
@@ -16,65 +16,47 @@ import java.sql.Types;
 import java.util.Objects;
 import java.util.Properties;
 
-public class SalaryType implements CompositeUserType, DynamicParameterizedType {
+public class SalaryType implements UserType<Salary>, CompositeUserType<Salary>, DynamicParameterizedType {
 
     private String localCurrency;
 
     @Override
-    public String[] getPropertyNames() {
-        return new String[]{"amount", "currency"};
-    }
-
-    @Override
-    public Type[] getPropertyTypes() {
-        return new Type[]{LongType.INSTANCE, StringType.INSTANCE};
-    }
-
-    @Override
-    public Object getPropertyValue(Object component, int property) throws HibernateException {
-
-        Salary salary = (Salary) component;
+    public Object getPropertyValue(Salary component, int property) throws HibernateException {
 
         switch (property) {
             case 0:
-                return salary.getAmount();
+                return component.getAmount();
             case 1:
-                return salary.getCurrency();
+                return component.getCurrency();
+            default:
+                throw new IllegalArgumentException(property +
+                        " is an invalid property index for class type " +
+                        component.getClass().getName());
         }
-
-        throw new IllegalArgumentException(property +
-                " is an invalid property index for class type " +
-                component.getClass().getName());
-
-    }
-
-
-    @Override
-    public void setPropertyValue(Object component, int property, Object value) throws HibernateException {
-
-        Salary salary = (Salary) component;
-
-        switch (property) {
-            case 0:
-                salary.setAmount((Long) value);
-            case 1:
-                salary.setCurrency((String) value);
-        }
-
-        throw new IllegalArgumentException(property +
-                " is an invalid property index for class type " +
-                component.getClass().getName());
-
     }
 
     @Override
-    public Class returnedClass() {
+    public Salary instantiate(ValueAccess values, SessionFactoryImplementor sessionFactory) {
+        return null;
+    }
+
+    @Override
+    public Class<?> embeddable() {
         return Salary.class;
     }
 
     @Override
-    public boolean equals(Object x, Object y) throws HibernateException {
+    public int getSqlType() {
+        return Types.BIGINT;
+    }
 
+    @Override
+    public Class<Salary> returnedClass() {
+        return Salary.class;
+    }
+
+    @Override
+    public boolean equals(Salary x, Salary y) {
         if (x == y)
             return true;
 
@@ -82,54 +64,48 @@ public class SalaryType implements CompositeUserType, DynamicParameterizedType {
             return false;
 
         return x.equals(y);
-
     }
 
     @Override
-    public int hashCode(Object x) throws HibernateException {
+    public int hashCode(Salary x) {
         return x.hashCode();
     }
 
     @Override
-    public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) throws HibernateException, SQLException {
-
+    public Salary nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session, Object owner) throws SQLException {
         Salary salary = new Salary();
-        salary.setAmount(rs.getLong(names[0]));
+        salary.setAmount(rs.getLong(position));
 
         if (rs.wasNull())
             return null;
 
-        salary.setCurrency(rs.getString(names[1]));
+        salary.setCurrency(rs.getString(position));
 
         return salary;
     }
 
     @Override
-    public void nullSafeSet(PreparedStatement st, Object value, int index, SharedSessionContractImplementor session) throws HibernateException, SQLException {
-
-
+    public void nullSafeSet(PreparedStatement st, Salary value, int index, SharedSessionContractImplementor session) throws SQLException {
         if (Objects.isNull(value))
             st.setNull(index, Types.BIGINT);
         else {
 
-            Salary salary = (Salary) value;
-            st.setLong(index, SalaryCurrencyConvertor.convert(salary.getAmount(),
-                    salary.getCurrency(), localCurrency));
-            st.setString(index + 1, salary.getCurrency());
+            st.setLong(index, SalaryCurrencyConvertor.convert(
+                    value.getAmount(),
+                    value.getCurrency(), localCurrency));
+            st.setString(index + 1, value.getCurrency());
         }
     }
 
     @Override
-    public Object deepCopy(Object value) throws HibernateException {
-
+    public Salary deepCopy(Salary value) {
         if (Objects.isNull(value))
             return null;
 
-        Salary oldSal = (Salary) value;
         Salary newSal = new Salary();
 
-        newSal.setAmount(oldSal.getAmount());
-        newSal.setCurrency(oldSal.getCurrency());
+        newSal.setAmount(value.getAmount());
+        newSal.setCurrency(value.getCurrency());
 
         return newSal;
     }
@@ -140,18 +116,18 @@ public class SalaryType implements CompositeUserType, DynamicParameterizedType {
     }
 
     @Override
-    public Serializable disassemble(Object value, SharedSessionContractImplementor session) throws HibernateException {
+    public Serializable disassemble(Salary value) {
         return (Serializable) deepCopy(value);
     }
 
     @Override
-    public Object assemble(Serializable cached, SharedSessionContractImplementor session, Object owner) throws HibernateException {
-        return deepCopy(cached);
+    public Salary assemble(Serializable cached, Object owner) {
+        return deepCopy((Salary) cached);
     }
 
     @Override
-    public Object replace(Object original, Object target, SharedSessionContractImplementor session, Object owner) throws HibernateException {
-        return original;
+    public Salary replace(Salary detached, Salary managed, Object owner) {
+        return detached;
     }
 
     @Override
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/immutable/entities/Event.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/immutable/entities/Event.java
index ec88d629a6..f16aa68475 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/immutable/entities/Event.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/immutable/entities/Event.java
@@ -4,7 +4,7 @@ import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 import org.hibernate.annotations.Immutable;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Set;
 
 @Entity
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/immutable/entities/EventGeneratedId.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/immutable/entities/EventGeneratedId.java
index 33af9313ae..6bf4006550 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/immutable/entities/EventGeneratedId.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/immutable/entities/EventGeneratedId.java
@@ -3,7 +3,7 @@ package com.baeldung.hibernate.immutable.entities;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Immutable;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Immutable
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/joincolumn/Email.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/joincolumn/Email.java
index df07c3cf69..096faf7984 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/joincolumn/Email.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/joincolumn/Email.java
@@ -1,12 +1,12 @@
 package com.baeldung.hibernate.joincolumn;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 
 @Entity
 public class Email {
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/joincolumn/Office.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/joincolumn/Office.java
index 9940577761..3c6e5f4642 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/joincolumn/Office.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/joincolumn/Office.java
@@ -1,13 +1,13 @@
 package com.baeldung.hibernate.joincolumn;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinColumns;
+import jakarta.persistence.ManyToOne;
 
 @Entity
 public class Office {
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/joincolumn/OfficeAddress.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/joincolumn/OfficeAddress.java
index cc723db6a2..d80a8be026 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/joincolumn/OfficeAddress.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/joincolumn/OfficeAddress.java
@@ -1,10 +1,10 @@
 package com.baeldung.hibernate.joincolumn;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Entity
 public class OfficeAddress {
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/joincolumn/OfficialEmployee.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/joincolumn/OfficialEmployee.java
index 49c63c7578..551b522700 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/joincolumn/OfficialEmployee.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/joincolumn/OfficialEmployee.java
@@ -1,12 +1,12 @@
 package com.baeldung.hibernate.joincolumn;
 
 import java.util.List;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 
 @Entity
 public class OfficialEmployee {
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/lazycollection/model/Branch.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/lazycollection/model/Branch.java
index de88647546..9957e2ce75 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/lazycollection/model/Branch.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/lazycollection/model/Branch.java
@@ -3,12 +3,12 @@ package com.baeldung.hibernate.lazycollection.model;
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OrderColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Entity;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/lazycollection/model/Employee.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/lazycollection/model/Employee.java
index 831518a365..edf89696f5 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/lazycollection/model/Employee.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/lazycollection/model/Employee.java
@@ -1,11 +1,10 @@
 package com.baeldung.hibernate.lazycollection.model;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OrderColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Entity;
 
 @Entity
 public class Employee {
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/config/HibernateAnnotationUtil.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/config/HibernateAnnotationUtil.java
index ef82c1c9ad..99410e1f76 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/config/HibernateAnnotationUtil.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/config/HibernateAnnotationUtil.java
@@ -43,8 +43,8 @@ public class HibernateAnnotationUtil {
         return metadata.buildSessionFactory();
     }
 
-    private static Map<String, String> dbSettings() {
-        Map<String, String> dbSettings = new HashMap<>();
+    private static Map<String, Object> dbSettings() {
+        Map<String, Object> dbSettings = new HashMap<>();
         dbSettings.put(Environment.URL, "jdbc:h2:mem:spring_hibernate_one_to_many");
         dbSettings.put(Environment.USER, "sa");
         dbSettings.put(Environment.PASS, "");
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/model/Cart.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/model/Cart.java
index 53878af445..f07f3d3887 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/model/Cart.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/model/Cart.java
@@ -2,13 +2,13 @@ package com.baeldung.hibernate.oneToMany.model;
 
 import java.util.Set;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "CART")
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/model/CartOIO.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/model/CartOIO.java
index 27b28a6753..f279cc4ea6 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/model/CartOIO.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/model/CartOIO.java
@@ -1,13 +1,13 @@
 package com.baeldung.hibernate.oneToMany.model;
 
 import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "CARTOIO")
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/model/Item.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/model/Item.java
index a055682d0d..5babe9c545 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/model/Item.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/model/Item.java
@@ -1,13 +1,13 @@
 package com.baeldung.hibernate.oneToMany.model;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "ITEMS")
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/model/ItemOIO.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/model/ItemOIO.java
index baaf57b106..78139da19e 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/model/ItemOIO.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/oneToMany/model/ItemOIO.java
@@ -1,12 +1,12 @@
 package com.baeldung.hibernate.oneToMany.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "ITEMSOIO")
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/pojo/Phone.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/pojo/Phone.java
index d923bda5de..e173aa8b47 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/pojo/Phone.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/pojo/Phone.java
@@ -1,9 +1,9 @@
 package com.baeldung.hibernate.pojo;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import java.io.Serializable;
 
 @Entity
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/wherejointable/Group.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/wherejointable/Group.java
index 04684eceac..2b17c9218d 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/wherejointable/Group.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/wherejointable/Group.java
@@ -3,10 +3,10 @@ package com.baeldung.hibernate.wherejointable;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
 
 @Entity(name = "e_group")
 public class Group {
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/wherejointable/User.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/wherejointable/User.java
index 3029aae640..a517de3cca 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/wherejointable/User.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/wherejointable/User.java
@@ -3,12 +3,12 @@ package com.baeldung.hibernate.wherejointable;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
 
 import org.hibernate.annotations.WhereJoinTable;
 
diff --git a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/wherejointable/UserGroupRelation.java b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/wherejointable/UserGroupRelation.java
index 00dd19699c..21a0a443c6 100644
--- a/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/wherejointable/UserGroupRelation.java
+++ b/persistence-modules/hibernate-annotations/src/main/java/com/baeldung/hibernate/wherejointable/UserGroupRelation.java
@@ -2,11 +2,11 @@ package com.baeldung.hibernate.wherejointable;
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Id;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Id;
 
 @Entity(name = "r_user_group")
 public class UserGroupRelation implements Serializable {
diff --git a/persistence-modules/hibernate-annotations/src/main/resources/META-INF/persistence.xml b/persistence-modules/hibernate-annotations/src/main/resources/META-INF/persistence.xml
index 474eeb7a44..2915125295 100644
--- a/persistence-modules/hibernate-annotations/src/main/resources/META-INF/persistence.xml
+++ b/persistence-modules/hibernate-annotations/src/main/resources/META-INF/persistence.xml
@@ -7,12 +7,12 @@
         <description>Hibernate EntityManager Demo</description> 
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
         <properties>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect"/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
             <property name="hibernate.hbm2ddl.auto" value="update"/>
-            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://127.0.0.1:3306/moviecatalog"/>
-            <property name="javax.persistence.jdbc.user" value="root"/>
-            <property name="javax.persistence.jdbc.password" value="root"/>
+            <property name="jakarta.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:mysql://127.0.0.1:3306/moviecatalog"/>
+            <property name="jakarta.persistence.jdbc.user" value="root"/>
+            <property name="jakarta.persistence.jdbc.password" value="root"/>
         </properties>
     </persistence-unit>
 </persistence> 
\ No newline at end of file
diff --git a/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/creationupdatetimestamp/HibernateCreationUpdateTimestampIntegrationTest.java b/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/creationupdatetimestamp/HibernateCreationUpdateTimestampIntegrationTest.java
new file mode 100644
index 0000000000..bab51dab72
--- /dev/null
+++ b/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/creationupdatetimestamp/HibernateCreationUpdateTimestampIntegrationTest.java
@@ -0,0 +1,118 @@
+package com.baeldung.hibernate.creationupdatetimestamp;
+
+import static org.hibernate.FlushMode.MANUAL;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.time.Instant;
+
+import org.h2.Driver;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.service.ServiceRegistry;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import com.baeldung.hibernate.creationupdatetimestamp.model.Book;
+
+class HibernateCreationUpdateTimestampIntegrationTest {
+
+    private static SessionFactory sessionFactory;
+
+    private Session session;
+
+    @BeforeAll
+    public static void beforeTests() {
+        Configuration configuration = new Configuration().addAnnotatedClass(Book.class)
+          .setProperty("hibernate.dialect", H2Dialect.class.getName())
+          .setProperty("hibernate.connection.driver_class", Driver.class.getName())
+          .setProperty("hibernate.connection.url", "jdbc:h2:mem:test")
+          .setProperty("hibernate.connection.username", "sa")
+          .setProperty("hibernate.connection.password", "")
+          .setProperty("hibernate.hbm2ddl.auto", "update");
+
+        ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties())
+          .build();
+
+        sessionFactory = configuration.buildSessionFactory(serviceRegistry);
+    }
+
+    @Test
+    void whenCreatingEntity_ThenCreatedOnIsSet() {
+        session = sessionFactory.openSession();
+        session.beginTransaction();
+        Book book = new Book();
+
+        session.save(book);
+        session.getTransaction()
+          .commit();
+        session.close();
+
+        assertNotNull(book.getCreatedOn());
+    }
+
+    @Test
+    void whenCreatingEntity_ThenCreatedOnAndLastUpdatedOnAreBothSet() {
+        session = sessionFactory.openSession();
+        session.beginTransaction();
+        Book book = new Book();
+
+        session.save(book);
+        session.getTransaction()
+          .commit();
+        session.close();
+
+        assertNotNull(book.getCreatedOn());
+        assertNotNull(book.getLastUpdatedOn());
+    }
+
+    @Test
+    void whenCreatingEntity_ThenCreatedOnAndLastUpdatedOnAreEqual() {
+        session = sessionFactory.openSession();
+        session.beginTransaction();
+        Book book = new Book();
+
+        session.save(book);
+        session.getTransaction().commit();
+        session.close();
+
+        assertEquals(book.getCreatedOn(), book.getLastUpdatedOn());
+    }
+
+    @Test
+    void whenUpdatingEntity_ThenLastUpdatedOnIsUpdatedAndCreatedOnStaysTheSame() {
+        session = sessionFactory.openSession();
+        session.setHibernateFlushMode(MANUAL);
+        session.beginTransaction();
+        Book book = new Book();
+        session.save(book);
+        session.flush();
+        Instant createdOnAfterCreation = book.getCreatedOn();
+        Instant lastUpdatedOnAfterCreation = book.getLastUpdatedOn();
+
+        String newName = "newName";
+        book.setTitle(newName);
+        session.save(book);
+        session.flush();
+        session.getTransaction().commit();
+        session.close();
+        Instant createdOnAfterUpdate = book.getCreatedOn();
+        Instant lastUpdatedOnAfterUpdate = book.getLastUpdatedOn();
+
+        assertEquals(newName, book.getTitle());
+        assertNotNull(createdOnAfterUpdate);
+        assertNotNull(lastUpdatedOnAfterUpdate);
+        assertEquals(createdOnAfterCreation, createdOnAfterUpdate);
+        assertNotEquals(lastUpdatedOnAfterCreation, lastUpdatedOnAfterUpdate);
+    }
+
+    @AfterAll
+    static void afterTests() {
+        sessionFactory.close();
+    }
+}
diff --git a/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/customtypes/HibernateCustomTypesIntegrationTest.java b/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/customtypes/HibernateCustomTypesIntegrationTest.java
index 460b65ee12..9da3a90034 100644
--- a/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/customtypes/HibernateCustomTypesIntegrationTest.java
+++ b/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/customtypes/HibernateCustomTypesIntegrationTest.java
@@ -6,10 +6,9 @@ import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.Environment;
 import org.hibernate.service.ServiceRegistry;
-import org.junit.Assert;
 import org.junit.Test;
 
-import javax.persistence.TypedQuery;
+import jakarta.persistence.TypedQuery;
 import java.time.LocalDate;
 import java.util.HashMap;
 import java.util.Map;
@@ -76,7 +75,7 @@ public class HibernateCustomTypesIntegrationTest {
         doInHibernate(this::sessionFactory, session -> {
             session.save(e);
 
-            TypedQuery<OfficeEmployee> query = session.createQuery("FROM OfficeEmployee OE WHERE OE.empAddress.zipcode = :pinCode", OfficeEmployee.class);
+            TypedQuery<OfficeEmployee> query = session.createQuery("FROM OfficeEmployee OE WHERE OE.empAddress.zipCode = :pinCode", OfficeEmployee.class);
             query.setParameter("pinCode",100);
             int size = query.getResultList().size();
 
@@ -100,8 +99,8 @@ public class HibernateCustomTypesIntegrationTest {
         return metadata.buildSessionFactory();
     }
 
-    private static Map<String, String> getProperties() {
-        Map<String, String> dbSettings = new HashMap<>();
+    private static Map<String, Object> getProperties() {
+        Map<String, Object> dbSettings = new HashMap<>();
         dbSettings.put(Environment.URL, "jdbc:h2:mem:mydb1;DB_CLOSE_DELAY=-1");
         dbSettings.put(Environment.USER, "sa");
         dbSettings.put(Environment.PASS, "");
diff --git a/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/immutable/HibernateImmutableIntegrationTest.java b/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/immutable/HibernateImmutableIntegrationTest.java
index 270a235ef0..f038d2b16d 100644
--- a/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/immutable/HibernateImmutableIntegrationTest.java
+++ b/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/immutable/HibernateImmutableIntegrationTest.java
@@ -8,7 +8,7 @@ import org.hibernate.Session;
 import org.junit.*;
 import org.junit.rules.ExpectedException;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
diff --git a/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/joincolumn/JoinColumnIntegrationTest.java b/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/joincolumn/JoinColumnIntegrationTest.java
index 37125e8b15..04f0613811 100644
--- a/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/joincolumn/JoinColumnIntegrationTest.java
+++ b/persistence-modules/hibernate-annotations/src/test/java/com/baeldung/hibernate/joincolumn/JoinColumnIntegrationTest.java
@@ -78,8 +78,8 @@ public class JoinColumnIntegrationTest {
         return metadata.buildSessionFactory();
     }
 
-    private static Map<String, String> getProperties() {
-        Map<String, String> dbSettings = new HashMap<>();
+    private static Map<String, Object> getProperties() {
+        Map<String, Object> dbSettings = new HashMap<>();
         dbSettings.put(Environment.URL, "jdbc:h2:mem:mydbJoinColumn;DB_CLOSE_DELAY=-1");
         dbSettings.put(Environment.USER, "sa");
         dbSettings.put(Environment.PASS, "");
diff --git a/persistence-modules/hibernate-enterprise/pom.xml b/persistence-modules/hibernate-enterprise/pom.xml
index 833f19c673..eaa7b0e765 100644
--- a/persistence-modules/hibernate-enterprise/pom.xml
+++ b/persistence-modules/hibernate-enterprise/pom.xml
@@ -78,10 +78,11 @@
     </repositories>
 
     <properties>
-        <hibernate.version>5.3.7.Final</hibernate.version>
-        <mysql.version>6.0.6</mysql.version>
-        <mariaDB4j.version>2.2.3</mariaDB4j.version>
+        <hibernate.version>6.1.7.Final</hibernate.version>
+        <mysql.version>8.0.32</mysql.version>
+        <mariaDB4j.version>2.6.0</mariaDB4j.version>
         <geodb.version>0.9</geodb.version>
+        <byte-buddy.version>1.14.2</byte-buddy.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/exception/EntityWithNoId.java b/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/exception/EntityWithNoId.java
index 989fa1281a..8ef7487804 100644
--- a/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/exception/EntityWithNoId.java
+++ b/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/exception/EntityWithNoId.java
@@ -1,6 +1,6 @@
 package com.baeldung.hibernate.exception;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 
 @Entity
 public class EntityWithNoId {
diff --git a/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/exception/Product.java b/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/exception/Product.java
index 0724ced56b..b7e80511e6 100644
--- a/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/exception/Product.java
+++ b/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/exception/Product.java
@@ -1,9 +1,9 @@
 package com.baeldung.hibernate.exception;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "PRODUCT")
diff --git a/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/exception/ProductEntity.java b/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/exception/ProductEntity.java
index b9c5f5010d..a2dcec61e9 100644
--- a/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/exception/ProductEntity.java
+++ b/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/exception/ProductEntity.java
@@ -1,8 +1,8 @@
 package com.baeldung.hibernate.exception;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "PRODUCT")
diff --git a/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/exception/ProductNotMapped.java b/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/exception/ProductNotMapped.java
new file mode 100644
index 0000000000..827ad15e5b
--- /dev/null
+++ b/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/exception/ProductNotMapped.java
@@ -0,0 +1,32 @@
+package com.baeldung.hibernate.exception;
+
+public class ProductNotMapped {
+
+    private int id;
+    private String name;
+    private String description;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}
diff --git a/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/logging/Employee.java b/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/logging/Employee.java
index 9dcf4058a7..bc50c11d81 100644
--- a/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/logging/Employee.java
+++ b/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/logging/Employee.java
@@ -1,9 +1,9 @@
 package com.baeldung.hibernate.logging;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Entity
 public class Employee {
diff --git a/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/pojo/PointEntity.java b/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/pojo/PointEntity.java
index 736abde866..23b9a87eef 100644
--- a/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/pojo/PointEntity.java
+++ b/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/pojo/PointEntity.java
@@ -1,11 +1,11 @@
 package com.baeldung.hibernate.pojo;
 
-import com.vividsolutions.jts.geom.Point;
+import org.locationtech.jts.geom.Point;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 
 @Entity
 public class PointEntity {
diff --git a/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/pojo/PolygonEntity.java b/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/pojo/PolygonEntity.java
index 69208c8cd4..32cb146f23 100644
--- a/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/pojo/PolygonEntity.java
+++ b/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/pojo/PolygonEntity.java
@@ -1,10 +1,10 @@
 package com.baeldung.hibernate.pojo;
 
-import com.vividsolutions.jts.geom.Polygon;
+import org.locationtech.jts.geom.Polygon;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 
 @Entity
 public class PolygonEntity {
diff --git a/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/pojo/Student.java b/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/pojo/Student.java
index 9b26c117eb..263908a5fc 100644
--- a/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/pojo/Student.java
+++ b/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/hibernate/pojo/Student.java
@@ -1,9 +1,9 @@
 package com.baeldung.hibernate.pojo;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Entity
 public class Student {
diff --git a/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/persistence/model/Person.java b/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/persistence/model/Person.java
index 6a95a7acf5..3766639975 100644
--- a/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/persistence/model/Person.java
+++ b/persistence-modules/hibernate-enterprise/src/main/java/com/baeldung/persistence/model/Person.java
@@ -1,8 +1,8 @@
 package com.baeldung.persistence.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 
 @Entity
 public class Person {
diff --git a/persistence-modules/hibernate-enterprise/src/main/resources/META-INF/persistence.xml b/persistence-modules/hibernate-enterprise/src/main/resources/META-INF/persistence.xml
index 474eeb7a44..2915125295 100644
--- a/persistence-modules/hibernate-enterprise/src/main/resources/META-INF/persistence.xml
+++ b/persistence-modules/hibernate-enterprise/src/main/resources/META-INF/persistence.xml
@@ -7,12 +7,12 @@
         <description>Hibernate EntityManager Demo</description> 
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
         <properties>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect"/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
             <property name="hibernate.hbm2ddl.auto" value="update"/>
-            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://127.0.0.1:3306/moviecatalog"/>
-            <property name="javax.persistence.jdbc.user" value="root"/>
-            <property name="javax.persistence.jdbc.password" value="root"/>
+            <property name="jakarta.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:mysql://127.0.0.1:3306/moviecatalog"/>
+            <property name="jakarta.persistence.jdbc.user" value="root"/>
+            <property name="jakarta.persistence.jdbc.password" value="root"/>
         </properties>
     </persistence-unit>
 </persistence> 
\ No newline at end of file
diff --git a/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/HibernateSpatialIntegrationTest.java b/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/HibernateSpatialIntegrationTest.java
index 74f752ab8c..e0f13582ab 100644
--- a/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/HibernateSpatialIntegrationTest.java
+++ b/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/HibernateSpatialIntegrationTest.java
@@ -9,23 +9,23 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.Properties;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.io.ParseException;
+import org.locationtech.jts.io.WKTReader;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.util.GeometricShapeFactory;
 
 import com.baeldung.hibernate.pojo.PointEntity;
 import com.baeldung.hibernate.pojo.PolygonEntity;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
-import com.vividsolutions.jts.io.ParseException;
-import com.vividsolutions.jts.io.WKTReader;
-import com.vividsolutions.jts.util.GeometricShapeFactory;
 
 import geodb.GeoDB;
 
@@ -39,7 +39,7 @@ public class HibernateSpatialIntegrationTest {
         session = HibernateUtil.getSessionFactory("hibernate-spatial.properties")
           .openSession();
         transaction = session.beginTransaction();
-        session.doWork(conn -> { GeoDB.InitGeoDB(conn); });
+        session.doWork(GeoDB::InitGeoDB);
     }
 
     @After
@@ -135,9 +135,7 @@ public class HibernateSpatialIntegrationTest {
 
     private Geometry wktToGeometry(String wellKnownText) throws ParseException {
         WKTReader fromText = new WKTReader();
-        Geometry geom = null;
-        geom = fromText.read(wellKnownText);
-        return geom;
+        return fromText.read(wellKnownText);
     }
 
     private static Geometry createCircle(double x, double y, double radius) {
diff --git a/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/exception/HibernateExceptionUnitTest.java b/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/exception/HibernateExceptionUnitTest.java
index 891352843d..37c21d1899 100644
--- a/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/exception/HibernateExceptionUnitTest.java
+++ b/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/exception/HibernateExceptionUnitTest.java
@@ -6,28 +6,25 @@ import static org.junit.Assert.assertNotNull;
 import java.io.IOException;
 import java.util.List;
 
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.OptimisticLockException;
+import jakarta.persistence.PersistenceException;
 
-import org.hibernate.AnnotationException;
 import org.hibernate.HibernateException;
 import org.hibernate.MappingException;
 import org.hibernate.NonUniqueObjectException;
 import org.hibernate.PropertyValueException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.StaleObjectStateException;
 import org.hibernate.StaleStateException;
 import org.hibernate.Transaction;
-import org.hibernate.TransactionException;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.exception.ConstraintViolationException;
 import org.hibernate.exception.DataException;
 import org.hibernate.exception.SQLGrammarException;
-import org.hibernate.hql.internal.ast.QuerySyntaxException;
 import org.hibernate.id.IdentifierGenerationException;
 import org.hibernate.query.NativeQuery;
+import org.hibernate.query.sqm.UnknownEntityException;
 import org.hibernate.tool.schema.spi.CommandAcceptanceException;
 import org.hibernate.tool.schema.spi.SchemaManagementException;
 import org.junit.Before;
@@ -63,12 +60,15 @@ public class HibernateExceptionUnitTest {
 
     @Test
     public void whenQueryExecutedWithUnmappedEntity_thenMappingException() {
-        thrown.expectCause(isA(MappingException.class));
-        thrown.expectMessage("Unknown entity: java.lang.String");
+        thrown.expect(isA(MappingException.class));
+        thrown.expectMessage("Unable to locate persister: com.baeldung.hibernate.exception.ProductNotMapped");
+
+        ProductNotMapped product = new ProductNotMapped();
+        product.setId(1);
+        product.setName("test");
 
         Session session = sessionFactory.openSession();
-        NativeQuery<String> query = session.createNativeQuery("select name from PRODUCT", String.class);
-        query.getResultList();
+        session.save(product);
     }
 
     @Test
@@ -82,8 +82,8 @@ public class HibernateExceptionUnitTest {
 
     @Test
     public void whenQueryExecutedWithInvalidClassName_thenQuerySyntaxException() {
-        thrown.expectCause(isA(QuerySyntaxException.class));
-        thrown.expectMessage("PRODUCT is not mapped [from PRODUCT]");
+        thrown.expectCause(isA(UnknownEntityException.class));
+        thrown.expectMessage("Could not resolve root entity 'PRODUCT");
 
         Session session = sessionFactory.openSession();
         List<Product> results = session.createQuery("from PRODUCT", Product.class)
@@ -92,8 +92,8 @@ public class HibernateExceptionUnitTest {
 
     @Test
     public void givenEntityWithoutId_whenSessionFactoryCreated_thenAnnotationException() {
-        thrown.expect(AnnotationException.class);
-        thrown.expectMessage("No identifier specified for entity");
+        thrown.expect(isA(HibernateException.class));
+        thrown.expectMessage("Entity 'com.baeldung.hibernate.exception.EntityWithNoId' has no identifier (every '@Entity' class must declare or inherit at least one '@Id' or '@EmbeddedId' property)");
 
         Configuration cfg = getConfiguration();
         cfg.addAnnotatedClass(EntityWithNoId.class);
@@ -132,9 +132,8 @@ public class HibernateExceptionUnitTest {
 
     @Test
     public void givenMissingTable_whenEntitySaved_thenSQLGrammarException() {
-        thrown.expect(isA(PersistenceException.class));
         thrown.expectCause(isA(SQLGrammarException.class));
-        thrown.expectMessage("SQLGrammarException: could not prepare statement");
+        thrown.expectMessage("could not prepare statement");
 
         Configuration cfg = getConfiguration();
         cfg.addAnnotatedClass(Product.class);
@@ -162,9 +161,8 @@ public class HibernateExceptionUnitTest {
 
     @Test
     public void givenMissingTable_whenQueryExecuted_thenSQLGrammarException() {
-        thrown.expect(isA(PersistenceException.class));
         thrown.expectCause(isA(SQLGrammarException.class));
-        thrown.expectMessage("SQLGrammarException: could not prepare statement");
+        thrown.expectMessage("could not prepare statement");
 
         Session session = sessionFactory.openSession();
         NativeQuery<Product> query = session.createNativeQuery("select * from NON_EXISTING_TABLE", Product.class);
@@ -173,9 +171,8 @@ public class HibernateExceptionUnitTest {
 
     @Test
     public void whenDuplicateIdSaved_thenConstraintViolationException() {
-        thrown.expect(isA(PersistenceException.class));
         thrown.expectCause(isA(ConstraintViolationException.class));
-        thrown.expectMessage("ConstraintViolationException: could not execute statement");
+        thrown.expectMessage("could not execute statement");
 
         Session session = null;
         Transaction transaction = null;
@@ -253,7 +250,7 @@ public class HibernateExceptionUnitTest {
     @Test
     public void givenQueryWithDataTypeMismatch_WhenQueryExecuted_thenDataException() {
         thrown.expectCause(isA(DataException.class));
-        thrown.expectMessage("org.hibernate.exception.DataException: could not prepare statement");
+        thrown.expectMessage("could not prepare statement");
 
         Session session = sessionFactory.openSession();
         NativeQuery<Product> query = session.createNativeQuery("select * from PRODUCT where id='wrongTypeId'", Product.class);
@@ -330,9 +327,8 @@ public class HibernateExceptionUnitTest {
 
     @Test
     public void whenUpdatingNonExistingObject_thenStaleStateException() {
-        thrown.expect(isA(OptimisticLockException.class));
-        thrown.expectMessage("Row was updated or deleted by another transaction");
-        thrown.expectCause(isA(StaleObjectStateException.class));
+        thrown.expectCause(isA(StaleStateException.class));
+        thrown.expectMessage("Batch update returned unexpected row count from update [0]; actual row count: 0; expected: 1; statement executed: update PRODUCT set description=?, name=? where id=?");
 
         Session session = null;
         Transaction transaction = null;
@@ -356,7 +352,8 @@ public class HibernateExceptionUnitTest {
 
     @Test
     public void givenTxnMarkedRollbackOnly_whenCommitted_thenTransactionException() {
-        thrown.expect(isA(TransactionException.class));
+        thrown.expect(isA(IllegalStateException.class));
+        thrown.expectMessage("Transaction already active");
 
         Session session = null;
         Transaction transaction = null;
@@ -368,6 +365,7 @@ public class HibernateExceptionUnitTest {
             product1.setId(15);
             product1.setName("Product1");
             session.save(product1);
+            transaction = session.beginTransaction();
             transaction.setRollbackOnly();
 
             transaction.commit();
diff --git a/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/Car.java b/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/Car.java
index 1b6cee7e67..3e4895e5e6 100644
--- a/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/Car.java
+++ b/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/Car.java
@@ -2,9 +2,9 @@ package com.baeldung.hibernate.multitenancy;
 
 import java.io.Serializable;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity(name = "Car")
 @Table(name = "Car")
diff --git a/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/MultitenancyIntegrationTest.java b/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/MultitenancyIntegrationTest.java
index fdc3f9fa81..2dc94172b1 100644
--- a/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/MultitenancyIntegrationTest.java
+++ b/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/MultitenancyIntegrationTest.java
@@ -79,9 +79,9 @@ public abstract class MultitenancyIntegrationTest {
     private void createCarTable() {
         Session session = sessionFactory.openSession();
         Transaction tx = session.beginTransaction();
-        session.createSQLQuery("drop table Car if exists")
+        session.createNativeQuery("drop table Car if exists")
             .executeUpdate();
-        session.createSQLQuery("create table Car (brand varchar(255) primary key)")
+        session.createNativeQuery("create table Car (brand varchar(255) primary key)")
             .executeUpdate();
         tx.commit();
     }
diff --git a/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/database/DatabaseApproachMultitenancyIntegrationTest.java b/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/database/DatabaseApproachMultitenancyIntegrationTest.java
index 92f477a646..904805f2ce 100644
--- a/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/database/DatabaseApproachMultitenancyIntegrationTest.java
+++ b/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/database/DatabaseApproachMultitenancyIntegrationTest.java
@@ -1,7 +1,5 @@
 package com.baeldung.hibernate.multitenancy.database;
 
-import java.io.IOException;
-
 import org.junit.Test;
 
 import com.baeldung.hibernate.multitenancy.MultitenancyIntegrationTest;
@@ -14,7 +12,7 @@ public class DatabaseApproachMultitenancyIntegrationTest extends MultitenancyInt
     }
 
     @Test
-    public void givenDatabaseApproach_whenAddingEntries_thenOnlyAddedToConcreteDatabase() throws IOException {
+    public void givenDatabaseApproach_whenAddingEntries_thenOnlyAddedToConcreteDatabase() {
         whenCurrentTenantIs(TenantIdNames.MYDB1);
         whenAddCar("myCar");
         thenCarFound("myCar");
diff --git a/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/database/MapMultiTenantConnectionProvider.java b/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/database/MapMultiTenantConnectionProvider.java
index eb1f410622..47abf6ff85 100644
--- a/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/database/MapMultiTenantConnectionProvider.java
+++ b/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/database/MapMultiTenantConnectionProvider.java
@@ -34,8 +34,13 @@ public class MapMultiTenantConnectionProvider extends AbstractMultiTenantConnect
     private void initConnectionProviderForTenant(String tenantId) throws IOException {
         Properties properties = new Properties();
         properties.load(getClass().getResourceAsStream(String.format("/hibernate-database-%s.properties", tenantId)));
+        Map<String, Object> configProperties = new HashMap<>();
+        for (String key : properties.stringPropertyNames()) {
+            String value = properties.getProperty(key);
+            configProperties.put(key, value);
+        }
         DriverManagerConnectionProviderImpl connectionProvider = new DriverManagerConnectionProviderImpl();
-        connectionProvider.configure(properties);
+        connectionProvider.configure(configProperties);
         this.connectionProviderMap.put(tenantId, connectionProvider);
     }
 
diff --git a/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/schema/SchemaMultiTenantConnectionProvider.java b/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/schema/SchemaMultiTenantConnectionProvider.java
index 601eba651c..67b838fdf1 100644
--- a/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/schema/SchemaMultiTenantConnectionProvider.java
+++ b/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/hibernate/multitenancy/schema/SchemaMultiTenantConnectionProvider.java
@@ -3,6 +3,8 @@ package com.baeldung.hibernate.multitenancy.schema;
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 
 import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
@@ -39,9 +41,14 @@ public class SchemaMultiTenantConnectionProvider extends AbstractMultiTenantConn
     private ConnectionProvider initConnectionProvider() throws IOException {
         Properties properties = new Properties();
         properties.load(getClass().getResourceAsStream("/hibernate-schema-multitenancy.properties"));
+        Map<String, Object> configProperties = new HashMap<>();
+        for (String key : properties.stringPropertyNames()) {
+            String value = properties.getProperty(key);
+            configProperties.put(key, value);
+        }
 
         DriverManagerConnectionProviderImpl connectionProvider = new DriverManagerConnectionProviderImpl();
-        connectionProvider.configure(properties);
+        connectionProvider.configure(configProperties);
         return connectionProvider;
     }
 
diff --git a/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/persistence/save/SaveMethodsIntegrationTest.java b/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/persistence/save/SaveMethodsIntegrationTest.java
index 8c571428b4..c3d2362339 100644
--- a/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/persistence/save/SaveMethodsIntegrationTest.java
+++ b/persistence-modules/hibernate-enterprise/src/test/java/com/baeldung/persistence/save/SaveMethodsIntegrationTest.java
@@ -7,7 +7,7 @@ import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
diff --git a/persistence-modules/hibernate-enterprise/src/test/resources/hibernate-exception.properties b/persistence-modules/hibernate-enterprise/src/test/resources/hibernate-exception.properties
index e08a23166d..1e086f60d4 100644
--- a/persistence-modules/hibernate-enterprise/src/test/resources/hibernate-exception.properties
+++ b/persistence-modules/hibernate-enterprise/src/test/resources/hibernate-exception.properties
@@ -12,5 +12,3 @@ hibernate.c3p0.min_size=5
 hibernate.c3p0.max_size=20
 hibernate.c3p0.acquire_increment=5
 hibernate.c3p0.timeout=1800
-
-hibernate.transaction.factory_class=org.hibernate.transaction.JTATransactionFactory
diff --git a/persistence-modules/hibernate-enterprise/src/test/resources/hibernate-spatial.properties b/persistence-modules/hibernate-enterprise/src/test/resources/hibernate-spatial.properties
index c16666cbf5..e156965ce7 100644
--- a/persistence-modules/hibernate-enterprise/src/test/resources/hibernate-spatial.properties
+++ b/persistence-modules/hibernate-enterprise/src/test/resources/hibernate-spatial.properties
@@ -4,7 +4,7 @@ hibernate.connection.username=sa
 hibernate.connection.autocommit=true
 jdbc.password=
 
-hibernate.dialect=org.hibernate.spatial.dialect.h2geodb.GeoDBDialect
+hibernate.dialect=org.hibernate.dialect.H2Dialect
 hibernate.show_sql=true
 hibernate.hbm2ddl.auto=create-drop
 
diff --git a/persistence-modules/hibernate-exceptions/pom.xml b/persistence-modules/hibernate-exceptions/pom.xml
index 4bef688715..670ff4cdb8 100644
--- a/persistence-modules/hibernate-exceptions/pom.xml
+++ b/persistence-modules/hibernate-exceptions/pom.xml
@@ -24,11 +24,6 @@
             <artifactId>hibernate-core</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>${jaxb.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -37,8 +32,7 @@
     </dependencies>
 
     <properties>
-        <hsqldb.version>2.4.0</hsqldb.version>
-        <jaxb.version>2.3.0</jaxb.version>
+        <hsqldb.version>2.7.1</hsqldb.version>
         <h2.version>2.1.214</h2.version>
     </properties>
 
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Category.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Category.java
index 25d31d50c7..cab06ae9cf 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Category.java
+++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Category.java
@@ -1,6 +1,6 @@
 package com.baeldung.hibernate.entitynotfoundexception;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Item.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Item.java
index 3abed00eb8..2d07178aaf 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Item.java
+++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/Item.java
@@ -1,9 +1,6 @@
 package com.baeldung.hibernate.entitynotfoundexception;
 
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
-
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 
 @Entity
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/User.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/User.java
index d89047195c..8351c5df96 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/User.java
+++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/entitynotfoundexception/User.java
@@ -1,7 +1,7 @@
 package com.baeldung.hibernate.entitynotfoundexception;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 @Entity
 public class User {
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/entity/Comment.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/entity/Comment.java
index 4a3e9739e2..e73adfef6b 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/entity/Comment.java
+++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/entity/Comment.java
@@ -1,10 +1,10 @@
 package com.baeldung.hibernate.exception.detachedentity.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 @Entity
 public class Comment {
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/entity/Post.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/entity/Post.java
index 7d95b41948..155a1bfe69 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/entity/Post.java
+++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/detachedentity/entity/Post.java
@@ -1,9 +1,9 @@
 package com.baeldung.hibernate.exception.detachedentity.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Entity
 public class Post {
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/lazyinitialization/entity/Role.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/lazyinitialization/entity/Role.java
index c15e674c52..5e613004a3 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/lazyinitialization/entity/Role.java
+++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/lazyinitialization/entity/Role.java
@@ -1,11 +1,11 @@
 package com.baeldung.hibernate.exception.lazyinitialization.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "role")
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/lazyinitialization/entity/User.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/lazyinitialization/entity/User.java
index 5bd7e00801..ffae05c0a0 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/lazyinitialization/entity/User.java
+++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/lazyinitialization/entity/User.java
@@ -3,14 +3,14 @@ package com.baeldung.hibernate.exception.lazyinitialization.entity;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "user")
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Article.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Article.java
index 3c9c7c5b31..eb697334ae 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Article.java
+++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Article.java
@@ -1,10 +1,10 @@
 package com.baeldung.hibernate.exception.persistentobject.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 @Entity
 public class Article {
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Author.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Author.java
index fa6aaa9abe..f8dcb82b7e 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Author.java
+++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Author.java
@@ -2,12 +2,11 @@ package com.baeldung.hibernate.exception.persistentobject.entity;
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Book.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Book.java
index 342da27c77..986c7f061f 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Book.java
+++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/persistentobject/entity/Book.java
@@ -1,11 +1,10 @@
 package com.baeldung.hibernate.exception.persistentobject.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Entity
 public class Book {
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Address.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Address.java
index e450fc3c18..8d1208e036 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Address.java
+++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Address.java
@@ -1,18 +1,12 @@
 package com.baeldung.hibernate.exception.transientobject.entity;
 
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "address")
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Author.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Author.java
index f1a88daa36..271e810002 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Author.java
+++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Author.java
@@ -3,15 +3,14 @@ package com.baeldung.hibernate.exception.transientobject.entity;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.Table;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Book.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Book.java
index 91728430ea..0734cccff1 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Book.java
+++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Book.java
@@ -4,15 +4,14 @@ package com.baeldung.hibernate.exception.transientobject.entity;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.Table;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Department.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Department.java
index 4b8fa69964..5bd9a109ab 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Department.java
+++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Department.java
@@ -1,13 +1,13 @@
 package com.baeldung.hibernate.exception.transientobject.entity;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Employee.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Employee.java
index 56443cce70..6a2ec8b938 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Employee.java
+++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/Employee.java
@@ -4,15 +4,14 @@ package com.baeldung.hibernate.exception.transientobject.entity;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "employee")
diff --git a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/User.java b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/User.java
index eff1a88b51..cf56afd8b9 100644
--- a/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/User.java
+++ b/persistence-modules/hibernate-exceptions/src/main/java/com/baeldung/hibernate/exception/transientobject/entity/User.java
@@ -1,19 +1,14 @@
 package com.baeldung.hibernate.exception.transientobject.entity;
 
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "user")
diff --git a/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/entitynotfoundexception/EntityNotFoundExceptionIntegrationTest.java b/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/entitynotfoundexception/EntityNotFoundExceptionIntegrationTest.java
index bcb4e3eb95..f339afd536 100644
--- a/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/entitynotfoundexception/EntityNotFoundExceptionIntegrationTest.java
+++ b/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/entitynotfoundexception/EntityNotFoundExceptionIntegrationTest.java
@@ -4,10 +4,10 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityNotFoundException;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.Persistence;
 import java.io.IOException;
 
 public class EntityNotFoundExceptionIntegrationTest {
diff --git a/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/exception/detachedentity/DetachedEntityUnitTest.java b/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/exception/detachedentity/DetachedEntityUnitTest.java
index afb0efae77..cb4313c537 100644
--- a/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/exception/detachedentity/DetachedEntityUnitTest.java
+++ b/persistence-modules/hibernate-exceptions/src/test/java/com/baeldung/hibernate/exception/detachedentity/DetachedEntityUnitTest.java
@@ -3,13 +3,12 @@ package com.baeldung.hibernate.exception.detachedentity;
 import com.baeldung.hibernate.exception.detachedentity.entity.Comment;
 import com.baeldung.hibernate.exception.detachedentity.entity.Post;
 
-import org.assertj.core.api.Assertions;
 import org.hibernate.Session;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 
 import java.util.List;
 
@@ -43,7 +42,7 @@ public class DetachedEntityUnitTest {
 
         assertThatThrownBy(() -> session.persist(detachedPost))
             .isInstanceOf(PersistenceException.class)
-            .hasMessageContaining("org.hibernate.PersistentObjectException: detached entity passed to persist");
+            .hasMessageContaining("detached entity passed to persist: com.baeldung.hibernate.exception.detachedentity.entity.Post");
     }
 
     @Test
@@ -72,13 +71,13 @@ public class DetachedEntityUnitTest {
 
         assertThatThrownBy(() -> session.persist(detachedPost))
             .isInstanceOf(PersistenceException.class)
-            .hasMessageContaining("org.hibernate.PersistentObjectException: detached entity passed to persist");
+            .hasMessageContaining("detached entity passed to persist: com.baeldung.hibernate.exception.detachedentity.entity.Post");
     }
 
     @Test
     public void givenDetachedPost_whenMergeAndPersistComment_thenNoExceptionIsThrown() {
         Comment comment = new Comment("nice article!");
-        Post mergedPost = (Post) session.merge(detachedPost);
+        Post mergedPost = session.merge(detachedPost);
         comment.setPost(mergedPost);
 
         session.persist(comment);
diff --git a/persistence-modules/hibernate-jpa/pom.xml b/persistence-modules/hibernate-jpa/pom.xml
index f742290884..5a99c1c4d0 100644
--- a/persistence-modules/hibernate-jpa/pom.xml
+++ b/persistence-modules/hibernate-jpa/pom.xml
@@ -83,11 +83,12 @@
     </dependencies>
 
     <properties>
-        <hibernate.version>5.3.7.Final</hibernate.version>
-        <mysql.version>8.0.13</mysql.version>
-        <mariaDB4j.version>2.2.3</mariaDB4j.version>
-        <spring-boot.version>2.1.7.RELEASE</spring-boot.version>
-        <h2.version>1.4.200</h2.version>
+        <mysql.version>8.0.32</mysql.version>
+        <mariaDB4j.version>2.6.0</mariaDB4j.version>
+        <spring-boot.version>3.0.4</spring-boot.version>
+        <h2.version>2.1.214</h2.version>
+        <org.slf4j.version>2.0.7</org.slf4j.version>
+        <logback.version>1.4.6</logback.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/converters/PersonNameConverter.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/converters/PersonNameConverter.java
index 506e674984..ec0e2f2e2c 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/converters/PersonNameConverter.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/converters/PersonNameConverter.java
@@ -1,7 +1,7 @@
 package com.baeldung.hibernate.converters;
 
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
 
 import com.baeldung.hibernate.pojo.PersonName;
 
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/entities/Department.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/entities/Department.java
index ff94f4f849..39e69a2b1c 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/entities/Department.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/entities/Department.java
@@ -2,7 +2,7 @@ package com.baeldung.hibernate.entities;
 
 import java.util.List;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 public class Department {
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java
index 6510e70650..38519644c5 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java
@@ -1,13 +1,13 @@
 package com.baeldung.hibernate.entities;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 @org.hibernate.annotations.NamedQueries({ @org.hibernate.annotations.NamedQuery(name = "DeptEmployee_FindByEmployeeNumber", query = "from DeptEmployee where employeeNumber = :employeeNo"),
-        @org.hibernate.annotations.NamedQuery(name = "DeptEmployee_FindAllByDesgination", query = "from DeptEmployee where designation = :designation"),
+        @org.hibernate.annotations.NamedQuery(name = "DeptEmployee_FindAllByDesgination", query = "from DeptEmployee where employeeNumber = :employeeNumber"),
         @org.hibernate.annotations.NamedQuery(name = "DeptEmployee_UpdateEmployeeDepartment", query = "Update DeptEmployee set department = :newDepartment where employeeNumber = :employeeNo"),
         @org.hibernate.annotations.NamedQuery(name = "DeptEmployee_FindAllByDepartment", query = "from DeptEmployee where department = :department", timeout = 1, fetchSize = 10) })
 @org.hibernate.annotations.NamedNativeQueries({ @org.hibernate.annotations.NamedNativeQuery(name = "DeptEmployee_FindByEmployeeName", query = "select * from deptemployee emp where name=:name", resultClass = DeptEmployee.class),
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/entitymanager/getreference/Game.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/entitymanager/getreference/Game.java
index 1de8de0327..5a6f9c7c6c 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/entitymanager/getreference/Game.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/entitymanager/getreference/Game.java
@@ -1,7 +1,7 @@
 package com.baeldung.hibernate.entitymanager.getreference;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 @Entity
 public class Game {
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/entitymanager/getreference/Player.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/entitymanager/getreference/Player.java
index 459a3a00ad..6e62aeda45 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/entitymanager/getreference/Player.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/entitymanager/getreference/Player.java
@@ -1,8 +1,8 @@
 package com.baeldung.hibernate.entitymanager.getreference;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 @Entity
 public class Player {
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpabootstrap/application/Application.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpabootstrap/application/Application.java
index b547a60b06..6263df4237 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpabootstrap/application/Application.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpabootstrap/application/Application.java
@@ -2,7 +2,7 @@ package com.baeldung.hibernate.jpabootstrap.application;
 
 import com.baeldung.hibernate.jpabootstrap.config.JpaEntityManagerFactory;
 import com.baeldung.hibernate.jpabootstrap.entities.User;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 public class Application {
     
@@ -24,8 +24,7 @@ public class Application {
     }
 
     private static class EntityManagerHolder {
-        private static final EntityManager ENTITY_MANAGER = new JpaEntityManagerFactory(
-          new Class[]{User.class}).getEntityManager();
+        private static final EntityManager ENTITY_MANAGER = new JpaEntityManagerFactory(new Class[]{User.class}).getEntityManager();
     }
     
     public static EntityManager getJpaEntityManager() {
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpabootstrap/config/HibernatePersistenceUnitInfo.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpabootstrap/config/HibernatePersistenceUnitInfo.java
index 3852b44b64..af01ea630c 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpabootstrap/config/HibernatePersistenceUnitInfo.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpabootstrap/config/HibernatePersistenceUnitInfo.java
@@ -6,11 +6,11 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
 import javax.sql.DataSource;
-import javax.persistence.SharedCacheMode;
-import javax.persistence.ValidationMode;
-import javax.persistence.spi.ClassTransformer;
-import javax.persistence.spi.PersistenceUnitInfo;
-import javax.persistence.spi.PersistenceUnitTransactionType;
+import jakarta.persistence.SharedCacheMode;
+import jakarta.persistence.ValidationMode;
+import jakarta.persistence.spi.ClassTransformer;
+import jakarta.persistence.spi.PersistenceUnitInfo;
+import jakarta.persistence.spi.PersistenceUnitTransactionType;
 import org.hibernate.jpa.HibernatePersistenceProvider;
 
 public class HibernatePersistenceUnitInfo implements PersistenceUnitInfo {
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpabootstrap/config/JpaEntityManagerFactory.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpabootstrap/config/JpaEntityManagerFactory.java
index bc1932af6f..e115727d67 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpabootstrap/config/JpaEntityManagerFactory.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpabootstrap/config/JpaEntityManagerFactory.java
@@ -7,10 +7,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.stream.Collectors;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import javax.sql.DataSource;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.spi.PersistenceUnitInfo;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.spi.PersistenceUnitInfo;
 import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
 import org.hibernate.jpa.boot.internal.PersistenceUnitInfoDescriptor;
 
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpabootstrap/entities/User.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpabootstrap/entities/User.java
index 86ca1dfa19..43c99f8d96 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpabootstrap/entities/User.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpabootstrap/entities/User.java
@@ -1,10 +1,10 @@
 package com.baeldung.hibernate.jpabootstrap.entities;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "users")
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpacriteriabuilder/service/EmployeeSearchServiceImpl.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpacriteriabuilder/service/EmployeeSearchServiceImpl.java
index e79168a451..9a3216b5eb 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpacriteriabuilder/service/EmployeeSearchServiceImpl.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/jpacriteriabuilder/service/EmployeeSearchServiceImpl.java
@@ -2,13 +2,13 @@ package com.baeldung.hibernate.jpacriteriabuilder.service;
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaBuilder.In;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.Subquery;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaBuilder.In;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.criteria.Subquery;
 
 import com.baeldung.hibernate.entities.Department;
 import com.baeldung.hibernate.entities.DeptEmployee;
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/foreignkeybased/Address.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/foreignkeybased/Address.java
index e05eb46030..0c3238cf98 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/foreignkeybased/Address.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/foreignkeybased/Address.java
@@ -1,12 +1,12 @@
 package com.baeldung.hibernate.onetoone.foreignkeybased;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "address")
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/foreignkeybased/User.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/foreignkeybased/User.java
index dda972f29c..14c2a0a28c 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/foreignkeybased/User.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/foreignkeybased/User.java
@@ -1,14 +1,14 @@
 package com.baeldung.hibernate.onetoone.foreignkeybased;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "users")
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/jointablebased/Employee.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/jointablebased/Employee.java
index a0bc101b9f..fc8b9eefec 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/jointablebased/Employee.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/jointablebased/Employee.java
@@ -1,15 +1,15 @@
 package com.baeldung.hibernate.onetoone.jointablebased;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "employee")
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/jointablebased/WorkStation.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/jointablebased/WorkStation.java
index f530611f6e..0834b9f9d7 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/jointablebased/WorkStation.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/jointablebased/WorkStation.java
@@ -1,13 +1,13 @@
 package com.baeldung.hibernate.onetoone.jointablebased;
 
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "workstation")
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/sharedkeybased/Address.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/sharedkeybased/Address.java
index e70c62e77b..d738b900bc 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/sharedkeybased/Address.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/sharedkeybased/Address.java
@@ -1,12 +1,12 @@
 package com.baeldung.hibernate.onetoone.sharedkeybased;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.MapsId;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.MapsId;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "address")
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/sharedkeybased/User.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/sharedkeybased/User.java
index 605671a149..8ce767eaf7 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/sharedkeybased/User.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/onetoone/sharedkeybased/User.java
@@ -1,15 +1,15 @@
 package com.baeldung.hibernate.onetoone.sharedkeybased;
 
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.PrimaryKeyJoinColumn;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "users")
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/optimisticlocking/OptimisticLockingCourse.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/optimisticlocking/OptimisticLockingCourse.java
index 1af3e3e21b..b8212a049d 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/optimisticlocking/OptimisticLockingCourse.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/optimisticlocking/OptimisticLockingCourse.java
@@ -1,6 +1,6 @@
 package com.baeldung.hibernate.optimisticlocking;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 public class OptimisticLockingCourse {
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/optimisticlocking/OptimisticLockingStudent.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/optimisticlocking/OptimisticLockingStudent.java
index b79212ae8d..22f11e37fb 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/optimisticlocking/OptimisticLockingStudent.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/optimisticlocking/OptimisticLockingStudent.java
@@ -1,6 +1,6 @@
 package com.baeldung.hibernate.optimisticlocking;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.List;
 
 @Entity
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/Address.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/Address.java
index c889cb6127..7c6d20df40 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/Address.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/Address.java
@@ -1,6 +1,6 @@
 package com.baeldung.hibernate.pessimisticlocking;
 
-import javax.persistence.Embeddable;
+import jakarta.persistence.Embeddable;
 
 @Embeddable
 public class Address {
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/Customer.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/Customer.java
index cb73cbc958..9f36e3b308 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/Customer.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/Customer.java
@@ -1,6 +1,6 @@
 package com.baeldung.hibernate.pessimisticlocking;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.List;
 
 @Entity
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/Individual.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/Individual.java
index e491c09eb5..b954c9fdb2 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/Individual.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/Individual.java
@@ -1,9 +1,9 @@
 package com.baeldung.hibernate.pessimisticlocking;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
 
 @Entity
 @Inheritance(strategy = InheritanceType.JOINED)
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/PessimisticLockingCourse.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/PessimisticLockingCourse.java
index aea7d5fc87..012f3d1d39 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/PessimisticLockingCourse.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/PessimisticLockingCourse.java
@@ -1,6 +1,6 @@
 package com.baeldung.hibernate.pessimisticlocking;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 public class PessimisticLockingCourse {
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/PessimisticLockingEmployee.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/PessimisticLockingEmployee.java
index a1328cbdad..e5b00f3800 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/PessimisticLockingEmployee.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/PessimisticLockingEmployee.java
@@ -1,6 +1,6 @@
 package com.baeldung.hibernate.pessimisticlocking;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 import java.math.BigDecimal;
 
 @Entity
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/PessimisticLockingStudent.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/PessimisticLockingStudent.java
index e6c5f476b4..c5634ebc24 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/PessimisticLockingStudent.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pessimisticlocking/PessimisticLockingStudent.java
@@ -1,6 +1,6 @@
 package com.baeldung.hibernate.pessimisticlocking;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.List;
 
 @Entity
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pojo/Movie.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pojo/Movie.java
index 5fae7f6a97..7aeadd4501 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pojo/Movie.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pojo/Movie.java
@@ -1,8 +1,8 @@
 package com.baeldung.hibernate.pojo;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "MOVIE")
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pojo/Person.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pojo/Person.java
index 390a5954ed..d0c8b8aa2f 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pojo/Person.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pojo/Person.java
@@ -1,9 +1,9 @@
 package com.baeldung.hibernate.pojo;
 
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 
 import com.baeldung.hibernate.converters.PersonNameConverter;
 
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pojo/Post.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pojo/Post.java
index 25e51e35d0..66a68367d7 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pojo/Post.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pojo/Post.java
@@ -1,9 +1,9 @@
 package com.baeldung.hibernate.pojo;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "posts")
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pojo/Student.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pojo/Student.java
index 9b26c117eb..263908a5fc 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pojo/Student.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/pojo/Student.java
@@ -1,9 +1,9 @@
 package com.baeldung.hibernate.pojo;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Entity
 public class Student {
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/serializable/Account.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/serializable/Account.java
index b051809ee5..7070f21c45 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/serializable/Account.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/serializable/Account.java
@@ -1,9 +1,9 @@
 package com.baeldung.hibernate.serializable;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 
 @Entity
 public class Account {
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/serializable/Email.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/serializable/Email.java
index 11e7c6f159..4ba902281a 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/serializable/Email.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/serializable/Email.java
@@ -1,7 +1,7 @@
 package com.baeldung.hibernate.serializable;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 import java.io.Serializable;
 
 @Entity
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/serializable/User.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/serializable/User.java
index e7820fe52f..267155b4db 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/serializable/User.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/serializable/User.java
@@ -1,7 +1,7 @@
 package com.baeldung.hibernate.serializable;
 
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
 
 @Entity
 public class User {
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/serializable/UserId.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/serializable/UserId.java
index 7d3d382f67..6fcbeafdd0 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/serializable/UserId.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/hibernate/serializable/UserId.java
@@ -1,6 +1,6 @@
 package com.baeldung.hibernate.serializable;
 
-import javax.persistence.Embeddable;
+import jakarta.persistence.Embeddable;
 import java.io.Serializable;
 
 @Embeddable
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/persistencecontext/entity/User.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/persistencecontext/entity/User.java
index 7252ac46f5..afdbf067c3 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/persistencecontext/entity/User.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/persistencecontext/entity/User.java
@@ -1,9 +1,9 @@
 package com.baeldung.persistencecontext.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
-@Entity
+@Entity(name = "users")
 public class User {
 
     @Id
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/persistencecontext/service/ExtendedPersistenceContextUserService.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/persistencecontext/service/ExtendedPersistenceContextUserService.java
index ef25aac69f..7ad6aae745 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/persistencecontext/service/ExtendedPersistenceContextUserService.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/persistencecontext/service/ExtendedPersistenceContextUserService.java
@@ -1,15 +1,15 @@
 package com.baeldung.persistencecontext.service;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.transaction.Transactional;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContextType;
+import jakarta.transaction.Transactional;
 
-import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 import com.baeldung.persistencecontext.entity.User;
 
-@Component
+@Service
 public class ExtendedPersistenceContextUserService {
 
     @PersistenceContext(type = PersistenceContextType.EXTENDED)
diff --git a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/persistencecontext/service/TransctionPersistenceContextUserService.java b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/persistencecontext/service/TransctionPersistenceContextUserService.java
index 481defcf08..6b9fd1f14c 100644
--- a/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/persistencecontext/service/TransctionPersistenceContextUserService.java
+++ b/persistence-modules/hibernate-jpa/src/main/java/com/baeldung/persistencecontext/service/TransctionPersistenceContextUserService.java
@@ -1,20 +1,20 @@
 package com.baeldung.persistencecontext.service;
 
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.transaction.Transactional;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.transaction.Transactional;
 
-import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 import com.baeldung.persistencecontext.entity.User;
 
-@Component
+@Service
 public class TransctionPersistenceContextUserService {
 
     @PersistenceContext
     private EntityManager entityManager;
-    
+
     @Transactional
     public User insertWithTransaction(User user) {
         entityManager.persist(user);
diff --git a/persistence-modules/hibernate-jpa/src/main/resources/META-INF/persistence.xml b/persistence-modules/hibernate-jpa/src/main/resources/META-INF/persistence.xml
index 12b41a4973..1669413289 100644
--- a/persistence-modules/hibernate-jpa/src/main/resources/META-INF/persistence.xml
+++ b/persistence-modules/hibernate-jpa/src/main/resources/META-INF/persistence.xml
@@ -8,12 +8,13 @@
         <class>com.baeldung.hibernate.pojo.Movie</class>
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
         <properties>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect"/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
             <property name="hibernate.hbm2ddl.auto" value="update"/>
-            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://127.0.0.1:3306/moviecatalog"/>
-            <property name="javax.persistence.jdbc.user" value="root"/>
-            <property name="javax.persistence.jdbc.password" value="root"/>
+            <property name="jakarta.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:mysql://127.0.0.1:3306/moviecatalog"/>
+            <property name="jakarta.persistence.jdbc.user" value="root"/>
+            <property name="jakarta.persistence.jdbc.password" value="root"/>
+            <property name="hibernate.id.db_structure_naming_strategy" value="legacy" />
         </properties>
     </persistence-unit>
     <!-- Persistence unit for H2 -->
@@ -34,10 +35,14 @@
             <property name="hibernate.show_sql" value="true"/>
             <property name="hibernate.generate_statistics" value="false"/>
             <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1"/>
-            <property name="javax.persistence.jdbc.user" value="sa"/>
-            <property name="javax.persistence.jdbc.password" value=""/>
+            <property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver"/>
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1"/>
+            <property name="jakarta.persistence.jdbc.user" value="sa"/>
+            <property name="jakarta.persistence.jdbc.password" value=""/>
+            <property name="hibernate.id.db_structure_naming_strategy" value="legacy" />
+            <!-- ensure backward compatibility -->
+            <property name="hibernate.type.preferred_duration_jdbc_type" value="BIGINT" />
+            <property name="hibernate.type.preferred_instant_jdbc_type" value="TIMESTAMP" />
         </properties>
     </persistence-unit>
     <!-- Persistence unit for MySQL -->
@@ -57,16 +62,20 @@
             <property name="hibernate.hbm2ddl.auto" value="update"/>
             <property name="hibernate.show_sql" value="true"/>
             <property name="hibernate.generate_statistics" value="false"/>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect"/>
-            <property name="javax.persistence.jdbc.driver" value="com.mysql.cj.jdbc.Driver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/baeldung"/>
-            <property name="javax.persistence.jdbc.user" value="root"/>
-            <property name="javax.persistence.jdbc.password" value="password"/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
+            <property name="jakarta.persistence.jdbc.driver" value="com.mysql.cj.jdbc.Driver"/>
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/baeldung"/>
+            <property name="jakarta.persistence.jdbc.user" value="root"/>
+            <property name="jakarta.persistence.jdbc.password" value="password"/>
 
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
-            <property name="javax.persistence.schema-generation.create-script-source" value="/META-INF/create-db.sql"/>
-            <property name="javax.persistence.schema-generation.drop-script-source" value="/META-INF/drop-db.sql"/>
-            <property name="javax.persistence.sql-load-script-source" value="/META-INF/data.sql"/>
+            <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create"/>
+            <property name="jakarta.persistence.schema-generation.create-script-source" value="/META-INF/create-db.sql"/>
+            <property name="jakarta.persistence.schema-generation.drop-script-source" value="/META-INF/drop-db.sql"/>
+            <property name="jakarta.persistence.sql-load-script-source" value="/META-INF/data.sql"/>
+            <property name="hibernate.id.db_structure_naming_strategy" value="legacy" />
+            <!-- ensure backward compatibility -->
+            <property name="hibernate.type.preferred_duration_jdbc_type" value="BIGINT" />
+            <property name="hibernate.type.preferred_instant_jdbc_type" value="TIMESTAMP" />
 
         </properties>
     </persistence-unit>
@@ -87,16 +96,20 @@
             <property name="hibernate.hbm2ddl.auto" value="update"/>
             <property name="hibernate.show_sql" value="true"/>
             <property name="hibernate.generate_statistics" value="false"/>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQL95Dialect"/>
-            <property name="javax.persistence.jdbc.driver" value="org.postgresql.Driver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:postgresql://localhost:5432/postgres"/>
-            <property name="javax.persistence.jdbc.user" value="postgres"/>
-            <property name="javax.persistence.jdbc.password" value=""/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
+            <property name="jakarta.persistence.jdbc.driver" value="org.postgresql.Driver"/>
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:postgresql://localhost:5432/postgres"/>
+            <property name="jakarta.persistence.jdbc.user" value="postgres"/>
+            <property name="jakarta.persistence.jdbc.password" value=""/>
 
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
-            <property name="javax.persistence.schema-generation.create-script-source" value="/META-INF/create-db.sql"/>
-            <property name="javax.persistence.schema-generation.drop-script-source" value="/META-INF/drop-db.sql"/>
-            <property name="javax.persistence.sql-load-script-source" value="/META-INF/data.sql"/>
+            <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create"/>
+            <property name="jakarta.persistence.schema-generation.create-script-source" value="/META-INF/create-db.sql"/>
+            <property name="jakarta.persistence.schema-generation.drop-script-source" value="/META-INF/drop-db.sql"/>
+            <property name="jakarta.persistence.sql-load-script-source" value="/META-INF/data.sql"/>
+            <property name="hibernate.id.db_structure_naming_strategy" value="legacy" />
+            <!-- ensure backward compatibility -->
+            <property name="hibernate.type.preferred_duration_jdbc_type" value="BIGINT" />
+            <property name="hibernate.type.preferred_instant_jdbc_type" value="TIMESTAMP" />
 
         </properties>
     </persistence-unit>
@@ -113,10 +126,16 @@
             <property name="hibernate.show_sql" value="true"/>
             <property name="hibernate.generate_statistics" value="false"/>
             <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:db2;DB_CLOSE_DELAY=-1"/>
-            <property name="javax.persistence.jdbc.user" value="sa"/>
-            <property name="javax.persistence.jdbc.password" value=""/>
+            <property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver"/>
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:h2:mem:db2;DB_CLOSE_DELAY=-1"/>
+            <property name="jakarta.persistence.jdbc.user" value="sa"/>
+            <property name="jakarta.persistence.jdbc.password" value=""/>
+            <property name="hibernate.id.db_structure_naming_strategy" value="legacy" />
+            <!-- ensure backward compatibility -->
+            <property name="hibernate.type.preferred_duration_jdbc_type" value="BIGINT" />
+            <property name="hibernate.type.preferred_instant_jdbc_type" value="TIMESTAMP" />
+
+            <property name="hibernate.globally_quoted_identifiers" value="true"/>
         </properties>
     </persistence-unit>
 
diff --git a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/entitymanager/getreference/GetReferenceH2IntegrationTest.java b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/entitymanager/getreference/GetReferenceH2IntegrationTest.java
index e8e6aeed7c..86f059c6d7 100644
--- a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/entitymanager/getreference/GetReferenceH2IntegrationTest.java
+++ b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/entitymanager/getreference/GetReferenceH2IntegrationTest.java
@@ -5,9 +5,9 @@ import ch.qos.logback.classic.Logger;
 import org.junit.jupiter.api.*;
 import org.slf4j.LoggerFactory;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
@@ -87,8 +87,8 @@ public class GetReferenceH2IntegrationTest {
         });
 
         StringBuilder expected = new StringBuilder();
-        expected.append("Hibernate: select game0_.id as id1_0_0_, game0_.name as name2_0_0_ from Game game0_ where game0_.id=?\n");
-        expected.append("Hibernate: update Game set name=? where id=?\n");
+        expected.append("Hibernate: select g1_0.id,g1_0.name from Game g1_0 where g1_0.id=?" + System.lineSeparator());
+        expected.append("Hibernate: update Game set name=? where id=?" + System.lineSeparator());
 
         assertEquals(expected.toString(), output.toString());
     }
@@ -104,8 +104,8 @@ public class GetReferenceH2IntegrationTest {
         });
 
         StringBuilder expected = new StringBuilder();
-        expected.append("Hibernate: select game0_.id as id1_0_0_, game0_.name as name2_0_0_ from Game game0_ where game0_.id=?\n");
-        expected.append("Hibernate: update Game set name=? where id=?\n");
+        expected.append("Hibernate: select g1_0.id,g1_0.name from Game g1_0 where g1_0.id=?" + System.lineSeparator());
+        expected.append("Hibernate: update Game set name=? where id=?" + System.lineSeparator());
 
         assertEquals(expected.toString(), output.toString());
     }
@@ -120,10 +120,9 @@ public class GetReferenceH2IntegrationTest {
 
         StringBuilder expected = new StringBuilder();
         expected.append("Hibernate: select ");
-        expected.append("player0_.id as id1_1_0_, player0_.game_id as game_id3_1_0_, ");
-        expected.append("player0_.name as name2_1_0_, game1_.id as id1_0_1_, game1_.name as name2_0_1_ ");
-        expected.append("from Player player0_ left outer join Game game1_ on player0_.game_id=game1_.id where player0_.id=?\n");
-        expected.append("Hibernate: delete from Player where id=?\n");
+        expected.append("p1_0.id,g1_0.id,g1_0.name,p1_0.name ");
+        expected.append("from Player p1_0 left join Game g1_0 on g1_0.id=p1_0.game_id where p1_0.id=?" + System.lineSeparator());
+        expected.append("Hibernate: delete from Player where id=?" + System.lineSeparator());
 
         assertEquals(expected.toString(), output.toString());
     }
@@ -137,11 +136,7 @@ public class GetReferenceH2IntegrationTest {
         });
 
         StringBuilder expected = new StringBuilder();
-        expected.append("Hibernate: select ");
-        expected.append("player0_.id as id1_1_0_, player0_.game_id as game_id3_1_0_, ");
-        expected.append("player0_.name as name2_1_0_, game1_.id as id1_0_1_, game1_.name as name2_0_1_ ");
-        expected.append("from Player player0_ left outer join Game game1_ on player0_.game_id=game1_.id where player0_.id=?\n");
-        expected.append("Hibernate: delete from Player where id=?\n");
+        expected.append("Hibernate: delete from Player where id=?" + System.lineSeparator());
 
         assertEquals(expected.toString(), output.toString());
     }
@@ -159,12 +154,11 @@ public class GetReferenceH2IntegrationTest {
         }));
 
         StringBuilder expected = new StringBuilder();
-        expected.append("Hibernate: select game0_.id as id1_0_0_, game0_.name as name2_0_0_ from Game game0_ where game0_.id=?\n");
+        expected.append("Hibernate: select g1_0.id,g1_0.name from Game g1_0 where g1_0.id=?" + System.lineSeparator());
         expected.append("Hibernate: select ");
-        expected.append("player0_.id as id1_1_0_, player0_.game_id as game_id3_1_0_, ");
-        expected.append("player0_.name as name2_1_0_, game1_.id as id1_0_1_, game1_.name as name2_0_1_ ");
-        expected.append("from Player player0_ left outer join Game game1_ on player0_.game_id=game1_.id where player0_.id=?\n");
-        expected.append("Hibernate: update Player set game_id=?, name=? where id=?\n");
+        expected.append("p1_0.id,g1_0.id,g1_0.name,p1_0.name ");
+        expected.append("from Player p1_0 left join Game g1_0 on g1_0.id=p1_0.game_id where p1_0.id=?" + System.lineSeparator());
+        expected.append("Hibernate: update Player set game_id=?,name=? where id=?" + System.lineSeparator());
 
         assertEquals(expected.toString(), output.toString());
     }
@@ -183,10 +177,9 @@ public class GetReferenceH2IntegrationTest {
 
         StringBuilder expected = new StringBuilder();
         expected.append("Hibernate: select ");
-        expected.append("player0_.id as id1_1_0_, player0_.game_id as game_id3_1_0_, ");
-        expected.append("player0_.name as name2_1_0_, game1_.id as id1_0_1_, game1_.name as name2_0_1_ ");
-        expected.append("from Player player0_ left outer join Game game1_ on player0_.game_id=game1_.id where player0_.id=?\n");
-        expected.append("Hibernate: update Player set game_id=?, name=? where id=?\n");
+        expected.append("p1_0.id,g1_0.id,g1_0.name,p1_0.name ");
+        expected.append("from Player p1_0 left join Game g1_0 on g1_0.id=p1_0.game_id where p1_0.id=?" + System.lineSeparator());
+        expected.append("Hibernate: update Player set game_id=?,name=? where id=?" + System.lineSeparator());
 
         assertEquals(expected.toString(), output.toString());
     }
diff --git a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/entitymanager/getreference/GetReferenceMySQLManualTest.java b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/entitymanager/getreference/GetReferenceMySQLManualTest.java
index 2b7c5e8119..29be19dd68 100644
--- a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/entitymanager/getreference/GetReferenceMySQLManualTest.java
+++ b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/entitymanager/getreference/GetReferenceMySQLManualTest.java
@@ -5,9 +5,9 @@ import ch.qos.logback.classic.Logger;
 import org.junit.jupiter.api.*;
 import org.slf4j.LoggerFactory;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
diff --git a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/entitymanager/getreference/GetReferencePostgreSQLManualTest.java b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/entitymanager/getreference/GetReferencePostgreSQLManualTest.java
index 17f6b10b8a..20a0bca6f1 100644
--- a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/entitymanager/getreference/GetReferencePostgreSQLManualTest.java
+++ b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/entitymanager/getreference/GetReferencePostgreSQLManualTest.java
@@ -5,9 +5,9 @@ import ch.qos.logback.classic.Logger;
 import org.junit.jupiter.api.*;
 import org.slf4j.LoggerFactory;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
diff --git a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/jpacriteriabuilder/EmployeeSearchServiceIntegrationTest.java b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/jpacriteriabuilder/EmployeeSearchServiceIntegrationTest.java
index 2b12734a10..16d1057285 100644
--- a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/jpacriteriabuilder/EmployeeSearchServiceIntegrationTest.java
+++ b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/jpacriteriabuilder/EmployeeSearchServiceIntegrationTest.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
@@ -81,13 +81,10 @@ public class EmployeeSearchServiceIntegrationTest {
 
     @Test
     public final void givenCriteriaQuery_whenSearchedUsingCriteriaBuilderWithListofAuthors_thenResultIsFilteredByAuthorNames() {
-        List<String> titles = new ArrayList<String>() {
-            {
-                add("Manager");
-                add("Senior Manager");
-                add("Director");
-            }
-        };
+        List<String> titles = new ArrayList<>();
+        titles.add("Manager");
+        titles.add("Senior Manager");
+        titles.add("Director");
         List<DeptEmployee> result = searchService.filterbyTitleUsingCriteriaBuilder(titles);
         assertEquals("Number of Employees does not match with expected.", 6, result.size());
         assertThat(result.stream()
diff --git a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/optimisticlocking/OptimisticLockingIntegrationTest.java b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/optimisticlocking/OptimisticLockingIntegrationTest.java
index 37c490f297..2fa302e270 100644
--- a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/optimisticlocking/OptimisticLockingIntegrationTest.java
+++ b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/optimisticlocking/OptimisticLockingIntegrationTest.java
@@ -3,9 +3,9 @@ package com.baeldung.hibernate.optimisticlocking;
 import java.io.IOException;
 import java.util.Arrays;
 
-import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
-import javax.persistence.OptimisticLockException;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.OptimisticLockException;
 
 import org.hibernate.SessionFactory;
 import org.junit.After;
diff --git a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/pessimisticlocking/BasicPessimisticLockingIntegrationTest.java b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/pessimisticlocking/BasicPessimisticLockingIntegrationTest.java
index 4b9c7720fd..4085a98dad 100644
--- a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/pessimisticlocking/BasicPessimisticLockingIntegrationTest.java
+++ b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/pessimisticlocking/BasicPessimisticLockingIntegrationTest.java
@@ -1,14 +1,14 @@
 package com.baeldung.hibernate.pessimisticlocking;
 
 import com.baeldung.hibernate.HibernateUtil;
-import com.vividsolutions.jts.util.Assert;
+import org.locationtech.jts.util.Assert;
 
 import org.hibernate.SessionFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.IOException;
 import java.util.Arrays;
 
@@ -46,7 +46,7 @@ public class BasicPessimisticLockingIntegrationTest {
     }
 
     @Test
-    public void givenRecordWithPessimisticReadQuery_whenQueryingNewOne_PessimisticLockExceptionThrown() throws IOException {
+    public void givenRecordWithPessimisticReadQuery_whenQueryingNewOne_PessimisticLockExceptionThrown() {
         try {
             EntityManager entityManager = getEntityManagerWithOpenTransaction();
             Query query = entityManager.createQuery("from Student where studentId = :studentId");
diff --git a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/pessimisticlocking/PessimisticLockScopesIntegrationTest.java b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/pessimisticlocking/PessimisticLockScopesIntegrationTest.java
index 81cb7d95f8..c2f2326159 100644
--- a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/pessimisticlocking/PessimisticLockScopesIntegrationTest.java
+++ b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/pessimisticlocking/PessimisticLockScopesIntegrationTest.java
@@ -6,9 +6,9 @@ import org.hibernate.SessionFactory;
 import org.junit.AfterClass;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
-import javax.persistence.PessimisticLockScope;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.PessimisticLockScope;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.Arrays;
@@ -36,7 +36,7 @@ public class PessimisticLockScopesIntegrationTest {
 
         // EXTENDED SCOPE
         Map<String, Object> map = new HashMap<>();
-        map.put("javax.persistence.lock.scope", PessimisticLockScope.EXTENDED);
+        map.put("jakarta.persistence", PessimisticLockScope.EXTENDED);
 
         EntityManager em3 = getEntityManagerWithOpenTransaction();
         foundEmployee = em3.find(PessimisticLockingEmployee.class, 1L, LockModeType.PESSIMISTIC_WRITE, map);
@@ -65,7 +65,7 @@ public class PessimisticLockScopesIntegrationTest {
 
         // EXTENDED SCOPE
         Map<String, Object> map = new HashMap<>();
-        map.put("javax.persistence.lock.scope", PessimisticLockScope.EXTENDED);
+        map.put("jakarta.persistence", PessimisticLockScope.EXTENDED);
 
         EntityManager em3 = getEntityManagerWithOpenTransaction();
         foundCustomer = em3.find(Customer.class, 1L, LockModeType.PESSIMISTIC_WRITE, map);
@@ -96,7 +96,7 @@ public class PessimisticLockScopesIntegrationTest {
 
         // EXTENDED SCOPE
         Map<String, Object> map = new HashMap<>();
-        map.put("javax.persistence.lock.scope", PessimisticLockScope.EXTENDED);
+        map.put("jakarta.persistence", PessimisticLockScope.EXTENDED);
 
         EntityManager em3 = getEntityManagerWithOpenTransaction();
         foundCourse = em3.find(PessimisticLockingCourse.class, 1L, LockModeType.PESSIMISTIC_WRITE, map);
diff --git a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/serializable/JPASerializableIntegrationTest.java b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/serializable/JPASerializableIntegrationTest.java
index 696bc23ab0..5512757889 100644
--- a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/serializable/JPASerializableIntegrationTest.java
+++ b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/serializable/JPASerializableIntegrationTest.java
@@ -4,10 +4,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import java.io.IOException;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -17,7 +16,7 @@ public class JPASerializableIntegrationTest {
     private static EntityManager entityManager;
 
     @Before
-    public void setUp() throws IOException {
+    public void setUp() {
         EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory("com.baeldung.hibernate.serializable.h2_persistence_unit");
         entityManager = entityManagerFactory.createEntityManager();
         entityManager.getTransaction().begin();
@@ -63,7 +62,7 @@ public class JPASerializableIntegrationTest {
         entityManager.persist(account);
         entityManager.persist(account2);
 
-        List userAccounts = entityManager.createQuery("select a from Account a join fetch a.user where a.user.email = :email")
+        List<Account> userAccounts = entityManager.createQuery("select a from Account a join fetch a.user where a.user.email = :email", Account.class)
             .setParameter("email", email)
             .getResultList();
         assertEquals(2, userAccounts.size());
diff --git a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/transaction/TransactionIntegrationTest.java b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/transaction/TransactionIntegrationTest.java
index 246a7d59f9..f64846ba59 100644
--- a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/transaction/TransactionIntegrationTest.java
+++ b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/hibernate/transaction/TransactionIntegrationTest.java
@@ -2,7 +2,6 @@ package com.baeldung.hibernate.transaction;
 
 import com.baeldung.hibernate.HibernateUtil;
 import com.baeldung.hibernate.pojo.Post;
-import com.baeldung.hibernate.transaction.PostService;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.junit.BeforeClass;
@@ -10,7 +9,6 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Properties;
 
diff --git a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/persistencecontext/PersistenceContextIntegrationTest.java b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/persistencecontext/PersistenceContextIntegrationTest.java
index b299dd5834..37e6e438d8 100644
--- a/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/persistencecontext/PersistenceContextIntegrationTest.java
+++ b/persistence-modules/hibernate-jpa/src/test/java/com/baeldung/persistencecontext/PersistenceContextIntegrationTest.java
@@ -4,8 +4,8 @@ import com.baeldung.persistencecontext.entity.User;
 import com.baeldung.persistencecontext.service.ExtendedPersistenceContextUserService;
 import com.baeldung.persistencecontext.service.TransctionPersistenceContextUserService;
 
-import javax.persistence.EntityExistsException;
-import javax.persistence.TransactionRequiredException;
+import jakarta.persistence.EntityExistsException;
+import jakarta.persistence.TransactionRequiredException;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/persistence-modules/hibernate-mapping-2/README.md b/persistence-modules/hibernate-mapping-2/README.md
index 7a811e17cf..36c9f8c304 100644
--- a/persistence-modules/hibernate-mapping-2/README.md
+++ b/persistence-modules/hibernate-mapping-2/README.md
@@ -4,4 +4,6 @@ This module contains articles about Hibernate Mappings.
 
 ### Relevant articles
 
-- [Hibernate Many to Many Annotation Tutorial](https://www.baeldung.com/hibernate-many-to-many)
\ No newline at end of file
+- [Hibernate Many to Many Annotation Tutorial](https://www.baeldung.com/hibernate-many-to-many)
+- [Boolean Converters in Hibernate 6](https://www.baeldung.com/java-hibernate-6-boolean-converters)
+- [Generate UUIDs as Primary Keys With Hibernate](https://www.baeldung.com/java-hibernate-uuid-primary-key)
diff --git a/persistence-modules/hibernate-mapping-2/pom.xml b/persistence-modules/hibernate-mapping-2/pom.xml
index 2a787a0e46..1b9a3e45d3 100644
--- a/persistence-modules/hibernate-mapping-2/pom.xml
+++ b/persistence-modules/hibernate-mapping-2/pom.xml
@@ -55,32 +55,15 @@
             <artifactId>h2</artifactId>
             <version>${h2.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-            <version>${com.sun.xml.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>${javax.xml.bind.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>${com.sun.xml.version}</version>
-        </dependency>
     </dependencies>
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>5.0.2.RELEASE</org.springframework.version>
-        <org.springframework.data.version>1.10.6.RELEASE</org.springframework.data.version>
+        <org.springframework.version>6.0.6</org.springframework.version>
+        <org.springframework.data.version>3.0.3</org.springframework.data.version>
         <!-- persistence -->
-        <hibernate.version>5.2.10.Final</hibernate.version>
         <tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
-        <com.sun.xml.version>2.3.0.1</com.sun.xml.version>
-        <javax.xml.bind.version>2.3.1</javax.xml.bind.version>
+        <com.sun.xml.version>4.0.2</com.sun.xml.version>
         <h2.version>2.1.214</h2.version>
     </properties>
 
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/HibernateUtil.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/HibernateUtil.java
new file mode 100644
index 0000000000..df409ee888
--- /dev/null
+++ b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/HibernateUtil.java
@@ -0,0 +1,58 @@
+package com.baeldung.hibernate;
+
+import static org.hibernate.boot.registry.StandardServiceRegistryBuilder.DEFAULT_CFG_RESOURCE_NAME;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.service.ServiceRegistry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.baeldung.hibernate.booleanconverters.model.Question;
+import com.baeldung.hibernate.manytomany.model.Employee;
+import com.baeldung.hibernate.manytomany.model.Project;
+import com.baeldung.hibernate.uuids.WebSiteUser;
+import com.baeldung.hibernate.uuids.Element;
+import com.baeldung.hibernate.uuids.Reservation;
+import com.baeldung.hibernate.uuids.Sale;
+
+public class HibernateUtil {
+
+    private static final String DEFAULT_RESOURCE = "manytomany.cfg.xml";
+    private static final Logger LOGGER = LoggerFactory.getLogger(HibernateUtil.class);
+
+    private static SessionFactory buildSessionFactory(String resource) {
+        try {
+            // Create the SessionFactory from hibernate-annotation.cfg.xml
+            Configuration configuration = new Configuration();
+            configuration.addAnnotatedClass(Employee.class);
+            configuration.addAnnotatedClass(Project.class);
+            configuration.addAnnotatedClass(WebSiteUser.class);
+            configuration.addAnnotatedClass(Element.class);
+            configuration.addAnnotatedClass(Reservation.class);
+            configuration.addAnnotatedClass(Sale.class);
+            configuration.addAnnotatedClass(Question.class);
+            configuration.addPackage(Question.class.getPackageName());
+            configuration.configure(resource);
+            LOGGER.debug("Hibernate Annotation Configuration loaded");
+
+            ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties())
+                    .build();
+            LOGGER.debug("Hibernate Annotation serviceRegistry created");
+
+            return configuration.buildSessionFactory(serviceRegistry);
+        } catch (Throwable ex) {
+            LOGGER.error("Initial SessionFactory creation failed.", ex);
+            throw new ExceptionInInitializerError(ex);
+        }
+    }
+
+    public static SessionFactory getSessionFactory() {
+        return buildSessionFactory(DEFAULT_RESOURCE);
+    }
+
+    public static SessionFactory getSessionFactory(String resource) {
+        return buildSessionFactory(resource);
+    }
+}
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/booleanconverters/model/Question.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/booleanconverters/model/Question.java
new file mode 100644
index 0000000000..be2990359f
--- /dev/null
+++ b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/booleanconverters/model/Question.java
@@ -0,0 +1,86 @@
+package com.baeldung.hibernate.booleanconverters.model;
+
+import java.util.UUID;
+
+import org.hibernate.type.NumericBooleanConverter;
+import org.hibernate.type.TrueFalseConverter;
+import org.hibernate.type.YesNoConverter;
+
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
+@Entity
+public class Question {
+
+    @Id
+    private UUID id;
+    private String content;
+    @Convert(converter = YesNoConverter.class)
+    private Boolean correctAnswer;
+    @Convert(converter = TrueFalseConverter.class)
+    private Boolean shouldBeAsked;
+    @Convert(converter = NumericBooleanConverter.class)
+    private Boolean isEasy;
+    private Boolean wasAskedBefore;
+
+    public Question() {
+    }
+
+    public Question(UUID id, String content, Boolean correctAnswer, Boolean shouldBeAsked, Boolean isEasy, Boolean wasAskedBefore) {
+        this.id = id;
+        this.content = content;
+        this.correctAnswer = correctAnswer;
+        this.shouldBeAsked = shouldBeAsked;
+        this.isEasy = isEasy;
+        this.wasAskedBefore = wasAskedBefore;
+    }
+
+    public UUID getId() {
+        return id;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public Boolean getCorrectAnswer() {
+        return correctAnswer;
+    }
+
+    public Boolean getShouldBeAsked() {
+        return shouldBeAsked;
+    }
+
+    public Boolean isEasy() {
+        return isEasy;
+    }
+
+    public Boolean getWasAskedBefore() {
+        return wasAskedBefore;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public void setCorrectAnswer(Boolean correctAnswer) {
+        this.correctAnswer = correctAnswer;
+    }
+
+    public void setShouldBeAsked(Boolean shouldBeAsked) {
+        this.shouldBeAsked = shouldBeAsked;
+    }
+
+    public void setEasy(Boolean easy) {
+        isEasy = easy;
+    }
+
+    public void setWasAskedBefore(Boolean wasAskedBefore) {
+        this.wasAskedBefore = wasAskedBefore;
+    }
+}
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/booleanconverters/model/package-info.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/booleanconverters/model/package-info.java
new file mode 100644
index 0000000000..d5041b87c0
--- /dev/null
+++ b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/booleanconverters/model/package-info.java
@@ -0,0 +1,5 @@
+@ConverterRegistration(converter = YesNoConverter.class)
+package com.baeldung.hibernate.booleanconverters.model;
+
+import org.hibernate.annotations.ConverterRegistration;
+import org.hibernate.type.YesNoConverter;
\ No newline at end of file
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/PersistenceConfig.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/PersistenceConfig.java
similarity index 95%
rename from persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/PersistenceConfig.java
rename to persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/PersistenceConfig.java
index 0d7b8bdbcf..4ec6c9fb71 100644
--- a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/PersistenceConfig.java
+++ b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/PersistenceConfig.java
@@ -1,4 +1,4 @@
-package com.baeldung.manytomany;
+package com.baeldung.hibernate.manytomany;
 
 import java.util.Properties;
 
@@ -22,7 +22,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-h2.properties" })
-@ComponentScan({ "com.baeldung.manytomany" })
+@ComponentScan({ "com.baeldung.hibernate.manytomany" })
 public class PersistenceConfig {
 
     @Autowired
@@ -32,7 +32,7 @@ public class PersistenceConfig {
     public LocalSessionFactoryBean sessionFactory() {
         final LocalSessionFactoryBean sessionFactory = new LocalSessionFactoryBean();
         sessionFactory.setDataSource(restDataSource());
-        sessionFactory.setPackagesToScan(new String[] { "com.baeldung.manytomany" });
+        sessionFactory.setPackagesToScan(new String[] { "com.baeldung.hibernate.manytomany" });
         sessionFactory.setHibernateProperties(hibernateProperties());
 
         return sessionFactory;
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/IEmployeeDao.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/IEmployeeDao.java
new file mode 100644
index 0000000000..7bff73ecf4
--- /dev/null
+++ b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/IEmployeeDao.java
@@ -0,0 +1,8 @@
+package com.baeldung.hibernate.manytomany.dao;
+
+import com.baeldung.hibernate.manytomany.dao.common.IOperations;
+import com.baeldung.hibernate.manytomany.model.Employee;
+
+public interface IEmployeeDao extends IOperations<Employee>{
+
+}
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/IProjectDao.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/IProjectDao.java
new file mode 100644
index 0000000000..de800ae783
--- /dev/null
+++ b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/IProjectDao.java
@@ -0,0 +1,8 @@
+package com.baeldung.hibernate.manytomany.dao;
+
+import com.baeldung.hibernate.manytomany.dao.common.IOperations;
+import com.baeldung.hibernate.manytomany.model.Project;
+
+public interface IProjectDao extends IOperations<Project>{
+
+}
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/common/AbstractDao.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/common/AbstractDao.java
similarity index 85%
rename from persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/common/AbstractDao.java
rename to persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/common/AbstractDao.java
index b37b48e645..6ed04a9b2f 100644
--- a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/common/AbstractDao.java
+++ b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/common/AbstractDao.java
@@ -1,4 +1,4 @@
-package com.baeldung.manytomany.dao.common;
+package com.baeldung.hibernate.manytomany.dao.common;
 
 import java.io.Serializable;
 
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/common/AbstractHibernateDao.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/common/AbstractHibernateDao.java
similarity index 96%
rename from persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/common/AbstractHibernateDao.java
rename to persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/common/AbstractHibernateDao.java
index 9c8a8faa2e..67878906ca 100644
--- a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/common/AbstractHibernateDao.java
+++ b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/common/AbstractHibernateDao.java
@@ -1,4 +1,4 @@
-package com.baeldung.manytomany.dao.common;
+package com.baeldung.hibernate.manytomany.dao.common;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/common/IOperations.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/common/IOperations.java
similarity index 85%
rename from persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/common/IOperations.java
rename to persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/common/IOperations.java
index 8a85b52fc9..2be7fdb75e 100644
--- a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/common/IOperations.java
+++ b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/common/IOperations.java
@@ -1,4 +1,4 @@
-package com.baeldung.manytomany.dao.common;
+package com.baeldung.hibernate.manytomany.dao.common;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/impl/EmployeeDao.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/impl/EmployeeDao.java
similarity index 50%
rename from persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/impl/EmployeeDao.java
rename to persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/impl/EmployeeDao.java
index b24013c567..d4364c00c2 100644
--- a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/impl/EmployeeDao.java
+++ b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/impl/EmployeeDao.java
@@ -1,10 +1,10 @@
-package com.baeldung.manytomany.dao.impl;
+package com.baeldung.hibernate.manytomany.dao.impl;
 
 import org.springframework.stereotype.Repository;
 
-import com.baeldung.manytomany.dao.IEmployeeDao;
-import com.baeldung.manytomany.dao.common.AbstractHibernateDao;
-import com.baeldung.manytomany.model.Employee;
+import com.baeldung.hibernate.manytomany.dao.IEmployeeDao;
+import com.baeldung.hibernate.manytomany.dao.common.AbstractHibernateDao;
+import com.baeldung.hibernate.manytomany.model.Employee;
 
 @Repository
 public class EmployeeDao extends AbstractHibernateDao<Employee> implements IEmployeeDao {
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/impl/ProjectDao.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/impl/ProjectDao.java
new file mode 100644
index 0000000000..a221116013
--- /dev/null
+++ b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/dao/impl/ProjectDao.java
@@ -0,0 +1,17 @@
+package com.baeldung.hibernate.manytomany.dao.impl;
+
+import org.springframework.stereotype.Repository;
+
+import com.baeldung.hibernate.manytomany.dao.IProjectDao;
+import com.baeldung.hibernate.manytomany.dao.common.AbstractHibernateDao;
+import com.baeldung.hibernate.manytomany.model.Project;
+
+@Repository
+public class ProjectDao extends AbstractHibernateDao<Project> implements IProjectDao {
+
+    public ProjectDao() {
+        super();
+
+        setClazz(Project.class);
+    }
+}
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/model/Employee.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/model/Employee.java
similarity index 80%
rename from persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/model/Employee.java
rename to persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/model/Employee.java
index 39671c21bc..d606f1281c 100644
--- a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/model/Employee.java
+++ b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/model/Employee.java
@@ -1,19 +1,19 @@
-package com.baeldung.manytomany.model;
+package com.baeldung.hibernate.manytomany.model;
 
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "Employee")
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/model/Project.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/model/Project.java
similarity index 79%
rename from persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/model/Project.java
rename to persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/model/Project.java
index b5dc3cb856..8ea31dbc5f 100644
--- a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/model/Project.java
+++ b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/manytomany/model/Project.java
@@ -1,15 +1,15 @@
-package com.baeldung.manytomany.model;
+package com.baeldung.hibernate.manytomany.model;
 
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "Project")
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/uuids/Element.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/uuids/Element.java
new file mode 100644
index 0000000000..5112c6df0f
--- /dev/null
+++ b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/uuids/Element.java
@@ -0,0 +1,32 @@
+package com.baeldung.hibernate.uuids;
+
+import java.util.UUID;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import org.hibernate.annotations.UuidGenerator;
+
+@Entity
+public class Element {
+
+    @Id
+    @UuidGenerator
+    private String id;
+
+    private String name;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
\ No newline at end of file
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/uuids/Reservation.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/uuids/Reservation.java
new file mode 100644
index 0000000000..389376e785
--- /dev/null
+++ b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/uuids/Reservation.java
@@ -0,0 +1,43 @@
+package com.baeldung.hibernate.uuids;
+
+import java.util.UUID;
+import jakarta.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+
+@Entity
+public class Reservation {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.UUID)
+    private UUID id;
+
+    private String status;
+
+    private String number;
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+}
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/uuids/Sale.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/uuids/Sale.java
new file mode 100644
index 0000000000..8eaab80912
--- /dev/null
+++ b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/uuids/Sale.java
@@ -0,0 +1,36 @@
+package com.baeldung.hibernate.uuids;
+
+import jakarta.persistence.Id;
+import jakarta.persistence.Entity;
+import org.hibernate.annotations.UuidGenerator;
+
+import java.util.UUID;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import org.hibernate.annotations.UuidGenerator;
+
+@Entity
+public class Sale {
+
+    @Id
+    @UuidGenerator
+    private UUID id;
+
+    private boolean completed;
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public boolean isCompleted() {
+        return completed;
+    }
+
+    public void setCompleted(boolean completed) {
+        this.completed = completed;
+    }
+}
\ No newline at end of file
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/uuids/WebSiteUser.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/uuids/WebSiteUser.java
new file mode 100644
index 0000000000..b1a115a3b9
--- /dev/null
+++ b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/hibernate/uuids/WebSiteUser.java
@@ -0,0 +1,33 @@
+package com.baeldung.hibernate.uuids;
+
+import java.util.UUID;
+import java.time.LocalDate;
+import jakarta.persistence.Id;
+import jakarta.persistence.Entity;
+import org.hibernate.annotations.UuidGenerator;
+
+@Entity
+public class WebSiteUser {
+
+    @Id
+    @UuidGenerator(style = UuidGenerator.Style.TIME)
+    private UUID id;
+
+    private LocalDate registrationDate;
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public LocalDate getRegistrationDate() {
+        return registrationDate;
+    }
+
+    public void setRegistrationDate(LocalDate registrationDate) {
+        this.registrationDate = registrationDate;
+    }
+}
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/IEmployeeDao.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/IEmployeeDao.java
deleted file mode 100644
index 68bf5d5bad..0000000000
--- a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/IEmployeeDao.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.baeldung.manytomany.dao;
-
-import com.baeldung.manytomany.dao.common.IOperations;
-import com.baeldung.manytomany.model.Employee;
-
-public interface IEmployeeDao extends IOperations<Employee>{
-
-}
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/IProjectDao.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/IProjectDao.java
deleted file mode 100644
index d2645db44a..0000000000
--- a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/IProjectDao.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.baeldung.manytomany.dao;
-
-import com.baeldung.manytomany.dao.common.IOperations;
-import com.baeldung.manytomany.model.Project;
-
-public interface IProjectDao extends IOperations<Project>{
-
-}
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/impl/ProjectDao.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/impl/ProjectDao.java
deleted file mode 100644
index a70212f519..0000000000
--- a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/dao/impl/ProjectDao.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.baeldung.manytomany.dao.impl;
-
-import org.springframework.stereotype.Repository;
-
-import com.baeldung.manytomany.dao.IProjectDao;
-import com.baeldung.manytomany.dao.common.AbstractHibernateDao;
-import com.baeldung.manytomany.model.Project;
-
-
-@Repository
-public class ProjectDao extends AbstractHibernateDao<Project> implements IProjectDao {
-
-    public ProjectDao() {
-        super();
-
-        setClazz(Project.class);
-    }
-}
diff --git a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/util/HibernateUtil.java b/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/util/HibernateUtil.java
deleted file mode 100644
index d429564564..0000000000
--- a/persistence-modules/hibernate-mapping-2/src/main/java/com/baeldung/manytomany/util/HibernateUtil.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.baeldung.manytomany.util;
-
-import org.hibernate.SessionFactory;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.service.ServiceRegistry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.baeldung.manytomany.model.Employee;
-import com.baeldung.manytomany.model.Project;
-
-public class HibernateUtil {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(HibernateUtil.class);
-    private static SessionFactory sessionFactory;
-
-    private static SessionFactory buildSessionFactory() {
-        try {
-            // Create the SessionFactory from hibernate-annotation.cfg.xml
-            Configuration configuration = new Configuration();
-            configuration.addAnnotatedClass(Employee.class);
-            configuration.addAnnotatedClass(Project.class);
-            configuration.configure("manytomany.cfg.xml");
-            LOGGER.debug("Hibernate Annotation Configuration loaded");
-
-            ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties())
-                    .build();
-            LOGGER.debug("Hibernate Annotation serviceRegistry created");
-
-            SessionFactory sessionFactory = configuration.buildSessionFactory(serviceRegistry);
-
-            return sessionFactory;
-        } catch (Throwable ex) {
-            LOGGER.error("Initial SessionFactory creation failed.", ex);
-            throw new ExceptionInInitializerError(ex);
-        }
-    }
-
-    public static SessionFactory getSessionFactory() {
-        if (sessionFactory == null) {
-            sessionFactory = buildSessionFactory();
-        }
-        return sessionFactory;
-    }
-}
diff --git a/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/SpringContextTest.java b/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/SpringContextTest.java
index f1a6f675ce..e1650dccd2 100644
--- a/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/SpringContextTest.java
+++ b/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/SpringContextTest.java
@@ -6,7 +6,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
-import com.baeldung.manytomany.PersistenceConfig;
+import com.baeldung.hibernate.manytomany.PersistenceConfig;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
diff --git a/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/hibernate/booleanconverters/HibernateBooleanConverterIntegrationTest.java b/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/hibernate/booleanconverters/HibernateBooleanConverterIntegrationTest.java
new file mode 100644
index 0000000000..3235485e96
--- /dev/null
+++ b/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/hibernate/booleanconverters/HibernateBooleanConverterIntegrationTest.java
@@ -0,0 +1,158 @@
+package com.baeldung.hibernate.booleanconverters;
+
+import static java.lang.String.format;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.util.UUID;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import com.baeldung.hibernate.HibernateUtil;
+import com.baeldung.hibernate.booleanconverters.model.Question;
+
+public class HibernateBooleanConverterIntegrationTest {
+
+    private static final String PROPERTY_FILE_NAME = "booleanconverters.cfg.xml";
+
+    private static SessionFactory sessionFactory;
+    private static Session session;
+
+    @BeforeAll
+    static void createSessionFactory() {
+        sessionFactory = HibernateUtil.getSessionFactory(PROPERTY_FILE_NAME);
+    }
+
+    @BeforeEach
+    void openSessionAndBeginTransaction() {
+        session = sessionFactory.openSession();
+    }
+
+    @AfterAll
+    static void closeSessionFactory() {
+        sessionFactory.close();
+    }
+
+    @Test
+    void whenFieldAnnotatedWithYesNoConverter_ThenConversionWorks() {
+        session.beginTransaction();
+        UUID likeJavaQuestionId = UUID.randomUUID();
+        UUID sydneyCapitalOfAustraliaQuestionId = UUID.randomUUID();
+        session.persist(new QuestionBuilder().id(likeJavaQuestionId)
+          .content("Do you like Java?")
+          .correctAnswer(true)
+          .build());
+        session.persist(new QuestionBuilder().id(sydneyCapitalOfAustraliaQuestionId)
+          .content("Is Sydney the capital of Australia?")
+          .correctAnswer(false)
+          .build());
+        session.flush();
+
+        char likeJavaQuestionCorrectAnswerDbValue = session.createNativeQuery(format("SELECT correctAnswer FROM Question WHERE id='%s'", likeJavaQuestionId), Character.class)
+          .getSingleResult();
+        char sydneyCapitalOfAustraliaQuestionCorrectAnswerDbValue = session.createNativeQuery(format("SELECT correctAnswer FROM Question WHERE id='%s'", sydneyCapitalOfAustraliaQuestionId), Character.class)
+          .getSingleResult();
+        session.close();
+
+        assertEquals('Y', likeJavaQuestionCorrectAnswerDbValue);
+        assertEquals('N', sydneyCapitalOfAustraliaQuestionCorrectAnswerDbValue);
+    }
+
+    @Test
+    void whenFieldAnnotatedWithTrueFalseConverter_ThenConversionWorks() {
+        session.beginTransaction();
+        UUID codeTestedQuestionId = UUID.randomUUID();
+        UUID earningsQuestionId = UUID.randomUUID();
+        session.persist(new QuestionBuilder().id(codeTestedQuestionId)
+          .content("Is this code tested?")
+          .shouldBeAsked(true)
+          .build());
+        session.persist(new QuestionBuilder().id(earningsQuestionId)
+          .content("How much do you earn?")
+          .shouldBeAsked(false)
+          .build());
+        session.flush();
+
+        char codeTestedQuestionShouldBeAskedDbValue = session.createNativeQuery(format("SELECT shouldBeAsked FROM Question WHERE id='%s'", codeTestedQuestionId), Character.class)
+          .getSingleResult();
+        char earningsQuestionsShouldBeAskedDbValue = session.createNativeQuery(format("SELECT shouldBeAsked FROM Question WHERE id='%s'", earningsQuestionId), Character.class)
+          .getSingleResult();
+        session.close();
+
+        assertEquals('T', codeTestedQuestionShouldBeAskedDbValue);
+        assertEquals('F', earningsQuestionsShouldBeAskedDbValue);
+    }
+
+    @Test
+    void whenFieldAnnotatedWithNumericBooleanConverter_ThenConversionWorks() {
+        session.beginTransaction();
+        UUID earthFlatQuestionId = UUID.randomUUID();
+        UUID shouldLearnProgrammingQuestionId = UUID.randomUUID();
+        session.persist(new QuestionBuilder().id(earthFlatQuestionId)
+          .content("Is the Earth flat?")
+          .isEasy(true)
+          .build());
+        session.persist(new QuestionBuilder().id(shouldLearnProgrammingQuestionId)
+          .content("Should one learn programming")
+          .isEasy(false)
+          .build());
+        session.flush();
+
+        int earthFlatQuestionIsEasyDbValue = session.createNativeQuery(format("SELECT isEasy FROM Question WHERE id='%s'", earthFlatQuestionId), Integer.class)
+          .getSingleResult();
+        int shouldLearnProgrammingQuestionIsEasyDbValue = session.createNativeQuery(format("SELECT isEasy FROM Question WHERE id='%s'", shouldLearnProgrammingQuestionId), Integer.class)
+          .getSingleResult();
+        session.close();
+
+        assertEquals(1, earthFlatQuestionIsEasyDbValue);
+        assertEquals(0, shouldLearnProgrammingQuestionIsEasyDbValue);
+    }
+
+    @Test
+    void givenFieldAnnotatedWithYesNoConverter_WhenDbValueIsLowercase_ThenDomainModelValueNull() {
+        session.beginTransaction();
+        UUID mappedToNullQuestionId = UUID.randomUUID();
+        UUID behaviorIntuitiveQuestionId = UUID.randomUUID();
+        session.createNativeMutationQuery(format("INSERT INTO Question (id, content, correctAnswer) VALUES ('%s', 'Will correctAnswer be mapped to null?', 'y')", mappedToNullQuestionId))
+          .executeUpdate();
+        session.createNativeMutationQuery(format("INSERT INTO Question (id, content, correctAnswer) VALUES ('%s', 'Is this behavior intuitive?', 'n')", behaviorIntuitiveQuestionId))
+          .executeUpdate();
+
+        Question behaviorIntuitiveQuestion = session.get(Question.class, behaviorIntuitiveQuestionId);
+        Question mappedToNullQuestion = session.get(Question.class, mappedToNullQuestionId);
+        session.close();
+
+        assertNull(behaviorIntuitiveQuestion.getCorrectAnswer());
+        assertNull(mappedToNullQuestion.getCorrectAnswer());
+    }
+
+    @Test
+    void givenConverterRegisteredToAutoApply_whenFieldIsNotAnnotated_ThenConversionWorks() {
+        session.beginTransaction();
+        UUID likeJavaQuestionId = UUID.randomUUID();
+        UUID likeKotlinQuestionId = UUID.randomUUID();
+        session.persist(new QuestionBuilder().id(likeJavaQuestionId)
+          .content("Do you like Java?")
+          .wasAskedBefore(true)
+          .build());
+        session.persist(new QuestionBuilder().id(likeKotlinQuestionId)
+          .content("Do you like Kotlin?")
+          .wasAskedBefore(false)
+          .build());
+        session.flush();
+
+        char likeJavaQuestionWasAskedBeforeDbValue = session.createNativeQuery(format("SELECT wasAskedBefore FROM Question WHERE id='%s'", likeJavaQuestionId), Character.class)
+          .getSingleResult();
+        char likeKotlinQuestionWasAskedBeforeDbValue = session.createNativeQuery(format("SELECT wasAskedBefore FROM Question WHERE id='%s'", likeKotlinQuestionId), Character.class)
+          .getSingleResult();
+        session.close();
+
+        assertEquals('Y', likeJavaQuestionWasAskedBeforeDbValue);
+        assertEquals('N', likeKotlinQuestionWasAskedBeforeDbValue);
+    }
+}
diff --git a/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/hibernate/booleanconverters/QuestionBuilder.java b/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/hibernate/booleanconverters/QuestionBuilder.java
new file mode 100644
index 0000000000..26fe38c3c8
--- /dev/null
+++ b/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/hibernate/booleanconverters/QuestionBuilder.java
@@ -0,0 +1,48 @@
+package com.baeldung.hibernate.booleanconverters;
+
+import java.util.UUID;
+
+import com.baeldung.hibernate.booleanconverters.model.Question;
+
+public class QuestionBuilder {
+    private UUID id;
+    private String content;
+    private Boolean correctAnswer;
+    private Boolean shouldBeAsked;
+    private Boolean isEasy;
+    private Boolean wasAskedBefore;
+
+    public QuestionBuilder id(UUID id) {
+        this.id = id;
+        return this;
+    }
+
+    public QuestionBuilder content(String content) {
+        this.content = content;
+        return this;
+    }
+
+    public QuestionBuilder correctAnswer(Boolean correctAnswer) {
+        this.correctAnswer = correctAnswer;
+        return this;
+    }
+
+    public QuestionBuilder shouldBeAsked(Boolean shouldBeAsked) {
+        this.shouldBeAsked = shouldBeAsked;
+        return this;
+    }
+
+    public QuestionBuilder isEasy(Boolean isEasy) {
+        this.isEasy = isEasy;
+        return this;
+    }
+
+    public QuestionBuilder wasAskedBefore(Boolean wasAskedBefore) {
+        this.wasAskedBefore = wasAskedBefore;
+        return this;
+    }
+
+    public Question build() {
+        return new Question(id, content, correctAnswer, shouldBeAsked, isEasy, wasAskedBefore);
+    }
+}
\ No newline at end of file
diff --git a/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/hibernate/manytomany/HibernateManyToManyAnnotationJavaConfigMainIntegrationTest.java b/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/hibernate/manytomany/HibernateManyToManyAnnotationJavaConfigMainIntegrationTest.java
index 69b791b4d4..e4fcafcb56 100644
--- a/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/hibernate/manytomany/HibernateManyToManyAnnotationJavaConfigMainIntegrationTest.java
+++ b/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/hibernate/manytomany/HibernateManyToManyAnnotationJavaConfigMainIntegrationTest.java
@@ -13,9 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
-import com.baeldung.manytomany.PersistenceConfig;
-import com.baeldung.manytomany.model.Employee;
-import com.baeldung.manytomany.model.Project;
+
+import com.baeldung.hibernate.manytomany.model.Employee;
+import com.baeldung.hibernate.manytomany.model.Project;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
diff --git a/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/hibernate/manytomany/HibernateManyToManyAnnotationMainIntegrationTest.java b/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/hibernate/manytomany/HibernateManyToManyAnnotationMainIntegrationTest.java
index 5255cb040f..7c6861e63b 100644
--- a/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/hibernate/manytomany/HibernateManyToManyAnnotationMainIntegrationTest.java
+++ b/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/hibernate/manytomany/HibernateManyToManyAnnotationMainIntegrationTest.java
@@ -15,9 +15,9 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.baeldung.manytomany.model.Employee;
-import com.baeldung.manytomany.model.Project;
-import com.baeldung.manytomany.util.HibernateUtil;
+import com.baeldung.hibernate.manytomany.model.Employee;
+import com.baeldung.hibernate.manytomany.model.Project;
+import com.baeldung.hibernate.HibernateUtil;
 
 /**
  * Configured in: manytomany.cfg.xml
diff --git a/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/hibernate/uuids/UUIDsHibernateGenerationIntegrationTest.java b/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/hibernate/uuids/UUIDsHibernateGenerationIntegrationTest.java
new file mode 100644
index 0000000000..f36a4333c3
--- /dev/null
+++ b/persistence-modules/hibernate-mapping-2/src/test/java/com/baeldung/hibernate/uuids/UUIDsHibernateGenerationIntegrationTest.java
@@ -0,0 +1,72 @@
+package com.baeldung.hibernate.uuids;
+
+import com.baeldung.hibernate.HibernateUtil;
+
+import org.assertj.core.api.Assertions;
+import java.io.IOException;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.Session;
+import org.junit.Before;
+import org.junit.Test;
+import java.util.UUID;
+import java.time.LocalDate;
+
+public class UUIDsHibernateGenerationIntegrationTest {
+
+    private SessionFactory sessionFactory;
+
+    private Session session;
+
+    @Before
+    public void setUp() throws IOException {
+        sessionFactory = HibernateUtil.getSessionFactory();
+        session = sessionFactory.openSession();
+    }
+
+    @Test
+    public void whenGeneratingUUIDUsingNewJPAGenerationType_thenHibernateGeneratedUUID() throws IOException {
+        Reservation reservation = new Reservation();
+        reservation.setStatus("created");
+        reservation.setNumber("12345");
+        UUID saved = (UUID) session.save(reservation);
+        Assertions.assertThat(saved).isNotNull();
+    }
+
+    @Test
+    public void whenGeneratingUUIDUsingNewJPAGenerationType_thenHibernateGeneratedUUIDOfVersion4() throws IOException {
+        Reservation reservation = new Reservation();
+        reservation.setStatus("new");
+        reservation.setNumber("012");
+        UUID saved = (UUID) session.save(reservation);
+        Assertions.assertThat(saved).isNotNull();
+        Assertions.assertThat(saved.version()).isEqualTo(4);
+    }
+
+    @Test
+    public void whenGeneratingUUIDUsingGenericConverter_thenAlsoGetUUIDGeneratedVersion4() throws IOException {
+        Sale sale = new Sale();
+        sale.setCompleted(true);
+        UUID saved = (UUID) session.save(sale);
+        Assertions.assertThat(saved).isNotNull();
+        Assertions.assertThat(saved.version()).isEqualTo(4);
+    }
+
+    @Test
+    public void whenGeneratingTimeBasedUUID_thenUUIDGeneratedVersion1() throws IOException {
+        WebSiteUser user = new WebSiteUser();
+        user.setRegistrationDate(LocalDate.now());
+        UUID saved = (UUID) session.save(user);
+        Assertions.assertThat(saved).isNotNull();
+        Assertions.assertThat(saved.version()).isEqualTo(1);
+    }
+
+    @Test
+    public void whenGeneratingUUIDAsString_thenUUIDGeneratedVersion1() throws IOException {
+        Element element = new Element();
+        element.setName("a");
+        String saved = (String) session.save(element);
+        Assertions.assertThat(saved).isNotEmpty();
+        Assertions.assertThat(UUID.fromString(saved).version()).isEqualTo(4);
+    }
+}
\ No newline at end of file
diff --git a/persistence-modules/hibernate-mapping-2/src/test/resources/booleanconverters.cfg.xml b/persistence-modules/hibernate-mapping-2/src/test/resources/booleanconverters.cfg.xml
new file mode 100644
index 0000000000..6ca479b052
--- /dev/null
+++ b/persistence-modules/hibernate-mapping-2/src/test/resources/booleanconverters.cfg.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-configuration PUBLIC
+        "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+        "http://hibernate.org/dtd/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+    <session-factory>
+        <property name="hibernate.connection.driver_class">org.h2.Driver</property>
+        <property name="hibernate.connection.password"></property>
+        <property name="hibernate.connection.url">jdbc:h2:mem:booleanconvertersdb;DB_CLOSE_DELAY=-1;INIT=RUNSCRIPT FROM 'src/test/resources/booleanconverters/init_database.sql'</property>
+        <property name="hibernate.connection.username">sa</property>
+        <property name="hibernate.dialect">org.hibernate.dialect.H2Dialect</property>
+        <property name="hibernate.current_session_context_class">thread</property>
+        <property name="hibernate.show_sql">false</property>
+        <property name="hibernate.hbm2ddl.auto">none</property>
+    </session-factory>
+</hibernate-configuration>
\ No newline at end of file
diff --git a/persistence-modules/hibernate-mapping-2/src/test/resources/booleanconverters/init_database.sql b/persistence-modules/hibernate-mapping-2/src/test/resources/booleanconverters/init_database.sql
new file mode 100644
index 0000000000..cb0f4f329c
--- /dev/null
+++ b/persistence-modules/hibernate-mapping-2/src/test/resources/booleanconverters/init_database.sql
@@ -0,0 +1,9 @@
+CREATE TABLE Question (
+    id UUID,
+    content VARCHAR,
+    correctAnswer CHAR,
+    shouldBeAsked CHAR,
+    isEasy TINYINT,
+    wasAskedBefore CHAR,
+    PRIMARY KEY (id)
+)
diff --git a/persistence-modules/hibernate-mapping/pom.xml b/persistence-modules/hibernate-mapping/pom.xml
index 506283a4fb..1e3dc8be5f 100644
--- a/persistence-modules/hibernate-mapping/pom.xml
+++ b/persistence-modules/hibernate-mapping/pom.xml
@@ -26,7 +26,7 @@
         </dependency>
         <dependency>
             <groupId>com.vladmihalcea</groupId>
-            <artifactId>hibernate-types-52</artifactId>
+            <artifactId>hibernate-types-60</artifactId>
             <version>${hibernate-types.version}</version>
         </dependency>
         <dependency>
@@ -41,9 +41,9 @@
             <version>${hibernate-validator.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.el</artifactId>
-            <version>${org.glassfish.javax.el.version}</version>
+            <groupId>org.glassfish.expressly</groupId>
+            <artifactId>expressly</artifactId>
+            <version>5.0.0</version>
         </dependency>
         <dependency>
             <groupId>javax.money</groupId>
@@ -66,16 +66,27 @@
             <artifactId>commons-io</artifactId>
             <version>${commons-io.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
+            <version>${jackson-module-jakarta-xmlbind-annotation}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.nashorn</groupId>
+            <artifactId>nashorn-core</artifactId>
+            <version>15.4</version>
+        </dependency>
     </dependencies>
 
     <properties>
-        <h2.version>1.4.197</h2.version> <!-- needs to be specified as it fails with parent's 1.4.200 -->
-        <hibernate.version>5.4.12.Final</hibernate.version>
-        <hibernate-types.version>2.10.4</hibernate-types.version>
-        <hibernate-validator.version>6.0.16.Final</hibernate-validator.version>
+        <h2.version>2.1.214</h2.version> <!-- needs to be specified as it fails with parent's 1.4.200 -->
+        <hibernate.version>6.1.7.Final</hibernate.version>
+        <hibernate-types.version>2.21.1</hibernate-types.version>
+        <hibernate-validator.version>8.0.0.Final</hibernate-validator.version>
         <org.glassfish.javax.el.version>3.0.1-b11</org.glassfish.javax.el.version>
-        <money-api.version>1.0.3</money-api.version>
-        <moneta.version>1.3</moneta.version>
+        <money-api.version>1.1</money-api.version>
+        <moneta.version>1.4.2</moneta.version>
+        <jackson-module-jakarta-xmlbind-annotation>2.14.2</jackson-module-jakarta-xmlbind-annotation>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/HibernateUtil.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/HibernateUtil.java
index fbd8bd487b..cbd73832a4 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/HibernateUtil.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/HibernateUtil.java
@@ -21,6 +21,7 @@ import com.baeldung.hibernate.pojo.inheritance.Animal;
 import com.baeldung.hibernate.pojo.inheritance.Bag;
 import com.baeldung.hibernate.pojo.inheritance.Book;
 import com.baeldung.hibernate.pojo.inheritance.Car;
+import com.baeldung.hibernate.pojo.inheritance.Laptop;
 import com.baeldung.hibernate.pojo.inheritance.MyEmployee;
 import com.baeldung.hibernate.pojo.inheritance.MyProduct;
 import com.baeldung.hibernate.pojo.inheritance.Pen;
@@ -79,6 +80,7 @@ public class HibernateUtil {
         metadataSources.addAnnotatedClass(com.baeldung.hibernate.entities.Department.class);
         metadataSources.addAnnotatedClass(Animal.class);
         metadataSources.addAnnotatedClass(Bag.class);
+        metadataSources.addAnnotatedClass(Laptop.class);
         metadataSources.addAnnotatedClass(Book.class);
         metadataSources.addAnnotatedClass(Car.class);
         metadataSources.addAnnotatedClass(MyEmployee.class);
@@ -86,7 +88,6 @@ public class HibernateUtil {
         metadataSources.addAnnotatedClass(Pen.class);
         metadataSources.addAnnotatedClass(Pet.class);
         metadataSources.addAnnotatedClass(Vehicle.class);
-        
 
         Metadata metadata = metadataSources.getMetadataBuilder()
             .build();
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/arraymapping/CustomIntegerArrayType.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/arraymapping/CustomIntegerArrayType.java
index 233bb95dc1..5d3e22bf05 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/arraymapping/CustomIntegerArrayType.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/arraymapping/CustomIntegerArrayType.java
@@ -8,58 +8,56 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Arrays;
 
-import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.usertype.UserType;
 
-public class CustomIntegerArrayType implements UserType {
+public class CustomIntegerArrayType implements UserType<Integer[]> {
 
     @Override
-    public int[] sqlTypes() {
-        return new int[]{Types.ARRAY};
+    public int getSqlType() {
+        return Types.ARRAY;
     }
 
     @Override
-    public Class returnedClass() {
+    public Class<Integer[]> returnedClass() {
         return Integer[].class;
     }
 
     @Override
-    public boolean equals(Object x, Object y) throws HibernateException {
+    public boolean equals(Integer[] x, Integer[] y) {
         if (x instanceof Integer[] && y instanceof Integer[]) {
-            return Arrays.deepEquals((Integer[])x, (Integer[])y);
+            return Arrays.deepEquals(x, y);
         } else {
             return false;
         }
     }
 
     @Override
-    public int hashCode(Object x) throws HibernateException {
-        return Arrays.hashCode((Integer[])x);
+    public int hashCode(Integer[] x) {
+        return Arrays.hashCode(x);
     }
 
     @Override
-    public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner)
-      throws HibernateException, SQLException {
-        Array array = rs.getArray(names[0]);
-        return array != null ? array.getArray() : null;
+    public Integer[] nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session, Object owner) throws SQLException {
+        Array array = rs.getArray(position);
+        return array != null ? (Integer[]) array.getArray() : null;
     }
 
     @Override
-    public void nullSafeSet(PreparedStatement st, Object value, int index, SharedSessionContractImplementor session)
-      throws HibernateException, SQLException {
-        if (value != null && st != null) {
-            Array array = session.connection().createArrayOf("int", (Integer[])value);
-            st.setArray(index, array);
-        } else {
-            st.setNull(index, sqlTypes()[0]);
+    public void nullSafeSet(PreparedStatement st, Integer[] value, int index, SharedSessionContractImplementor session) throws SQLException {
+        if (st != null) {
+            if (value != null) {
+                Array array = session.getJdbcConnectionAccess().obtainConnection().createArrayOf("int", value);
+                st.setArray(index, array);
+            } else {
+                st.setNull(index, Types.ARRAY);
+            }
         }
     }
 
     @Override
-    public Object deepCopy(Object value) throws HibernateException {
-        Integer[] a = (Integer[])value;
-        return Arrays.copyOf(a, a.length);
+    public Integer[] deepCopy(Integer[] value) {
+        return value != null ? Arrays.copyOf(value, value.length) : null;
     }
 
     @Override
@@ -68,18 +66,18 @@ public class CustomIntegerArrayType implements UserType {
     }
 
     @Override
-    public Serializable disassemble(Object value) throws HibernateException {
-        return (Serializable) value;
+    public Serializable disassemble(Integer[] value) {
+        return value;
     }
 
     @Override
-    public Object assemble(Serializable cached, Object owner) throws HibernateException {
-        return cached;
+    public Integer[] assemble(Serializable cached, Object owner) {
+        return (Integer[]) cached;
     }
 
     @Override
-    public Object replace(Object original, Object target, Object owner) throws HibernateException {
-        return original;
+    public Integer[] replace(Integer[] detached, Integer[] managed, Object owner) {
+        return detached;
     }
 
 }
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/arraymapping/CustomStringArrayType.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/arraymapping/CustomStringArrayType.java
index 7bd284def7..31a082fb05 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/arraymapping/CustomStringArrayType.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/arraymapping/CustomStringArrayType.java
@@ -8,58 +8,56 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Arrays;
 
-import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.usertype.UserType;
 
-public class CustomStringArrayType implements UserType {
+public class CustomStringArrayType implements UserType<String[]> {
 
     @Override
-    public int[] sqlTypes() {
-        return new int[]{Types.ARRAY};
+    public int getSqlType() {
+        return Types.ARRAY;
     }
 
     @Override
-    public Class returnedClass() {
+    public Class<String[]> returnedClass() {
         return String[].class;
     }
 
     @Override
-    public boolean equals(Object x, Object y) throws HibernateException {
+    public boolean equals(String[] x, String[] y) {
         if (x instanceof String[] && y instanceof String[]) {
-            return Arrays.deepEquals((String[])x, (String[])y);
+            return Arrays.deepEquals(x, y);
         } else {
             return false;
         }
     }
 
     @Override
-    public int hashCode(Object x) throws HibernateException {
-        return Arrays.hashCode((String[])x);
+    public int hashCode(String[] x) {
+        return Arrays.hashCode(x);
     }
 
     @Override
-    public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner)
-      throws HibernateException, SQLException {
-        Array array = rs.getArray(names[0]);
-        return array != null ? array.getArray() : null;
+    public String[] nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session, Object owner) throws SQLException {
+        Array array = rs.getArray(position);
+        return array != null ? (String[]) array.getArray() : null;
     }
 
     @Override
-    public void nullSafeSet(PreparedStatement st, Object value, int index, SharedSessionContractImplementor session)
-      throws HibernateException, SQLException {
-        if (value != null && st != null) {
-            Array array = session.connection().createArrayOf("text", (String[])value);
-            st.setArray(index, array);
-        } else {
-            st.setNull(index, sqlTypes()[0]);
+    public void nullSafeSet(PreparedStatement st, String[] value, int index, SharedSessionContractImplementor session) throws SQLException {
+        if (st != null) {
+            if (value != null) {
+                Array array = session.getJdbcConnectionAccess().obtainConnection().createArrayOf("text", value);
+                st.setArray(index, array);
+            } else {
+                st.setNull(index, Types.ARRAY);
+            }
         }
     }
 
     @Override
-    public Object deepCopy(Object value) throws HibernateException {
-        String[] a = (String[])value;
-        return Arrays.copyOf(a, a.length);
+    public String[] deepCopy(String[] value) {
+        return value != null ? Arrays.copyOf(value, value.length) : null;
     }
 
     @Override
@@ -68,18 +66,18 @@ public class CustomStringArrayType implements UserType {
     }
 
     @Override
-    public Serializable disassemble(Object value) throws HibernateException {
-        return (Serializable) value;
+    public Serializable disassemble(String[] value) {
+        return value;
     }
 
     @Override
-    public Object assemble(Serializable cached, Object owner) throws HibernateException {
-        return cached;
+    public String[] assemble(Serializable cached, Object owner) {
+        return (String[]) cached;
     }
 
     @Override
-    public Object replace(Object original, Object target, Object owner) throws HibernateException {
-        return original;
+    public String[] replace(String[] detached, String[] managed, Object owner) {
+        return detached;
     }
 
 }
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/arraymapping/User.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/arraymapping/User.java
index 018bedc349..81f2ee89f7 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/arraymapping/User.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/arraymapping/User.java
@@ -1,21 +1,13 @@
 package com.baeldung.hibernate.arraymapping;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 import org.hibernate.annotations.Type;
 
 import com.vladmihalcea.hibernate.type.array.StringArrayType;
 
-import org.hibernate.annotations.*;
-
-@TypeDefs({
-    @TypeDef(
-        name = "string-array",
-        typeClass = StringArrayType.class
-        )
-})
 @Entity
 public class User {
 
@@ -25,14 +17,14 @@ public class User {
     private String name;
 
     @Column(columnDefinition = "text[]")
-    @Type(type = "com.baeldung.hibernate.arraymapping.CustomStringArrayType")
+    @Type(value = com.baeldung.hibernate.arraymapping.CustomStringArrayType.class)
     private String[] roles;
 
     @Column(columnDefinition = "int[]")
-    @Type(type = "com.baeldung.hibernate.arraymapping.CustomIntegerArrayType")
+    @Type(value = com.baeldung.hibernate.arraymapping.CustomIntegerArrayType.class)
     private Integer[] locations;
 
-    @Type(type = "string-array")
+    @Type(StringArrayType.class)
     @Column(
         name = "phone_numbers",
         columnDefinition = "text[]"
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/basicannotation/Course.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/basicannotation/Course.java
index e816fb0176..ca77888f9b 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/basicannotation/Course.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/basicannotation/Course.java
@@ -1,10 +1,9 @@
 package com.baeldung.hibernate.basicannotation;
 
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
 
 @Entity
 public class Course {
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/entities/Department.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/entities/Department.java
index ff94f4f849..39e69a2b1c 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/entities/Department.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/entities/Department.java
@@ -2,7 +2,7 @@ package com.baeldung.hibernate.entities;
 
 import java.util.List;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 public class Department {
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java
index 6510e70650..3c4f542ce7 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java
@@ -1,13 +1,13 @@
 package com.baeldung.hibernate.entities;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 @org.hibernate.annotations.NamedQueries({ @org.hibernate.annotations.NamedQuery(name = "DeptEmployee_FindByEmployeeNumber", query = "from DeptEmployee where employeeNumber = :employeeNo"),
-        @org.hibernate.annotations.NamedQuery(name = "DeptEmployee_FindAllByDesgination", query = "from DeptEmployee where designation = :designation"),
+        @org.hibernate.annotations.NamedQuery(name = "DeptEmployee_FindAllByDesgination", query = "from DeptEmployee where employeeNumber = :designation"),
         @org.hibernate.annotations.NamedQuery(name = "DeptEmployee_UpdateEmployeeDepartment", query = "Update DeptEmployee set department = :newDepartment where employeeNumber = :employeeNo"),
         @org.hibernate.annotations.NamedQuery(name = "DeptEmployee_FindAllByDepartment", query = "from DeptEmployee where department = :department", timeout = 1, fetchSize = 10) })
 @org.hibernate.annotations.NamedNativeQueries({ @org.hibernate.annotations.NamedNativeQuery(name = "DeptEmployee_FindByEmployeeName", query = "select * from deptemployee emp where name=:name", resultClass = DeptEmployee.class),
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/fetchMode/Customer.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/fetchMode/Customer.java
index 5589601da8..b8937c6692 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/fetchMode/Customer.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/fetchMode/Customer.java
@@ -3,10 +3,10 @@ package com.baeldung.hibernate.fetchMode;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/fetchMode/Order.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/fetchMode/Order.java
index aa9c517321..5be65bac0d 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/fetchMode/Order.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/fetchMode/Order.java
@@ -1,6 +1,6 @@
 package com.baeldung.hibernate.fetchMode;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 public class Order {
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/lob/model/User.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/lob/model/User.java
index 21f725b388..3c3b748990 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/lob/model/User.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/lob/model/User.java
@@ -1,13 +1,13 @@
 package com.baeldung.hibernate.lob.model;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Lob;
+import jakarta.persistence.Table;
 
 @Entity 
-@Table(name="user")
+@Table(name="users")
 public class User {
 
     @Id
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkey/Item.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkey/Item.java
index 385ffe93ea..ff8115f5d9 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkey/Item.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkey/Item.java
@@ -2,15 +2,15 @@ package com.baeldung.hibernate.persistmaps.mapkey;
 
 import com.baeldung.hibernate.persistmaps.ItemType;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import java.util.Date;
 import java.util.Objects;
 
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkey/Order.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkey/Order.java
index 8409cacd6b..e42ceda5de 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkey/Order.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkey/Order.java
@@ -1,15 +1,15 @@
 package com.baeldung.hibernate.persistmaps.mapkey;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.MapKey;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.MapKey;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import java.util.Map;
 
 @Entity
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkey/User.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkey/User.java
index b2ee7e85fe..0a9694f43c 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkey/User.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkey/User.java
@@ -1,16 +1,15 @@
 package com.baeldung.hibernate.persistmaps.mapkey;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.validation.constraints.Size;
-import javax.money.MonetaryAmount;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.Size;
 
 import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.constraints.CreditCardNumber;
-import org.hibernate.validator.constraints.Currency;
 
 @Entity
+@Table(name="users2")
 public class User {
     @Id
     @Column(length = 3)
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeycolumn/Order.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeycolumn/Order.java
index fa092060da..3d24c743d7 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeycolumn/Order.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeycolumn/Order.java
@@ -1,14 +1,14 @@
 package com.baeldung.hibernate.persistmaps.mapkeycolumn;
 
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.Table;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.Table;
 import java.util.Map;
 
 @Entity
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeyenumerated/Order.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeyenumerated/Order.java
index e1f62599b8..19622ea01d 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeyenumerated/Order.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeyenumerated/Order.java
@@ -3,17 +3,17 @@ package com.baeldung.hibernate.persistmaps.mapkeyenumerated;
 import com.baeldung.hibernate.persistmaps.ItemType;
 import com.baeldung.hibernate.persistmaps.mapkey.Item;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.MapKeyEnumerated;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.MapKeyEnumerated;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import java.util.Map;
 
 @Entity
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeyjoincolumn/Item.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeyjoincolumn/Item.java
index 97bbd5b539..9ed58305da 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeyjoincolumn/Item.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeyjoincolumn/Item.java
@@ -2,18 +2,18 @@ package com.baeldung.hibernate.persistmaps.mapkeyjoincolumn;
 
 import com.baeldung.hibernate.persistmaps.ItemType;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import java.util.Date;
 import java.util.Objects;
 
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeyjoincolumn/Order.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeyjoincolumn/Order.java
index d680d84501..9d20237860 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeyjoincolumn/Order.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeyjoincolumn/Order.java
@@ -1,15 +1,15 @@
 package com.baeldung.hibernate.persistmaps.mapkeyjoincolumn;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.MapKeyJoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.MapKeyJoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import java.util.Map;
 
 @Entity
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeyjoincolumn/Seller.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeyjoincolumn/Seller.java
index 15b08e9fe6..ca06db241e 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeyjoincolumn/Seller.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeyjoincolumn/Seller.java
@@ -1,10 +1,10 @@
 package com.baeldung.hibernate.persistmaps.mapkeyjoincolumn;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.util.Objects;
 
 @Entity
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeytemporal/Order.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeytemporal/Order.java
index be602c1e9f..920d693d16 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeytemporal/Order.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/persistmaps/mapkeytemporal/Order.java
@@ -2,17 +2,17 @@ package com.baeldung.hibernate.persistmaps.mapkeytemporal;
 
 import com.baeldung.hibernate.persistmaps.mapkey.Item;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.MapKeyTemporal;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.TemporalType;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.MapKeyTemporal;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.TemporalType;
 import java.util.Date;
 import java.util.Map;
 
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/Employee.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/Employee.java
index e9732b2b67..7d8a254eec 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/Employee.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/Employee.java
@@ -2,15 +2,15 @@ package com.baeldung.hibernate.pojo;
 
 import org.hibernate.annotations.*;
 
-import javax.persistence.Entity;
-import javax.persistence.*;
+import jakarta.persistence.Entity;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
 @Entity
 @Where(clause = "deleted = false")
-@FilterDef(name = "incomeLevelFilter", parameters = @ParamDef(name = "incomeLimit", type = "int"))
+@FilterDef(name = "incomeLevelFilter", parameters = @ParamDef(name = "incomeLimit", type = Integer.class))
 @Filter(name = "incomeLevelFilter", condition = "grossIncome > :incomeLimit")
 public class Employee implements Serializable {
 
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/EntityDescription.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/EntityDescription.java
index 131bb73a80..29befd80f2 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/EntityDescription.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/EntityDescription.java
@@ -1,8 +1,11 @@
 package com.baeldung.hibernate.pojo;
 
 import org.hibernate.annotations.Any;
+import org.hibernate.annotations.AnyDiscriminator;
+import org.hibernate.annotations.AnyDiscriminatorValue;
+import org.hibernate.annotations.AnyKeyJavaClass;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 
 @Entity
@@ -14,10 +17,12 @@ public class EntityDescription implements Serializable {
 
     private String description;
 
-    @Any(
-            metaDef = "EntityDescriptionMetaDef",
-            metaColumn = @Column(name = "entity_type")
-    )
+    @Any
+    @AnyDiscriminator(DiscriminatorType.STRING)
+    @AnyDiscriminatorValue(discriminator = "S", entity = Employee.class)
+    @AnyDiscriminatorValue(discriminator = "I", entity = Phone.class)
+    @AnyKeyJavaClass(Integer.class)
+    @Column(name = "entity_type")
     @JoinColumn(name = "entity_id")
     private Serializable entity;
 
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/Phone.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/Phone.java
index d923bda5de..e173aa8b47 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/Phone.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/Phone.java
@@ -1,9 +1,9 @@
 package com.baeldung.hibernate.pojo;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import java.io.Serializable;
 
 @Entity
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/TemporalValues.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/TemporalValues.java
index f3fe095cae..0c022884eb 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/TemporalValues.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/TemporalValues.java
@@ -1,7 +1,6 @@
 package com.baeldung.hibernate.pojo;
 
-import javax.persistence.*;
-import java.io.Serializable;
+import jakarta.persistence.*;
 import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
@@ -9,7 +8,7 @@ import java.time.*;
 import java.util.Calendar;
 
 @Entity
-public class TemporalValues implements Serializable {
+public class TemporalValues {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -48,7 +47,7 @@ public class TemporalValues implements Serializable {
     private java.time.LocalDate localDate;
 
     @Basic
-    private java.time.LocalTime localTime;
+    private java.time.LocalTime localTimeField;
 
     @Basic
     private java.time.OffsetTime offsetTime;
@@ -146,11 +145,11 @@ public class TemporalValues implements Serializable {
     }
 
     public LocalTime getLocalTime() {
-        return localTime;
+        return localTimeField;
     }
 
     public void setLocalTime(LocalTime localTime) {
-        this.localTime = localTime;
+        this.localTimeField = localTime;
     }
 
     public OffsetTime getOffsetTime() {
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Animal.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Animal.java
index 6fe7f915fc..c44a542b60 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Animal.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Animal.java
@@ -1,9 +1,9 @@
 package com.baeldung.hibernate.pojo.inheritance;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
 
 @Entity
 @Inheritance(strategy = InheritanceType.JOINED)
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Bag.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Bag.java
index fa6e1b4bef..707e387866 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Bag.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Bag.java
@@ -1,7 +1,7 @@
 package com.baeldung.hibernate.pojo.inheritance;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 import org.hibernate.annotations.Polymorphism;
 import org.hibernate.annotations.PolymorphismType;
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Book.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Book.java
index 36ca8dd77c..286a30cc14 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Book.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Book.java
@@ -1,7 +1,7 @@
 package com.baeldung.hibernate.pojo.inheritance;
 
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 
 @Entity
 @DiscriminatorValue("1")
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Car.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Car.java
index 49d1f7749a..987e299625 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Car.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Car.java
@@ -1,6 +1,6 @@
 package com.baeldung.hibernate.pojo.inheritance;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 
 @Entity
 public class Car extends Vehicle {
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Laptop.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Laptop.java
new file mode 100644
index 0000000000..cced365d78
--- /dev/null
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Laptop.java
@@ -0,0 +1,39 @@
+package com.baeldung.hibernate.pojo.inheritance;
+
+import org.hibernate.annotations.Polymorphism;
+import org.hibernate.annotations.PolymorphismType;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
+@Entity
+@Polymorphism(type = PolymorphismType.IMPLICIT)
+public class Laptop implements Item {
+    
+    @Id
+    private Long id;
+
+    private String type;
+
+    public Laptop(Long id, String type) {
+        this.id = id;
+        this.type = type;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+    
+}
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/MyEmployee.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/MyEmployee.java
index 9a6bce16cf..96958c6e28 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/MyEmployee.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/MyEmployee.java
@@ -1,6 +1,6 @@
 package com.baeldung.hibernate.pojo.inheritance;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 
 @Entity
 public class MyEmployee extends Person {
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/MyProduct.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/MyProduct.java
index 13f04d8904..62214fc16e 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/MyProduct.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/MyProduct.java
@@ -1,13 +1,11 @@
 package com.baeldung.hibernate.pojo.inheritance;
 
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.DiscriminatorType;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-
-import org.hibernate.annotations.DiscriminatorFormula;
+import jakarta.persistence.DiscriminatorColumn;
+import jakarta.persistence.DiscriminatorType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
 
 @Entity
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Pen.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Pen.java
index 32b77e52af..2382cab405 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Pen.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Pen.java
@@ -1,7 +1,7 @@
 package com.baeldung.hibernate.pojo.inheritance;
 
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 
 @Entity
 @DiscriminatorValue("2")
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Person.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Person.java
index 99084b88af..9bf8ac254c 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Person.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Person.java
@@ -1,7 +1,7 @@
 package com.baeldung.hibernate.pojo.inheritance;
 
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
 
 @MappedSuperclass
 public class Person {
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Pet.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Pet.java
index 870b3cd684..b359eb3a21 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Pet.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Pet.java
@@ -1,7 +1,7 @@
 package com.baeldung.hibernate.pojo.inheritance;
 
-import javax.persistence.Entity;
-import javax.persistence.PrimaryKeyJoinColumn;
+import jakarta.persistence.Entity;
+import jakarta.persistence.PrimaryKeyJoinColumn;
 
 @Entity
 @PrimaryKeyJoinColumn(name = "petId")
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Vehicle.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Vehicle.java
index b2a920573e..9bdde8c33b 100644
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Vehicle.java
+++ b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/inheritance/Vehicle.java
@@ -1,9 +1,9 @@
 package com.baeldung.hibernate.pojo.inheritance;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
 
 @Entity
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
diff --git a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/package-info.java b/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/package-info.java
deleted file mode 100644
index 992cda7c1d..0000000000
--- a/persistence-modules/hibernate-mapping/src/main/java/com/baeldung/hibernate/pojo/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-@AnyMetaDef(name = "EntityDescriptionMetaDef", metaType = "string", idType = "int",
-        metaValues = {
-                @MetaValue(value = "Employee", targetEntity = Employee.class),
-                @MetaValue(value = "Phone", targetEntity = Phone.class)
-        })
-package com.baeldung.hibernate.pojo;
-
-import org.hibernate.annotations.AnyMetaDef;
-import org.hibernate.annotations.MetaValue;
\ No newline at end of file
diff --git a/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/DynamicMappingIntegrationTest.java b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/DynamicMappingIntegrationTest.java
index 7a112200b5..833c5cc3ff 100644
--- a/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/DynamicMappingIntegrationTest.java
+++ b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/DynamicMappingIntegrationTest.java
@@ -119,8 +119,8 @@ public class DynamicMappingIntegrationTest {
 
         assertThat(employees).hasSize(2);
 
-        Employee employee = session.get(Employee.class, 1);
-        assertThat(employee.getGrossIncome()).isEqualTo(10_000);
+        Employee employee = session.get(Employee.class, 2);
+        assertThat(employee.getGrossIncome()).isEqualTo(12_000);
 
         session.disableFilter("incomeLevelFilter");
         employees = session.createQuery("from Employee").getResultList();
diff --git a/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/InheritanceMappingIntegrationTest.java b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/InheritanceMappingIntegrationTest.java
index 0f35dbb8af..7f4cac141c 100644
--- a/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/InheritanceMappingIntegrationTest.java
+++ b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/InheritanceMappingIntegrationTest.java
@@ -13,6 +13,7 @@ import org.junit.Test;
 import com.baeldung.hibernate.pojo.inheritance.Bag;
 import com.baeldung.hibernate.pojo.inheritance.Book;
 import com.baeldung.hibernate.pojo.inheritance.Car;
+import com.baeldung.hibernate.pojo.inheritance.Laptop;
 import com.baeldung.hibernate.pojo.inheritance.MyEmployee;
 import com.baeldung.hibernate.pojo.inheritance.Pen;
 import com.baeldung.hibernate.pojo.inheritance.Pet;
@@ -81,9 +82,12 @@ public class InheritanceMappingIntegrationTest {
     public void givenSubclasses_whenQueryNonMappedInterface_thenOk() {
         Bag bag = new Bag(1, "large");
         session.save(bag);
+        
+        Laptop laptop = new Laptop(1L, "Dell");
+        session.save(laptop);
 
         assertThat(session.createQuery("from com.baeldung.hibernate.pojo.inheritance.Item")
             .getResultList()
-            .size()).isEqualTo(0);
+            .size()).isEqualTo(1);
     }
 }
diff --git a/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/basicannotation/BasicAnnotationIntegrationTest.java b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/basicannotation/BasicAnnotationIntegrationTest.java
index 930bea60c5..6a9a4f095b 100644
--- a/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/basicannotation/BasicAnnotationIntegrationTest.java
+++ b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/basicannotation/BasicAnnotationIntegrationTest.java
@@ -2,7 +2,7 @@ package com.baeldung.hibernate.basicannotation;
 
 import java.io.IOException;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
diff --git a/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/validation/UserAdditionalValidationUnitTest.java b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/validation/UserAdditionalValidationUnitTest.java
index 0f2a0403e9..17212173ec 100644
--- a/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/validation/UserAdditionalValidationUnitTest.java
+++ b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/validation/UserAdditionalValidationUnitTest.java
@@ -7,13 +7,12 @@ import java.math.BigDecimal;
 import java.time.Duration;
 import java.util.Set;
 
-import javax.money.CurrencyContextBuilder;
 import javax.money.Monetary;
 import javax.money.MonetaryAmount;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 
 import org.hibernate.validator.constraints.CodePointLength;
 import org.hibernate.validator.constraints.CreditCardNumber;
@@ -21,12 +20,10 @@ import org.hibernate.validator.constraints.Currency;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.LuhnCheck;
 import org.hibernate.validator.constraints.Range;
-import org.hibernate.validator.constraints.SafeHtml;
 import org.hibernate.validator.constraints.ScriptAssert;
 import org.hibernate.validator.constraints.URL;
 import org.hibernate.validator.constraints.time.DurationMax;
 import org.hibernate.validator.constraints.time.DurationMin;
-import org.javamoney.moneta.CurrencyUnitBuilder;
 import org.javamoney.moneta.Money;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/validation/UserValidationUnitTest.java b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/validation/UserValidationUnitTest.java
index e39f324856..495ad657be 100644
--- a/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/validation/UserValidationUnitTest.java
+++ b/persistence-modules/hibernate-mapping/src/test/java/com/baeldung/hibernate/validation/UserValidationUnitTest.java
@@ -2,11 +2,11 @@ package com.baeldung.hibernate.validation;
 
 import static org.junit.Assert.assertEquals;
 import java.util.Set;
-import javax.persistence.PersistenceException;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.persistence.PersistenceException;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.junit.Before;
diff --git a/persistence-modules/hibernate-queries/README.md b/persistence-modules/hibernate-queries/README.md
index f5cba1aa6f..9e6c52d6dc 100644
--- a/persistence-modules/hibernate-queries/README.md
+++ b/persistence-modules/hibernate-queries/README.md
@@ -12,3 +12,4 @@ This module contains articles about use of Queries in Hibernate.
 - [Hibernate’s addScalar() Method](https://www.baeldung.com/hibernate-addscalar)
 - [Distinct Queries in HQL](https://www.baeldung.com/java-hql-distinct)
 - [JPA and Hibernate – Criteria vs. JPQL vs. HQL Query](https://www.baeldung.com/jpql-hql-criteria-query)
+- [Database Keywords as Columns in Hibernate Entities](https://www.baeldung.com/java-hibernate-db-keywords-as-columns)
diff --git a/persistence-modules/hibernate-queries/pom.xml b/persistence-modules/hibernate-queries/pom.xml
index 68a46b82b1..bb60c7b83a 100644
--- a/persistence-modules/hibernate-queries/pom.xml
+++ b/persistence-modules/hibernate-queries/pom.xml
@@ -85,15 +85,21 @@
             <version>${testcontainers.mysql.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.hypersistence</groupId>
+            <artifactId>hypersistence-utils-hibernate-60</artifactId>
+            <version>3.3.1</version>
+        </dependency>
     </dependencies>
 
     <properties>
-        <org.springframework.version>5.0.2.RELEASE</org.springframework.version>
-        <org.springframework.data.version>1.10.6.RELEASE</org.springframework.data.version>
+        <org.springframework.version>6.0.6</org.springframework.version>
+        <org.springframework.data.version>3.0.3</org.springframework.data.version>
         <tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
-        <mysql.version>6.0.6</mysql.version>
-        <mariaDB4j.version>2.2.3</mariaDB4j.version>
+        <mysql.version>8.0.32</mysql.version>
+        <mariaDB4j.version>2.6.0</mariaDB4j.version>
         <h2.version>2.1.214</h2.version>
+        <hibernate.version>6.1.7.Final</hibernate.version>
         <testcontainers.mysql.version>1.17.6</testcontainers.mysql.version>
     </properties>
 
diff --git a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/model/Employee.java b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/model/Employee.java
index 8771e02e0b..9041c6727c 100644
--- a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/model/Employee.java
+++ b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/model/Employee.java
@@ -1,7 +1,7 @@
 package com.baeldung.hibernate.criteria.model;
 
 import java.io.Serializable;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 
 @org.hibernate.annotations.NamedQueries({
     @org.hibernate.annotations.NamedQuery(name = "Employee_findByEmployeeId", query = "from Employee where id = :employeeId"),
diff --git a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java
index 248f64474a..2b782c2a1d 100644
--- a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java
+++ b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java
@@ -12,10 +12,10 @@ package com.baeldung.hibernate.criteria.view;
 
 import java.util.List;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 
 import org.hibernate.Session;
 import org.hibernate.query.Query;
diff --git a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/view/EmployeeCriteriaQueries.java b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/view/EmployeeCriteriaQueries.java
index f8c525611b..9303fd893e 100644
--- a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/view/EmployeeCriteriaQueries.java
+++ b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteria/view/EmployeeCriteriaQueries.java
@@ -3,9 +3,9 @@ package com.baeldung.hibernate.criteria.view;
 import com.baeldung.hibernate.criteria.model.Employee;
 import com.baeldung.hibernate.criteria.util.HibernateUtil;
 import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.hibernate.Session;
 import org.hibernate.query.Query;
 
diff --git a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteriaquery/Student.java b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteriaquery/Student.java
index 314e7ca557..af6b561091 100644
--- a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteriaquery/Student.java
+++ b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/criteriaquery/Student.java
@@ -1,11 +1,11 @@
 package com.baeldung.hibernate.criteriaquery;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "students")
diff --git a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringJavaDescriptor.java b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringJavaDescriptor.java
index 56be9e693f..58d8e8628a 100644
--- a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringJavaDescriptor.java
+++ b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringJavaDescriptor.java
@@ -1,14 +1,15 @@
 package com.baeldung.hibernate.customtypes;
 
-import org.hibernate.type.LocalDateType;
-import org.hibernate.type.descriptor.WrapperOptions;
-import org.hibernate.type.descriptor.java.AbstractTypeDescriptor;
-import org.hibernate.type.descriptor.java.ImmutableMutabilityPlan;
-import org.hibernate.type.descriptor.java.MutabilityPlan;
 
 import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 
-public class LocalDateStringJavaDescriptor extends AbstractTypeDescriptor<LocalDate> {
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.ImmutableMutabilityPlan;
+
+import io.hypersistence.utils.hibernate.type.array.internal.AbstractArrayTypeDescriptor;
+
+public class LocalDateStringJavaDescriptor extends AbstractArrayTypeDescriptor<LocalDate> {
 
     public static final LocalDateStringJavaDescriptor INSTANCE = new LocalDateStringJavaDescriptor();
 
@@ -18,12 +19,12 @@ public class LocalDateStringJavaDescriptor extends AbstractTypeDescriptor<LocalD
 
     @Override
     public String toString(LocalDate value) {
-        return LocalDateType.FORMATTER.format(value);
+        return DateTimeFormatter.ISO_LOCAL_DATE.format(value);
     }
 
     @Override
-    public LocalDate fromString(String string) {
-        return LocalDate.from(LocalDateType.FORMATTER.parse(string));
+    public LocalDate fromString(CharSequence string) {
+        return LocalDate.from( DateTimeFormatter.ISO_LOCAL_DATE.parse(string));
     }
 
     @Override
@@ -33,7 +34,7 @@ public class LocalDateStringJavaDescriptor extends AbstractTypeDescriptor<LocalD
             return null;
 
         if (String.class.isAssignableFrom(type))
-            return (X) LocalDateType.FORMATTER.format(value);
+            return (X) DateTimeFormatter.ISO_LOCAL_DATE.format(value);
 
         throw unknownUnwrap(type);
     }
@@ -43,8 +44,8 @@ public class LocalDateStringJavaDescriptor extends AbstractTypeDescriptor<LocalD
         if (value == null)
             return null;
 
-        if(String.class.isInstance(value))
-            return LocalDate.from(LocalDateType.FORMATTER.parse((CharSequence) value));
+        if(value instanceof String)
+            return LocalDate.from( DateTimeFormatter.ISO_LOCAL_DATE.parse((CharSequence) value));
 
         throw unknownWrap(value.getClass());
     }
diff --git a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringType.java b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringType.java
index c8d37073e8..57a8bcfd08 100644
--- a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringType.java
+++ b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/customtypes/LocalDateStringType.java
@@ -2,18 +2,16 @@ package com.baeldung.hibernate.customtypes;
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.type.AbstractSingleColumnStandardBasicType;
-import org.hibernate.type.DiscriminatorType;
-import org.hibernate.type.descriptor.java.LocalDateJavaDescriptor;
-import org.hibernate.type.descriptor.sql.VarcharTypeDescriptor;
+import org.hibernate.type.descriptor.jdbc.VarcharJdbcType;
 
 import java.time.LocalDate;
 
-public class LocalDateStringType extends AbstractSingleColumnStandardBasicType<LocalDate> implements DiscriminatorType<LocalDate> {
+public class LocalDateStringType extends AbstractSingleColumnStandardBasicType<LocalDate> {
 
     public static final LocalDateStringType INSTANCE = new LocalDateStringType();
 
     public LocalDateStringType() {
-        super(VarcharTypeDescriptor.INSTANCE, LocalDateStringJavaDescriptor.INSTANCE);
+        super(VarcharJdbcType.INSTANCE, LocalDateStringJavaDescriptor.INSTANCE);
     }
 
     @Override
@@ -21,14 +19,12 @@ public class LocalDateStringType extends AbstractSingleColumnStandardBasicType<L
         return "LocalDateString";
     }
 
-    @Override
-    public LocalDate stringToObject(String xml) throws Exception {
+    public LocalDate stringToObject(String xml) {
         return fromString(xml);
     }
 
-    @Override
-    public String objectToSQLString(LocalDate value, Dialect dialect) throws Exception {
-        return '\'' + toString(value) + '\'';
+    public String objectToSQLString(LocalDate value, Dialect dialect) {
+        return '\'' + LocalDateStringJavaDescriptor.INSTANCE.toString(value) + '\'';
     }
 
 }
diff --git a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/distinct/entities/Comment.java b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/distinct/entities/Comment.java
index 1d155b112e..0dd2451d4e 100644
--- a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/distinct/entities/Comment.java
+++ b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/distinct/entities/Comment.java
@@ -1,9 +1,9 @@
 package com.baeldung.hibernate.distinct.entities;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Entity
 public class Comment {
diff --git a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/distinct/entities/Post.java b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/distinct/entities/Post.java
index d2608e614c..6bd21d1840 100644
--- a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/distinct/entities/Post.java
+++ b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/distinct/entities/Post.java
@@ -2,12 +2,11 @@ package com.baeldung.hibernate.distinct.entities;
 
 import java.util.List;
 
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
diff --git a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/entities/Department.java b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/entities/Department.java
index ff94f4f849..39e69a2b1c 100644
--- a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/entities/Department.java
+++ b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/entities/Department.java
@@ -2,7 +2,7 @@ package com.baeldung.hibernate.entities;
 
 import java.util.List;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 public class Department {
diff --git a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java
index 6510e70650..38519644c5 100644
--- a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java
+++ b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java
@@ -1,13 +1,13 @@
 package com.baeldung.hibernate.entities;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 @org.hibernate.annotations.NamedQueries({ @org.hibernate.annotations.NamedQuery(name = "DeptEmployee_FindByEmployeeNumber", query = "from DeptEmployee where employeeNumber = :employeeNo"),
-        @org.hibernate.annotations.NamedQuery(name = "DeptEmployee_FindAllByDesgination", query = "from DeptEmployee where designation = :designation"),
+        @org.hibernate.annotations.NamedQuery(name = "DeptEmployee_FindAllByDesgination", query = "from DeptEmployee where employeeNumber = :employeeNumber"),
         @org.hibernate.annotations.NamedQuery(name = "DeptEmployee_UpdateEmployeeDepartment", query = "Update DeptEmployee set department = :newDepartment where employeeNumber = :employeeNo"),
         @org.hibernate.annotations.NamedQuery(name = "DeptEmployee_FindAllByDepartment", query = "from DeptEmployee where department = :department", timeout = 1, fetchSize = 10) })
 @org.hibernate.annotations.NamedNativeQueries({ @org.hibernate.annotations.NamedNativeQuery(name = "DeptEmployee_FindByEmployeeName", query = "select * from deptemployee emp where name=:name", resultClass = DeptEmployee.class),
diff --git a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/findall/FindAll.java b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/findall/FindAll.java
index cc0c234df0..dc2cb884c7 100644
--- a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/findall/FindAll.java
+++ b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/findall/FindAll.java
@@ -2,10 +2,10 @@ package com.baeldung.hibernate.findall;
 
 import java.util.List;
 
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 
 import org.hibernate.Session;
 
diff --git a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/keywords/BrokenPhoneOrder.java b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/keywords/BrokenPhoneOrder.java
index e045005f28..f10618b76e 100644
--- a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/keywords/BrokenPhoneOrder.java
+++ b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/keywords/BrokenPhoneOrder.java
@@ -2,10 +2,10 @@ package com.baeldung.hibernate.keywords;
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "broken_phone_order")
diff --git a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/keywords/PhoneOrder.java b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/keywords/PhoneOrder.java
index daee57d553..652fd49349 100644
--- a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/keywords/PhoneOrder.java
+++ b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/keywords/PhoneOrder.java
@@ -2,10 +2,10 @@ package com.baeldung.hibernate.keywords;
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "phone_order")
diff --git a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/pojo/Student.java b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/pojo/Student.java
index 9b26c117eb..263908a5fc 100644
--- a/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/pojo/Student.java
+++ b/persistence-modules/hibernate-queries/src/main/java/com/baeldung/hibernate/pojo/Student.java
@@ -1,9 +1,9 @@
 package com.baeldung.hibernate.pojo;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Entity
 public class Student {
diff --git a/persistence-modules/hibernate-queries/src/main/resources/META-INF/persistence.xml b/persistence-modules/hibernate-queries/src/main/resources/META-INF/persistence.xml
index 474eeb7a44..2915125295 100644
--- a/persistence-modules/hibernate-queries/src/main/resources/META-INF/persistence.xml
+++ b/persistence-modules/hibernate-queries/src/main/resources/META-INF/persistence.xml
@@ -7,12 +7,12 @@
         <description>Hibernate EntityManager Demo</description> 
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
         <properties>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect"/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
             <property name="hibernate.hbm2ddl.auto" value="update"/>
-            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://127.0.0.1:3306/moviecatalog"/>
-            <property name="javax.persistence.jdbc.user" value="root"/>
-            <property name="javax.persistence.jdbc.password" value="root"/>
+            <property name="jakarta.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:mysql://127.0.0.1:3306/moviecatalog"/>
+            <property name="jakarta.persistence.jdbc.user" value="root"/>
+            <property name="jakarta.persistence.jdbc.password" value="root"/>
         </properties>
     </persistence-unit>
 </persistence> 
\ No newline at end of file
diff --git a/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java b/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java
index a1f88f3387..c405eb9ebd 100644
--- a/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java
+++ b/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java
@@ -15,10 +15,10 @@ import com.baeldung.hibernate.criteria.model.Item;
 import com.baeldung.hibernate.criteria.util.HibernateUtil;
 import com.baeldung.hibernate.criteria.view.ApplicationView;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaDelete;
-import javax.persistence.criteria.CriteriaUpdate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaDelete;
+import jakarta.persistence.criteria.CriteriaUpdate;
+import jakarta.persistence.criteria.Root;
 
 public class HibernateCriteriaIntegrationTest {
 
diff --git a/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/criteriaquery/TypeSafeCriteriaIntegrationTest.java b/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/criteriaquery/TypeSafeCriteriaIntegrationTest.java
index cedba412d9..bfcb4301a7 100644
--- a/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/criteriaquery/TypeSafeCriteriaIntegrationTest.java
+++ b/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/criteriaquery/TypeSafeCriteriaIntegrationTest.java
@@ -1,6 +1,5 @@
 package com.baeldung.hibernate.criteriaquery;
 
-import com.baeldung.hibernate.criteriaquery.HibernateUtil;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.query.Query;
@@ -10,9 +9,9 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import java.io.IOException;
 import java.util.List;
 
diff --git a/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/distinct/entities/DistinctHqlQueriesUnitTest.java b/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/distinct/entities/DistinctHqlQueriesUnitTest.java
index 799439a51b..3ce384741f 100644
--- a/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/distinct/entities/DistinctHqlQueriesUnitTest.java
+++ b/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/distinct/entities/DistinctHqlQueriesUnitTest.java
@@ -8,7 +8,6 @@ import java.util.List;
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
-import org.hibernate.annotations.QueryHints;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -45,12 +44,12 @@ public class DistinctHqlQueriesUnitTest {
     }
 
     @Test
-    public void whenExecutingSelectQuery_thereWillBeDuplicates() {
+    public void whenExecutingSelectQuery_thereTheInsertedPosts() {
         String hql = "SELECT p FROM Post p LEFT JOIN FETCH p.comments";
         List<Post> posts = session.createQuery(hql, Post.class)
             .getResultList();
 
-        assertThat(posts).hasSize(3);
+        assertThat(posts).hasSize(1);
     }
 
     @Test
@@ -68,8 +67,8 @@ public class DistinctHqlQueriesUnitTest {
     @Test
     public void whenExecutingSelectDistinctQueryWithHint_thereShouldBeNoDuplicates() {
         String hql = "SELECT DISTINCT p FROM Post p LEFT JOIN FETCH p.comments";
+        // From Hibernate ORM 6, distinct is always passed to the SQL query and the flag QueryHints#HINT_PASS_DISTINCT_THROUGH has been removed.
         List<Post> posts = session.createQuery(hql, Post.class)
-            .setHint(QueryHints.PASS_DISTINCT_THROUGH, false)
             .getResultList();
 
         assertThat(posts).hasSize(1)
diff --git a/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/keywords/HibernateKeywordsApplicationIntegrationTest.java b/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/keywords/HibernateKeywordsApplicationManualTest.java
similarity index 78%
rename from persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/keywords/HibernateKeywordsApplicationIntegrationTest.java
rename to persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/keywords/HibernateKeywordsApplicationManualTest.java
index 4282da3de4..780a0fd77e 100644
--- a/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/keywords/HibernateKeywordsApplicationIntegrationTest.java
+++ b/persistence-modules/hibernate-queries/src/test/java/com/baeldung/hibernate/keywords/HibernateKeywordsApplicationManualTest.java
@@ -3,8 +3,6 @@ package com.baeldung.hibernate.keywords;
 import static java.util.UUID.randomUUID;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-import javax.persistence.PersistenceException;
-
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
@@ -13,7 +11,17 @@ import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class HibernateKeywordsApplicationIntegrationTest {
+import jakarta.persistence.PersistenceException;
+
+/**
+ * This test suite uses testcontainers library and therefore
+ * requires Docker installed on the local system to be able to run it.
+ *
+ * When docker is available on the local machine it can be run either by:
+ * - running it from your favorite IDE
+ * - or through `mvn test -Dtest=HibernateKeywordsApplicationManualTest`
+ */
+public class HibernateKeywordsApplicationManualTest {
 
     private static SessionFactory sessionFactory;
     private Session session;
diff --git a/persistence-modules/java-mongodb-3/README.md b/persistence-modules/java-mongodb-3/README.md
index 4296c96ed8..48fc211370 100644
--- a/persistence-modules/java-mongodb-3/README.md
+++ b/persistence-modules/java-mongodb-3/README.md
@@ -4,3 +4,4 @@
 - [Query Documents using Document ID in MongoDB](https://www.baeldung.com/mongodb-query-documents-id)
 - [Insert Array Inside an Object in MongoDB](https://www.baeldung.com/java-mongodb-document-insert-array)
 - [Guide to Filters in MongoDB](https://www.baeldung.com/java-mongodb-filters)
+- [Add Field to an Existing MongoDB Bson Filter in Java](https://www.baeldung.com/java-mongodb-add-field-bson-filter)
diff --git a/persistence-modules/java-mongodb-3/src/main/java/com/baeldung/mongo/insert/InsertFieldIntoFilter.java b/persistence-modules/java-mongodb-3/src/main/java/com/baeldung/mongo/insert/InsertFieldIntoFilter.java
new file mode 100644
index 0000000000..aabc6aef18
--- /dev/null
+++ b/persistence-modules/java-mongodb-3/src/main/java/com/baeldung/mongo/insert/InsertFieldIntoFilter.java
@@ -0,0 +1,74 @@
+package com.baeldung.mongo.insert;
+
+import com.mongodb.MongoClient;
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoCursor;
+import com.mongodb.client.MongoDatabase;
+import org.bson.BsonDocument;
+import org.bson.Document;
+import org.bson.conversions.Bson;
+
+import static com.mongodb.client.model.Filters.*;
+
+public class InsertFieldIntoFilter {
+
+    private static MongoClient mongoClient;
+    private static MongoDatabase database;
+    private static MongoCollection<Document> collection;
+    private static String collectionName;
+    private static String databaseName;
+
+    public static void setUp() {
+        if (mongoClient == null) {
+            mongoClient = new MongoClient("localhost", 27017);
+
+            databaseName = "baeldung";
+            collectionName = "pet";
+
+            database = mongoClient.getDatabase(databaseName);
+            collection = database.getCollection(collectionName);
+        }
+    }
+
+    public static void addFieldToExistingBsonFilter() {
+
+        Bson existingFilter = and(eq("type", "Dog"), eq("gender", "Male"));
+
+        Bson newFilter = and(existingFilter, gt("age", 5));
+        FindIterable<Document> documents = collection.find(newFilter);
+
+        MongoCursor<Document> cursor = documents.iterator();
+        while (cursor.hasNext()) {
+            System.out.println(cursor.next());
+        }
+    }
+
+
+    public static void addFieldToExistingBsonFilterUsingBsonDocument() {
+
+        Bson existingFilter = eq("type", "Dog");
+        BsonDocument existingBsonDocument = existingFilter.toBsonDocument(BsonDocument.class, MongoClient.getDefaultCodecRegistry());
+
+        Bson newFilter = gt("age", 5);
+        BsonDocument newBsonDocument = newFilter.toBsonDocument(BsonDocument.class, MongoClient.getDefaultCodecRegistry());
+
+        existingBsonDocument.append("age", newBsonDocument.get("age"));
+
+        FindIterable<Document> documents = collection.find(existingBsonDocument);
+
+        MongoCursor<Document> cursor = documents.iterator();
+        while (cursor.hasNext()) {
+            System.out.println(cursor.next());
+        }
+    }
+
+    public static void main(String args[]) {
+
+        setUp();
+
+        addFieldToExistingBsonFilter();
+
+        addFieldToExistingBsonFilterUsingBsonDocument();
+    }
+}
diff --git a/persistence-modules/java-mongodb-3/src/test/java/com/baeldung/mongo/insert/InsertFieldIntoFilterLiveTest.java b/persistence-modules/java-mongodb-3/src/test/java/com/baeldung/mongo/insert/InsertFieldIntoFilterLiveTest.java
new file mode 100644
index 0000000000..be4ed260d9
--- /dev/null
+++ b/persistence-modules/java-mongodb-3/src/test/java/com/baeldung/mongo/insert/InsertFieldIntoFilterLiveTest.java
@@ -0,0 +1,73 @@
+package com.baeldung.mongo.insert;
+
+import com.baeldung.mongo.find.FindOperationLiveTest;
+import com.mongodb.MongoClient;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoCursor;
+import com.mongodb.client.MongoDatabase;
+import org.bson.BsonDocument;
+import org.bson.Document;
+import org.bson.conversions.Bson;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import static com.mongodb.client.model.Filters.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class InsertFieldIntoFilterLiveTest {
+
+    private static MongoClient mongoClient;
+    private static MongoDatabase database;
+    private static MongoCollection<Document> collection;
+    private static final String DATASET_JSON = "/pet.json";
+
+    @BeforeClass
+    public static void setUp() throws IOException {
+        if (mongoClient == null) {
+            mongoClient = new MongoClient("localhost", 27017);
+
+            database = mongoClient.getDatabase("baeldung");
+            collection = database.getCollection("pet");
+
+            collection.drop();
+
+            InputStream is = FindOperationLiveTest.class.getResourceAsStream(DATASET_JSON);
+            BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+            reader.lines()
+                    .forEach(line -> collection.insertOne(Document.parse(line)));
+            reader.close();
+        }
+    }
+
+    @Test
+    public void givenPetCollection_whenFetchingAfterAddingFieldToFilter_thenFindMatchingDocuments() {
+        Bson existingFilter = and(eq("type", "Dog"), eq("gender", "Male"));
+
+        Bson newFilter = and(existingFilter, gt("age", 5));
+        MongoCursor<Document> cursor = collection.find(newFilter).iterator();
+
+        assertNotNull(cursor);
+        assertTrue(cursor.hasNext());
+    }
+
+    @Test
+    public void givenPetCollection_whenFetchingAfterAddingFieldToFilterUsingBsonDocument_thenFindMatchingDocuments() {
+        Bson existingFilter = eq("type", "Dog");
+        BsonDocument existingBsonDocument = existingFilter.toBsonDocument(BsonDocument.class, MongoClient.getDefaultCodecRegistry());
+
+        Bson newFilter = gt("age", 5);
+        BsonDocument newBsonDocument = newFilter.toBsonDocument(BsonDocument.class, MongoClient.getDefaultCodecRegistry());
+
+        existingBsonDocument.append("age", newBsonDocument.get("age"));
+        MongoCursor<Document> cursor = collection.find(existingBsonDocument).iterator();
+
+        assertNotNull(cursor);
+        assertTrue(cursor.hasNext());
+    }
+}
diff --git a/persistence-modules/java-mongodb-3/src/test/resources/pet.json b/persistence-modules/java-mongodb-3/src/test/resources/pet.json
new file mode 100644
index 0000000000..b31cf16718
--- /dev/null
+++ b/persistence-modules/java-mongodb-3/src/test/resources/pet.json
@@ -0,0 +1,3 @@
+{"petId":"P1","name":"Tom","age":3,"type":"Cat","gender":"Female"}
+{"petId":"P2","name":"Max","age":4,"type":"Dog","gender":"Male"}
+{"petId":"P3","name":"Milo","age":8,"type":"Dog","gender":"Male"}
\ No newline at end of file
diff --git a/persistence-modules/java-mongodb/pom.xml b/persistence-modules/java-mongodb/pom.xml
index 2e366d8368..844b9e5bcd 100644
--- a/persistence-modules/java-mongodb/pom.xml
+++ b/persistence-modules/java-mongodb/pom.xml
@@ -14,20 +14,14 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>de.flapdoodle.embedmongo</groupId>
-            <artifactId>de.flapdoodle.embedmongo</artifactId>
-            <version>${flapdoodle.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mongodb</groupId>
-            <artifactId>mongo-java-driver</artifactId>
+            <artifactId>mongodb-driver-sync</artifactId>
             <version>${mongo.version}</version>
         </dependency>
         <dependency>
             <groupId>dev.morphia.morphia</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>morphia-core</artifactId>
             <version>${morphia.version}</version>
         </dependency>
         <dependency>
@@ -42,12 +36,18 @@
             <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>de.flapdoodle.embed</groupId>
+            <artifactId>de.flapdoodle.embed.mongo</artifactId>
+            <version>${flapdoodle.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <properties>
-        <mongo.version>3.12.1</mongo.version>
-        <flapdoodle.version>1.11</flapdoodle.version>
-        <morphia.version>1.5.3</morphia.version>
+        <mongo.version>4.8.2</mongo.version>
+        <flapdoodle.version>4.4.1</flapdoodle.version>
+        <morphia.version>2.0.0</morphia.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/java-mongodb/src/main/java/com/baeldung/MongoExample.java b/persistence-modules/java-mongodb/src/main/java/com/baeldung/MongoExample.java
index 9af1e1f6a4..ef4003fa82 100644
--- a/persistence-modules/java-mongodb/src/main/java/com/baeldung/MongoExample.java
+++ b/persistence-modules/java-mongodb/src/main/java/com/baeldung/MongoExample.java
@@ -1,53 +1,64 @@
 package com.baeldung;
 
-import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
-import com.mongodb.DBCollection;
-import com.mongodb.DBCursor;
-import com.mongodb.MongoClient;
+import java.util.ArrayList;
+
+import org.bson.Document;
+
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoCursor;
+import com.mongodb.client.MongoDatabase;
 
 public class MongoExample {
     public static void main(String[] args) {
+        try (MongoClient mongoClient = MongoClients.create("mongodb://localhost:27017")) {
 
-        MongoClient mongoClient = new MongoClient("localhost", 27017);
+            MongoDatabase database = mongoClient.getDatabase("myMongoDb");
 
-        DB database = mongoClient.getDB("myMongoDb");
+            // print existing databases
+            mongoClient.listDatabaseNames().forEach(System.out::println);
 
-        // print existing databases
-        mongoClient.getDatabaseNames().forEach(System.out::println);
+            boolean collectionExists = mongoClient.getDatabase("myMongoDb").listCollectionNames()
+                    .into(new ArrayList<>()).contains("customers");
+            if (!collectionExists) {
+                database.createCollection("customers");
+            }
 
-        database.createCollection("customers", null);
+            // print all collections in customers database
+            database.listCollectionNames().forEach(System.out::println);
 
-        // print all collections in customers database
-        database.getCollectionNames().forEach(System.out::println);
+            // create data
+            MongoCollection<Document> collection = database.getCollection("customers");
+            Document document = new Document();
+            document.put("name", "Shubham");
+            document.put("company", "Baeldung");
+            collection.insertOne(document);
 
-        // create data
-        DBCollection collection = database.getCollection("customers");
-        BasicDBObject document = new BasicDBObject();
-        document.put("name", "Shubham");
-        document.put("company", "Baeldung");
-        collection.insert(document);
+            // update data
+            Document query = new Document();
+            query.put("name", "Shubham");
+            Document newDocument = new Document();
+            newDocument.put("name", "John");
+            Document updateObject = new Document();
+            updateObject.put("$set", newDocument);
+            collection.updateOne(query, updateObject);
 
-        // update data
-        BasicDBObject query = new BasicDBObject();
-        query.put("name", "Shubham");
-        BasicDBObject newDocument = new BasicDBObject();
-        newDocument.put("name", "John");
-        BasicDBObject updateObject = new BasicDBObject();
-        updateObject.put("$set", newDocument);
-        collection.update(query, updateObject);
+            // read data
+            Document searchQuery = new Document();
+            searchQuery.put("name", "John");
+            FindIterable<Document> cursor = collection.find(searchQuery);
+            try (final MongoCursor<Document> cursorIterator = cursor.cursor()) {
+                while (cursorIterator.hasNext()) {
+                    System.out.println(cursorIterator.next());
+                }
+            }
 
-        // read data
-        BasicDBObject searchQuery = new BasicDBObject();
-        searchQuery.put("name", "John");
-        DBCursor cursor = collection.find(searchQuery);
-        while (cursor.hasNext()) {
-            System.out.println(cursor.next());
+            // delete data
+            Document deleteQuery = new Document();
+            deleteQuery.put("name", "John");
+            collection.deleteOne(deleteQuery);
         }
-
-        // delete data
-        BasicDBObject deleteQuery = new BasicDBObject();
-        deleteQuery.put("name", "John");
-        collection.remove(deleteQuery);
     }
 }
diff --git a/persistence-modules/java-mongodb/src/main/java/com/baeldung/bsontojson/Book.java b/persistence-modules/java-mongodb/src/main/java/com/baeldung/bsontojson/Book.java
index 44e4ecb539..c57f759a95 100644
--- a/persistence-modules/java-mongodb/src/main/java/com/baeldung/bsontojson/Book.java
+++ b/persistence-modules/java-mongodb/src/main/java/com/baeldung/bsontojson/Book.java
@@ -1,11 +1,9 @@
 package com.baeldung.bsontojson;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.HashSet;
 import java.util.Set;
 
-import dev.morphia.annotations.Embedded;
 import dev.morphia.annotations.Entity;
 import dev.morphia.annotations.Field;
 import dev.morphia.annotations.Id;
@@ -25,7 +23,7 @@ public class Book {
     @Property
     private String title;
     private String author;
-    @Embedded
+
     private Publisher publisher;
     @Property("price")
     private double cost;
diff --git a/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/CollectionExistence.java b/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/CollectionExistence.java
index 074913af4e..c94a7c042a 100644
--- a/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/CollectionExistence.java
+++ b/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/CollectionExistence.java
@@ -4,8 +4,8 @@ import java.util.ArrayList;
 
 import org.bson.Document;
 
-import com.mongodb.DB;
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 
@@ -18,7 +18,7 @@ public class CollectionExistence {
 
     public static void setUp() {
         if (mongoClient == null) {
-            mongoClient = new MongoClient("localhost", 27017);
+            mongoClient = MongoClients.create("mongodb://localhost:27017");
         }
         databaseName = "baeldung";
         testCollectionName = "student";
@@ -26,9 +26,9 @@ public class CollectionExistence {
 
     public static void collectionExistsSolution() {
 
-        DB db = mongoClient.getDB(databaseName);
+        MongoDatabase db = mongoClient.getDatabase(databaseName);
 
-        System.out.println("collectionName " + testCollectionName + db.collectionExists(testCollectionName));
+        System.out.println("collectionName " + testCollectionName + db.listCollectionNames().into(new ArrayList<>()).contains(testCollectionName));
 
     }
 
@@ -62,7 +62,7 @@ public class CollectionExistence {
 
         MongoCollection<Document> collection = database.getCollection(testCollectionName);
 
-        System.out.println(collection.count());
+        System.out.println(collection.countDocuments());
 
     }
 
diff --git a/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/objectid/RetrieveIdExample.java b/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/objectid/RetrieveIdExample.java
index 74279bbfcd..5ccabc9326 100644
--- a/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/objectid/RetrieveIdExample.java
+++ b/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/objectid/RetrieveIdExample.java
@@ -5,7 +5,8 @@ import java.util.Date;
 import org.bson.Document;
 import org.bson.types.ObjectId;
 
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 
@@ -13,7 +14,7 @@ public class RetrieveIdExample {
 
     public static void main(String[] args) {
         
-        try ( MongoClient mongoClient = new MongoClient("localhost", 27017) ) {
+        try ( MongoClient mongoClient = MongoClients.create("mongodb://localhost:27017") ) {
             
             MongoDatabase database = mongoClient.getDatabase("myMongoDb");        
             MongoCollection<Document> collection = database.getCollection("example");
diff --git a/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/update/MultipleFieldsExample.java b/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/update/MultipleFieldsExample.java
index ebc56cbfd0..9ad62bc1c7 100644
--- a/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/update/MultipleFieldsExample.java
+++ b/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/update/MultipleFieldsExample.java
@@ -3,7 +3,8 @@ package com.baeldung.mongo.update;
 import org.bson.Document;
 
 import com.mongodb.BasicDBObject;
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.result.UpdateResult;
@@ -16,7 +17,7 @@ public class MultipleFieldsExample {
         // Connect to cluster (default is localhost:27017)
         //
 
-        MongoClient mongoClient = new MongoClient("localhost", 27017);
+        MongoClient mongoClient = MongoClients.create("mongodb://localhost:27017");
         MongoDatabase database = mongoClient.getDatabase("baeldung");
         MongoCollection<Document> collection = database.getCollection("employee");
 
diff --git a/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/update/UpdateFields.java b/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/update/UpdateFields.java
index a1b051e74c..594d535245 100644
--- a/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/update/UpdateFields.java
+++ b/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/update/UpdateFields.java
@@ -2,7 +2,8 @@ package com.baeldung.mongo.update;
 
 import org.bson.Document;
 
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.Filters;
@@ -83,10 +84,9 @@ public class UpdateFields {
 
     public static void setup() {
         if (mongoClient == null) {
-            mongoClient = new MongoClient("localhost", 27017);
+            mongoClient = MongoClients.create("mongodb://localhost:27017");
             database = mongoClient.getDatabase("baeldung");
             collection = database.getCollection("student");
-
         }
     }
 
diff --git a/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/update/UpdateMultipleFields.java b/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/update/UpdateMultipleFields.java
index 96dd086ed7..08fdce68d6 100644
--- a/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/update/UpdateMultipleFields.java
+++ b/persistence-modules/java-mongodb/src/main/java/com/baeldung/mongo/update/UpdateMultipleFields.java
@@ -2,7 +2,8 @@ package com.baeldung.mongo.update;
 
 import org.bson.Document;
 
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.Filters;
@@ -16,19 +17,19 @@ public class UpdateMultipleFields {
         //
         // Connect to cluster
         //
+        try (MongoClient mongoClient = MongoClients.create("mongodb://localhost:27007");) {
+            MongoDatabase database = mongoClient.getDatabase("baeldung");
+            MongoCollection<Document> collection = database.getCollection("employee");
 
-        MongoClient mongoClient = new MongoClient("localhost", 27007);
-        MongoDatabase database = mongoClient.getDatabase("baeldung");
-        MongoCollection<Document> collection = database.getCollection("employee");
+            //
+            // Update query
+            //
 
-        //
-        // Update query
-        //
+            UpdateResult updateResult = collection.updateMany(Filters.eq("employee_id", 794875), Updates.combine(Updates.set("department_id", 4), Updates.set("job", "Sales Manager")));
 
-        UpdateResult updateResult = collection.updateMany(Filters.eq("employee_id", 794875), Updates.combine(Updates.set("department_id", 4), Updates.set("job", "Sales Manager")));
-
-        System.out.println("updateResult:- " + updateResult);
-        System.out.println("updateResult:- " + updateResult.getModifiedCount());
+            System.out.println("updateResult:- " + updateResult);
+            System.out.println("updateResult:- " + updateResult.getModifiedCount());
+        }
 
     }
 
diff --git a/persistence-modules/java-mongodb/src/main/java/com/baeldung/morphia/domain/Book.java b/persistence-modules/java-mongodb/src/main/java/com/baeldung/morphia/domain/Book.java
index 4ed2ab8580..b79550dcd1 100644
--- a/persistence-modules/java-mongodb/src/main/java/com/baeldung/morphia/domain/Book.java
+++ b/persistence-modules/java-mongodb/src/main/java/com/baeldung/morphia/domain/Book.java
@@ -1,6 +1,5 @@
 package com.baeldung.morphia.domain;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.HashSet;
 import java.util.Set;
@@ -25,7 +24,7 @@ public class Book {
     @Property
     private String title;
     private String author;
-    @Embedded
+
     private Publisher publisher;
     @Property("price")
     private double cost;
diff --git a/persistence-modules/java-mongodb/src/main/java/com/baeldung/tagging/TagRepository.java b/persistence-modules/java-mongodb/src/main/java/com/baeldung/tagging/TagRepository.java
index d27d48c743..44b5d461bc 100644
--- a/persistence-modules/java-mongodb/src/main/java/com/baeldung/tagging/TagRepository.java
+++ b/persistence-modules/java-mongodb/src/main/java/com/baeldung/tagging/TagRepository.java
@@ -10,8 +10,9 @@ import org.bson.Document;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBCollection;
-import com.mongodb.MongoClient;
 import com.mongodb.client.FindIterable;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.Filters;
@@ -45,7 +46,7 @@ public class TagRepository implements Closeable {
 	 * Instantiates a new TagRepository by opening the DB connection.
 	 */
 	public TagRepository() {
-		mongoClient = new MongoClient("localhost", 27018);
+		mongoClient = MongoClients.create("mongodb://localhost:27018");
 		MongoDatabase database = mongoClient.getDatabase("blog");
 		collection = database.getCollection("posts");
 	}
diff --git a/persistence-modules/java-mongodb/src/test/java/com/baeldung/AppLiveTest.java b/persistence-modules/java-mongodb/src/test/java/com/baeldung/AppLiveTest.java
index 7692a37d03..2abecdbd48 100644
--- a/persistence-modules/java-mongodb/src/test/java/com/baeldung/AppLiveTest.java
+++ b/persistence-modules/java-mongodb/src/test/java/com/baeldung/AppLiveTest.java
@@ -2,71 +2,50 @@ package com.baeldung;
 
 import static org.junit.Assert.assertEquals;
 
-import org.junit.After;
-import org.junit.Before;
+import org.bson.Document;
 import org.junit.Test;
 
-import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
-import com.mongodb.DBCollection;
-import com.mongodb.DBCursor;
-import com.mongodb.Mongo;
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoCursor;
+import com.mongodb.client.MongoDatabase;
 
-import de.flapdoodle.embedmongo.MongoDBRuntime;
-import de.flapdoodle.embedmongo.MongodExecutable;
-import de.flapdoodle.embedmongo.MongodProcess;
-import de.flapdoodle.embedmongo.config.MongodConfig;
-import de.flapdoodle.embedmongo.distribution.Version;
-import de.flapdoodle.embedmongo.runtime.Network;
+import de.flapdoodle.embed.mongo.distribution.Version;
+import de.flapdoodle.embed.mongo.transitions.Mongod;
+import de.flapdoodle.embed.mongo.transitions.RunningMongodProcess;
+import de.flapdoodle.reverse.TransitionWalker;
 
 public class AppLiveTest {
 
     private static final String DB_NAME = "myMongoDb";
-    private MongodExecutable mongodExe;
-    private MongodProcess mongod;
-    private Mongo mongo;
-    private DB db;
-    private DBCollection collection;
-
-    @Before
-    public void setup() throws Exception {
-        // Creating Mongodbruntime instance
-        MongoDBRuntime runtime = MongoDBRuntime.getDefaultInstance();
-
-        // Creating MongodbExecutable
-        mongodExe = runtime.prepare(new MongodConfig(Version.V2_0_1, 12345, Network.localhostIsIPv6()));
-
-        // Starting Mongodb
-        mongod = mongodExe.start();
-        mongo = new Mongo("localhost", 12345);
-
-        // Creating DB
-        db = mongo.getDB(DB_NAME);
-
-        // Creating collection Object and adding values
-        collection = db.getCollection("customers");
-    }
-
-    @After
-    public void teardown() throws Exception {
-        mongod.stop();
-        mongodExe.cleanup();
-    }
 
     @Test
     public void testAddressPersistance() {
-        BasicDBObject contact = new BasicDBObject();
-        contact.put("name", "John");
-        contact.put("company", "Baeldung");
+        try (TransitionWalker.ReachedState<RunningMongodProcess> running = Mongod.instance().start(Version.V6_0_3)) {
+            try (MongoClient mongo = MongoClients.create("mongodb://" + running.current().getServerAddress().getHost() + ":" + running.current().getServerAddress().getPort())) {
+                // Creating DB
+                MongoDatabase db = mongo.getDatabase(DB_NAME);
 
-        // Inserting document
-        collection.insert(contact);
-        DBCursor cursorDoc = collection.find();
-        BasicDBObject contact1 = new BasicDBObject();
-        while (cursorDoc.hasNext()) {
-            contact1 = (BasicDBObject) cursorDoc.next();
-            System.out.println(contact1);
+                // Creating collection Object and adding values
+                MongoCollection<Document> collection = db.getCollection("customers");
+
+                Document contact = new Document();
+                contact.put("name", "John");
+                contact.put("company", "Baeldung");
+
+                // Inserting document
+                collection.insertOne(contact);
+                FindIterable<Document> cursorDoc = collection.find();
+                Document contact1 = new Document();
+                final MongoCursor<Document> cursor = cursorDoc.cursor();
+                while (cursor.hasNext()) {
+                    contact1 = cursor.next();
+                    System.out.println(contact1);
+                }
+                assertEquals(contact1.get("name"), "John");
+            }
         }
-        assertEquals(contact1.get("name"), "John");
     }
 }
\ No newline at end of file
diff --git a/persistence-modules/java-mongodb/src/test/java/com/baeldung/bsontojson/BsonToJsonLiveTest.java b/persistence-modules/java-mongodb/src/test/java/com/baeldung/bsontojson/BsonToJsonLiveTest.java
index 0548119d7a..e2b53436b3 100644
--- a/persistence-modules/java-mongodb/src/test/java/com/baeldung/bsontojson/BsonToJsonLiveTest.java
+++ b/persistence-modules/java-mongodb/src/test/java/com/baeldung/bsontojson/BsonToJsonLiveTest.java
@@ -1,5 +1,6 @@
 package com.baeldung.bsontojson;
 
+import static dev.morphia.query.experimental.filters.Filters.eq;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -14,10 +15,12 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
 
 import dev.morphia.Datastore;
+import dev.morphia.DeleteOptions;
 import dev.morphia.Morphia;
 
 public class BsonToJsonLiveTest {
@@ -27,9 +30,8 @@ public class BsonToJsonLiveTest {
 
     @BeforeClass
     public static void setUp() {
-        Morphia morphia = new Morphia();
-        morphia.mapPackage("com.baeldung.bsontojson");
-        datastore = morphia.createDatastore(new MongoClient(), DB_NAME);
+        datastore = Morphia.createDatastore(MongoClients.create(), DB_NAME);
+        datastore.getMapper().mapPackage("com.baeldung.bsontojson");
         datastore.ensureIndexes();
 
         datastore.save(new Book()
@@ -44,25 +46,33 @@ public class BsonToJsonLiveTest {
 
     @AfterClass
     public static void tearDown() {
-        datastore.delete(datastore.createQuery(Book.class));
+        datastore.find(Book.class)
+                .filter(eq("isbn", "isbn"))
+                .filter(eq("title", "title"))
+                .filter(eq("author", "author"))
+                .filter(eq("cost", "3.95"))
+                .delete(new DeleteOptions().multi(true));
     }
 
     @Test
     public void givenBsonDocument_whenUsingStandardJsonTransformation_thenJsonDateIsObjectEpochTime() {
 
         String json;
-        try (MongoClient mongoClient = new MongoClient()) {
+        try (MongoClient mongoClient = MongoClients.create()) {
             MongoDatabase mongoDatabase = mongoClient.getDatabase(DB_NAME);
             Document bson = mongoDatabase.getCollection("Books").find().first();
-            json = bson.toJson();
+            json = bson.toJson(JsonWriterSettings
+                    .builder()
+                    .dateTimeConverter(new JSONDateFormatEpochTimeConverter())
+                    .build());
         }
 
         String expectedJson = "{\"_id\": \"isbn\", " +
-            "\"className\": \"com.baeldung.bsontojson.Book\", " +
+            "\"_t\": \"Book\", " +
             "\"title\": \"title\", " +
             "\"author\": \"author\", " +
             "\"publisher\": {\"_id\": {\"$oid\": \"fffffffffffffffffffffffa\"}, " +
-            "\"name\": \"publisher\"}, " +
+            "\"_t\": \"Publisher\", \"name\": \"publisher\"}, " +
             "\"price\": 3.95, " +
             "\"publishDate\": {\"$date\": 1577898812000}}";
 
@@ -71,12 +81,11 @@ public class BsonToJsonLiveTest {
         assertEquals(expectedJson, json);
     }
 
-
     @Test
     public void givenBsonDocument_whenUsingRelaxedJsonTransformation_thenJsonDateIsObjectIsoDate() {
 
         String json;
-        try (MongoClient mongoClient = new MongoClient()) {
+        try (MongoClient mongoClient = MongoClients.create()) {
             MongoDatabase mongoDatabase = mongoClient.getDatabase(DB_NAME);
             Document bson = mongoDatabase.getCollection("Books").find().first();
             json = bson.toJson(JsonWriterSettings
@@ -86,11 +95,11 @@ public class BsonToJsonLiveTest {
         }
 
         String expectedJson = "{\"_id\": \"isbn\", " +
-            "\"className\": \"com.baeldung.bsontojson.Book\", " +
+            "\"_t\": \"Book\", " +
             "\"title\": \"title\", " +
             "\"author\": \"author\", " +
             "\"publisher\": {\"_id\": {\"$oid\": \"fffffffffffffffffffffffa\"}, " +
-            "\"name\": \"publisher\"}, " +
+            "\"_t\": \"Publisher\", \"name\": \"publisher\"}, " +
             "\"price\": 3.95, " +
             "\"publishDate\": {\"$date\": \"2020-01-01T17:13:32Z\"}}";
 
@@ -103,7 +112,7 @@ public class BsonToJsonLiveTest {
     public void givenBsonDocument_whenUsingCustomJsonTransformation_thenJsonDateIsStringField() {
 
         String json;
-        try (MongoClient mongoClient = new MongoClient()) {
+        try (MongoClient mongoClient = MongoClients.create()) {
             MongoDatabase mongoDatabase = mongoClient.getDatabase(DB_NAME);
             Document bson = mongoDatabase.getCollection("Books").find().first();
             json = bson.toJson(JsonWriterSettings
@@ -113,11 +122,11 @@ public class BsonToJsonLiveTest {
         }
 
         String expectedJson = "{\"_id\": \"isbn\", " +
-            "\"className\": \"com.baeldung.bsontojson.Book\", " +
+            "\"_t\": \"Book\", " +
             "\"title\": \"title\", " +
             "\"author\": \"author\", " +
             "\"publisher\": {\"_id\": {\"$oid\": \"fffffffffffffffffffffffa\"}, " +
-            "\"name\": \"publisher\"}, " +
+            "\"_t\": \"Publisher\", \"name\": \"publisher\"}, " +
             "\"price\": 3.95, " +
             "\"publishDate\": \"2020-01-01T17:13:32Z\"}";
 
diff --git a/persistence-modules/java-mongodb/src/test/java/com/baeldung/bsontojson/JSONDateFormatEpochTimeConverter.java b/persistence-modules/java-mongodb/src/test/java/com/baeldung/bsontojson/JSONDateFormatEpochTimeConverter.java
new file mode 100644
index 0000000000..7f3a4f936f
--- /dev/null
+++ b/persistence-modules/java-mongodb/src/test/java/com/baeldung/bsontojson/JSONDateFormatEpochTimeConverter.java
@@ -0,0 +1,18 @@
+package com.baeldung.bsontojson;
+
+import org.bson.json.Converter;
+import org.bson.json.StrictJsonWriter;
+
+/**
+ * Convertor to epoch time
+ */
+public class JSONDateFormatEpochTimeConverter implements Converter<Long> {
+
+    @Override
+    public void convert(Long value, StrictJsonWriter writer) {
+        writer.writeStartObject();
+        writer.writeName("$date");
+        writer.writeNumber(String.valueOf(value));
+        writer.writeEndObject();
+    }
+}
diff --git a/persistence-modules/java-mongodb/src/test/java/com/baeldung/mongo/CollectionExistenceLiveTest.java b/persistence-modules/java-mongodb/src/test/java/com/baeldung/mongo/CollectionExistenceLiveTest.java
index ad839d1219..5be97bcb25 100644
--- a/persistence-modules/java-mongodb/src/test/java/com/baeldung/mongo/CollectionExistenceLiveTest.java
+++ b/persistence-modules/java-mongodb/src/test/java/com/baeldung/mongo/CollectionExistenceLiveTest.java
@@ -8,8 +8,8 @@ import org.bson.Document;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.mongodb.DB;
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 
@@ -22,7 +22,7 @@ public class CollectionExistenceLiveTest {
     @Before
     public void setup() {
         if (mongoClient == null) {
-            mongoClient = new MongoClient("localhost", 27017);
+            mongoClient = MongoClients.create("mongodb://localhost:27017");
             databaseName = "baeldung";
             testCollectionName = "student";
 
@@ -58,28 +58,16 @@ public class CollectionExistenceLiveTest {
 
     }
 
-    @Test
-    public void givenCollectionExists_whenCollectionAlreadyExists_thenCheckingForCollectionExistence() {
-
-        DB db = mongoClient.getDB(databaseName);
-        Boolean collectionStatus = db.collectionExists(testCollectionName);
-
-        Boolean expectedStatus = true;
-        assertEquals(expectedStatus, collectionStatus);
-
-    }
-
     @Test
     public void givenListCollectionNames_whenCollectionAlreadyExists_thenCheckingForCollectionExistence() {
 
         MongoDatabase database = mongoClient.getDatabase(databaseName);
         boolean collectionExists = database.listCollectionNames()
-            .into(new ArrayList<String>())
+            .into(new ArrayList<>())
             .contains(testCollectionName);
 
         Boolean expectedStatus = true;
         assertEquals(expectedStatus, collectionExists);
-
     }
 
     @Test
@@ -88,7 +76,7 @@ public class CollectionExistenceLiveTest {
         MongoDatabase database = mongoClient.getDatabase(databaseName);
 
         MongoCollection<Document> collection = database.getCollection(testCollectionName);
-        Boolean collectionExists = collection.count() > 0 ? true : false;
+        Boolean collectionExists = collection.countDocuments() > 0 ? true : false;
 
         Boolean expectedStatus = false;
         assertEquals(expectedStatus, collectionExists);
diff --git a/persistence-modules/java-mongodb/src/test/java/com/baeldung/morphia/MorphiaIntegrationTest.java b/persistence-modules/java-mongodb/src/test/java/com/baeldung/morphia/MorphiaIntegrationTest.java
index f508c5f525..d702c691d6 100644
--- a/persistence-modules/java-mongodb/src/test/java/com/baeldung/morphia/MorphiaIntegrationTest.java
+++ b/persistence-modules/java-mongodb/src/test/java/com/baeldung/morphia/MorphiaIntegrationTest.java
@@ -2,39 +2,44 @@ package com.baeldung.morphia;
 
 import static dev.morphia.aggregation.Group.grouping;
 import static dev.morphia.aggregation.Group.push;
+import static dev.morphia.query.experimental.filters.Filters.eq;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 
 import org.bson.types.ObjectId;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.baeldung.morphia.domain.Author;
 import com.baeldung.morphia.domain.Book;
 import com.baeldung.morphia.domain.Publisher;
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.model.ReturnDocument;
 
 import dev.morphia.Datastore;
+import dev.morphia.DeleteOptions;
+import dev.morphia.ModifyOptions;
 import dev.morphia.Morphia;
+import dev.morphia.query.FindOptions;
 import dev.morphia.query.Query;
-import dev.morphia.query.UpdateOperations;
+import dev.morphia.query.experimental.updates.UpdateOperators;
 
-@Ignore
 public class MorphiaIntegrationTest {
 
     private static Datastore datastore;
     private static ObjectId id = new ObjectId();
 
-    @BeforeClass
+   @BeforeClass
     public static void setUp() {
-        Morphia morphia = new Morphia();
-        morphia.mapPackage("com.baeldung.morphia");
-        datastore = morphia.createDatastore(new MongoClient(), "library");
+        datastore = Morphia.createDatastore(MongoClients.create(), "library");
+        datastore.getMapper().mapPackage("com.baeldung.morphia");
         datastore.ensureIndexes();
     }
 
@@ -47,11 +52,11 @@ public class MorphiaIntegrationTest {
         datastore.save(companionBook);
         datastore.save(book);
 
-        List<Book> books = datastore.createQuery(Book.class)
-            .field("title")
-            .contains("Learning Java")
-            .find()
-            .toList();
+        Query<Book> booksQuery = datastore.find(Book.class)
+                .filter(eq("title", "Learning Java"));
+        List<Book> books = StreamSupport
+                .stream(booksQuery.spliterator(), true)
+                .collect(Collectors.toList());
         assertEquals(1, books.size());
         assertEquals(book, books.get(0));
     }
@@ -61,19 +66,13 @@ public class MorphiaIntegrationTest {
         Publisher publisher = new Publisher(id, "Awsome Publisher");
         Book book = new Book("9781565927186", "Learning Java", "Tom Kirkman", 3.95, publisher);
         datastore.save(book);
-        Query<Book> query = datastore.createQuery(Book.class)
-            .field("title")
-            .contains("Learning Java");
-        UpdateOperations<Book> updates = datastore.createUpdateOperations(Book.class)
-            .inc("price", 1);
-        datastore.update(query, updates);
-        List<Book> books = datastore.createQuery(Book.class)
-            .field("title")
-            .contains("Learning Java")
-            .find()
-            .toList();
-        assertEquals(4.95, books.get(0)
-            .getCost());
+
+        final Book execute = datastore.find(Book.class)
+                .filter(eq("title", "Learning Java"))
+                .modify(UpdateOperators.set("price", 4.95))
+                .execute(new ModifyOptions().returnDocument(ReturnDocument.AFTER));
+
+        assertEquals(4.95, execute.getCost());
     }
 
     @Test
@@ -81,16 +80,12 @@ public class MorphiaIntegrationTest {
         Publisher publisher = new Publisher(id, "Awsome Publisher");
         Book book = new Book("9781565927186", "Learning Java", "Tom Kirkman", 3.95, publisher);
         datastore.save(book);
-        Query<Book> query = datastore.createQuery(Book.class)
-            .field("title")
-            .contains("Learning Java");
-        datastore.delete(query);
-        List<Book> books = datastore.createQuery(Book.class)
-            .field("title")
-            .contains("Learning Java")
-            .find()
-            .toList();
-        assertEquals(0, books.size());
+        datastore.find(Book.class)
+                .filter(eq("title", "Learning Java"))
+                .delete(new DeleteOptions().multi(true));
+        Query<Book> books = datastore.find(Book.class)
+                .filter(eq("title", "Learning Java"));
+        assertFalse(books.iterator().hasNext());
     }
 
     @Test
@@ -107,7 +102,6 @@ public class MorphiaIntegrationTest {
             .out(Author.class);
 
         assertTrue(authors.hasNext());
-
     }
 
     @Test
@@ -115,17 +109,12 @@ public class MorphiaIntegrationTest {
         Publisher publisher = new Publisher(id, "Awsome Publisher");
         Book book = new Book("9781565927186", "Learning Java", "Tom Kirkman", 3.95, publisher);
         datastore.save(book);
-        List<Book> books = datastore.createQuery(Book.class)
-            .field("title")
-            .contains("Learning Java")
-            .project("title", true)
-            .find()
-            .toList();
-        assertEquals(books.size(), 1);
-        assertEquals("Learning Java", books.get(0)
-            .getTitle());
-        assertNull(books.get(0)
-            .getAuthor());
+        List<Book> books = datastore.find(Book.class)
+                .filter(eq("title", "Learning Java"))
+                .iterator(new FindOptions().projection().include("title")).toList();
+        assertEquals( 1, books.size());
+        assertEquals("Learning Java", books.get(0).getTitle());
+        assertNull(books.get(0).getAuthor());
     }
 
 }
diff --git a/persistence-modules/java-mongodb/src/test/java/com/baeldung/tagging/TaggingLiveTest.java b/persistence-modules/java-mongodb/src/test/java/com/baeldung/tagging/TaggingLiveTest.java
index edd8e22775..2a7afbd753 100644
--- a/persistence-modules/java-mongodb/src/test/java/com/baeldung/tagging/TaggingLiveTest.java
+++ b/persistence-modules/java-mongodb/src/test/java/com/baeldung/tagging/TaggingLiveTest.java
@@ -100,9 +100,7 @@ public class TaggingLiveTest {
 		results.forEach(System.out::println);
 
 		Assert.assertEquals(1, results.size());
-		results.forEach(post -> {
-			Assert.assertFalse(post.getTags().contains("MongoDB"));
-		});
+		results.forEach(post -> Assert.assertFalse(post.getTags().contains("MongoDB")));
 	}
 
 	/**
diff --git a/persistence-modules/java-mongodb/src/test/java/com/baeldung/update/UpdateFieldLiveTest.java b/persistence-modules/java-mongodb/src/test/java/com/baeldung/update/UpdateFieldLiveTest.java
index 47114e1f1a..ef725a9435 100644
--- a/persistence-modules/java-mongodb/src/test/java/com/baeldung/update/UpdateFieldLiveTest.java
+++ b/persistence-modules/java-mongodb/src/test/java/com/baeldung/update/UpdateFieldLiveTest.java
@@ -8,7 +8,8 @@ import org.bson.Document;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.Filters;
@@ -27,7 +28,7 @@ public class UpdateFieldLiveTest {
     @BeforeClass
     public static void setup() {
         if (mongoClient == null) {
-            mongoClient = new MongoClient("localhost", 27017);
+            mongoClient = MongoClients.create("mongodb://localhost:27017");
             db = mongoClient.getDatabase("baeldung");
             collection = db.getCollection("student");
 
diff --git a/persistence-modules/java-mongodb/src/test/java/com/baeldung/update/UpdateMultipleFieldsLiveTest.java b/persistence-modules/java-mongodb/src/test/java/com/baeldung/update/UpdateMultipleFieldsLiveTest.java
index d06de23423..19edda5870 100644
--- a/persistence-modules/java-mongodb/src/test/java/com/baeldung/update/UpdateMultipleFieldsLiveTest.java
+++ b/persistence-modules/java-mongodb/src/test/java/com/baeldung/update/UpdateMultipleFieldsLiveTest.java
@@ -8,7 +8,8 @@ import org.junit.Before;
 import org.junit.Test;
 
 import com.mongodb.BasicDBObject;
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.Filters;
@@ -23,7 +24,7 @@ public class UpdateMultipleFieldsLiveTest {
     @Before
     public void setup() {
         if (mongoClient == null) {
-            mongoClient = new MongoClient("localhost", 27017);
+            mongoClient = MongoClients.create("mongodb://localhost:27017");
             db = mongoClient.getDatabase("baeldung");
             collection = db.getCollection("employee");
 
diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml
index 8c191b0abd..b92fb45e6f 100644
--- a/persistence-modules/pom.xml
+++ b/persistence-modules/pom.xml
@@ -21,7 +21,6 @@
         <module>blaze-persistence</module>
         <module>core-java-persistence</module>
         <module>core-java-persistence-2</module>
-        <module>deltaspike</module>
         <module>elasticsearch</module>
         <module>flyway</module>
         <module>flyway-repair</module>
@@ -29,7 +28,6 @@
         <module>hibernate5</module>
         <module>hibernate-mapping</module> <!-- long running -->
         <module>hibernate-mapping-2</module>
-        <module>hibernate-ogm</module>
         <module>hibernate-annotations</module>
         <module>hibernate-exceptions</module>
         <module>hibernate-libraries</module>
@@ -37,26 +35,27 @@
         <module>hibernate-queries</module>
         <module>hibernate-enterprise</module>
         <module>influxdb</module>
-        <module>java-cassandra</module>
+        <!-- <module>java-cassandra</module> FAILED -->
         <module>java-cockroachdb</module>
         <module>java-jdbi</module>
-        <module>java-jpa</module> <!-- long running -->
-        <module>java-jpa-2</module> <!-- long running -->
+        <!-- <module>java-jpa</module> FAILED --> <!-- long running -->
+        <!-- <module>java-jpa-2</module> FAILED --> <!-- long running -->
         <module>java-jpa-3</module>
-        <module>java-mongodb</module> <!-- long running -->
+		<!-- enable it when persistence-modules is migrated to JDK9+ -->
+		<!-- <module>java-mongodb</module>--> <!-- long running -->
         <module>java-mongodb-2</module> <!-- long running -->
         <module>java-mongodb-3</module> <!-- long running -->
         <module>java-mongodb-queries</module> <!-- long running -->
-        <module>jnosql</module> <!-- long running -->
+        <!-- <module>jnosql</module> FAILED --> <!-- long running -->
         <module>jooq</module>
         <module>jpa-hibernate-cascade-type</module>
         <module>liquibase</module>
         <module>orientdb</module>
         <module>persistence-libraries</module>
-        <module>querydsl</module>
-        <module>r2dbc</module>
+        <!-- <module>querydsl</module> FAILED -->
+        <!-- <module>r2dbc</module> FAILED -->
         <module>read-only-transactions</module>
-        <module>redis</module>
+        <!-- <module>redis</module> FAILED -->
         <!-- <module>sirix</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
         <module>solr</module>
         <module>spring-boot-persistence-2</module>
@@ -70,11 +69,11 @@
         <module>spring-data-arangodb</module>
         <module>spring-data-cassandra</module>
         <module>spring-data-cassandra-test</module>
-        <module>spring-data-cassandra-reactive</module>
+        <!-- <module>spring-data-cassandra-reactive</module> FAILED -->
         <module>spring-data-cosmosdb</module>
-        <module>spring-data-couchbase-2</module>
+        <!-- <module>spring-data-couchbase-2</module> FAILED -->
         <module>spring-data-dynamodb</module>
-        <module>spring-data-eclipselink</module>
+        <!-- <module>spring-data-eclipselink</module> FAILED -->
         <module>spring-data-elasticsearch</module>
         <!-- <module>spring-data-gemfire</module> Won't Fix in JAVA-14499, The dependencies used are -->
         <!-- no longer available or maintained. Ref: https://spring.io/projects/spring-data-gemfire#overview -->
@@ -88,35 +87,36 @@
         <module>spring-data-jpa-query</module>
         <module>spring-data-jpa-query-2</module>
         <module>spring-data-jpa-query-3</module>
-        <module>spring-data-jpa-repo</module>
+        <!-- <module>spring-data-jpa-repo</module> FAILED -->
         <module>spring-data-jpa-repo-2</module>
         <module>spring-data-jdbc</module>
         <module>spring-data-keyvalue</module>
-        <module>spring-data-mongodb</module>
+        <!-- <module>spring-data-mongodb</module> FAILED -->
         <module>spring-data-mongodb-2</module>
         <module>spring-data-mongodb-reactive</module>
-        <module>spring-data-neo4j</module>
+        <!-- <module>spring-data-neo4j</module> FAILED -->
         <module>spring-data-redis</module>
-        <module>spring-data-rest</module>
+<!--        Moved to JDK9+ profiles-->
+<!--        <module>spring-data-rest</module>-->
         <module>spring-data-rest-2</module>
         <module>spring-data-rest-querydsl</module>
         <module>spring-data-solr</module>
-        <module>spring-hibernate-3</module>
-        <module>spring-hibernate-5</module> <!-- long running -->
-        <module>spring-jpa</module>
-        <module>spring-jpa-2</module>
+        <!-- <module>spring-hibernate-3</module> FAILED -->
+        <!-- <module>spring-hibernate-5</module> FAILED --> <!-- long running -->
+        <!-- <module>spring-jpa</module>
+        <module>spring-jpa-2</module> FAILED -->
         <module>spring-jdbc</module>
-        <module>spring-jooq</module>
+<!--        <module>spring-jooq</module>--> <!-- parent-boot-2 is its parent. -->
         <module>spring-mybatis</module>
         <module>spring-persistence-simple</module>
     </modules>
 
     <properties>
         <!-- persistence -->
-        <hibernate.version>5.2.17.Final</hibernate.version>
-        <postgresql.version>42.2.20</postgresql.version>
-        <hsqldb.version>2.3.4</hsqldb.version>
+        <hibernate.version>6.2.0.Final</hibernate.version>
+        <postgresql.version>42.5.4</postgresql.version>
+        <hsqldb.version>2.7.1</hsqldb.version>
         <testcontainers.version>1.16.3</testcontainers.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/persistence-modules/questdb/README.md b/persistence-modules/questdb/README.md
new file mode 100644
index 0000000000..cd5d11f7da
--- /dev/null
+++ b/persistence-modules/questdb/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [Introduction to QuestDB](https://www.baeldung.com/java-questdb)
diff --git a/persistence-modules/questdb/pom.xml b/persistence-modules/questdb/pom.xml
new file mode 100644
index 0000000000..ee3db461cb
--- /dev/null
+++ b/persistence-modules/questdb/pom.xml
@@ -0,0 +1,29 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
+
+    <groupId>org.baeldung</groupId>
+    <artifactId>questdb</artifactId>
+    <name>questdb</name>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-java</relativePath>
+    </parent>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <questdb.version>7.0.0</questdb.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.questdb</groupId>
+            <artifactId>questdb</artifactId>
+            <version>${questdb.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/persistence-modules/questdb/src/main/java/com/baeldung/InsertData.java b/persistence-modules/questdb/src/main/java/com/baeldung/InsertData.java
new file mode 100644
index 0000000000..9699b7c2d0
--- /dev/null
+++ b/persistence-modules/questdb/src/main/java/com/baeldung/InsertData.java
@@ -0,0 +1,29 @@
+package com.baeldung;
+
+import io.questdb.client.Sender;
+
+
+public class InsertData {
+    static final String SENSORS_TABLE_NAME = "sensors";
+
+    public static void main(String[] args) {
+        try (Sender sender = Sender.builder().address("localhost:9009").build()) {
+            sender.table(SENSORS_TABLE_NAME)
+                    .stringColumn("id", "KTC")
+                    .stringColumn("name", "Kitchen temperature (Celsius)")
+                    .doubleColumn("currentValue", 20)
+                    .atNow();
+            sender.table(SENSORS_TABLE_NAME)
+                    .stringColumn("id", "SMT")
+                    .stringColumn("name", "Smart Garden temperature (Celsius)")
+                    .doubleColumn("currentValue", 28.5)
+                    .atNow();
+            sender.table(SENSORS_TABLE_NAME)
+                    .stringColumn("id", "RM1")
+                    .stringColumn("name", "Room 1")
+                    .doubleColumn("currentValue", 19.5)
+                    .doubleColumn("idealValue", 18.5)
+                    .atNow();
+        }
+    }
+}
\ No newline at end of file
diff --git a/persistence-modules/r2dbc/README.md b/persistence-modules/r2dbc/README.md
index 02d3cbf5fc..ceb7982cd4 100644
--- a/persistence-modules/r2dbc/README.md
+++ b/persistence-modules/r2dbc/README.md
@@ -1,3 +1,3 @@
 ### Relevant Articles:
 - [R2DBC – Reactive Relational Database Connectivity](https://www.baeldung.com/r2dbc)
-
+- [Spring R2DBC Migrations Using Flyway](https://www.baeldung.com/spring-r2dbc-flyway)
diff --git a/persistence-modules/r2dbc/pom.xml b/persistence-modules/r2dbc/pom.xml
index f32b37974b..cfe344eba9 100644
--- a/persistence-modules/r2dbc/pom.xml
+++ b/persistence-modules/r2dbc/pom.xml
@@ -49,6 +49,34 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-r2dbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>r2dbc-postgresql</artifactId>
+            <version>${r2dbc.postgresql.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${jdbc.postgresql.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-core</artifactId>
+            <version>${flyway.core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.r2dbc</groupId>
+            <artifactId>r2dbc-h2</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -60,4 +88,10 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+    <properties>
+        <flyway.core.version>9.14.1</flyway.core.version>
+        <jdbc.postgresql.version>42.5.2</jdbc.postgresql.version>
+        <r2dbc.postgresql.version>1.0.0.RELEASE</r2dbc.postgresql.version>
+    </properties>
+
+</project>
diff --git a/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/SpringWebfluxFlywayApplication.java b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/SpringWebfluxFlywayApplication.java
new file mode 100644
index 0000000000..7eb3f8180c
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/SpringWebfluxFlywayApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.examples.r2dbc.flyway;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpringWebfluxFlywayApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringWebfluxFlywayApplication.class, args);
+    }
+
+}
diff --git a/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/config/DatabaseConfig.java b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/config/DatabaseConfig.java
new file mode 100644
index 0000000000..d4a4be93e9
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/config/DatabaseConfig.java
@@ -0,0 +1,23 @@
+package com.baeldung.examples.r2dbc.flyway.config;
+
+import org.flywaydb.core.Flyway;
+import org.springframework.boot.autoconfigure.flyway.FlywayProperties;
+import org.springframework.boot.autoconfigure.r2dbc.R2dbcProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableConfigurationProperties({ R2dbcProperties.class, FlywayProperties.class })
+class DatabaseConfig {
+    @Bean(initMethod = "migrate")
+    public Flyway flyway(FlywayProperties flywayProperties, R2dbcProperties r2dbcProperties) {
+        return Flyway.configure()
+          .dataSource(flywayProperties.getUrl(), r2dbcProperties.getUsername(), r2dbcProperties.getPassword())
+          .locations(flywayProperties.getLocations()
+            .stream()
+            .toArray(String[]::new))
+          .baselineOnMigrate(true)
+          .load();
+    }
+}
\ No newline at end of file
diff --git a/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/model/Department.java b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/model/Department.java
new file mode 100644
index 0000000000..cfb1555847
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/model/Department.java
@@ -0,0 +1,40 @@
+package com.baeldung.examples.r2dbc.flyway.model;
+
+import java.util.UUID;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.domain.Persistable;
+import org.springframework.data.relational.core.mapping.Table;
+
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Table("department")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Department implements Persistable<UUID> {
+
+    @Id
+    @JsonProperty("uuid")
+    @JsonAlias("id")
+    private UUID id;
+
+    @NotNull
+    @Size(max = 255, message = "The property 'name' must be less than or equal to 255 characters.")
+    private String name;
+
+    @Override
+    @JsonIgnore
+    public boolean isNew() {
+        return true;
+    }
+}
diff --git a/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/model/Student.java b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/model/Student.java
new file mode 100644
index 0000000000..94dbe6e97f
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/model/Student.java
@@ -0,0 +1,55 @@
+package com.baeldung.examples.r2dbc.flyway.model;
+
+import java.time.LocalDate;
+import java.util.UUID;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.domain.Persistable;
+import org.springframework.data.relational.core.mapping.Table;
+
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Table("student")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class Student implements Persistable<UUID> {
+
+    @Id
+    @JsonProperty("uuid")
+    @JsonAlias("id")
+    private UUID id;
+
+    @NotNull
+    @Size(max = 255, message = "The property 'firstName' must be less than or equal to 255 characters.")
+    private String firstName;
+
+    @NotNull
+    @Size(max = 255, message = "The property 'lastName' must be less than or equal to 255 characters.")
+    private String lastName;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private LocalDate dateOfBirth;
+
+    @NotNull
+    private UUID department;
+
+    @Override
+    @JsonIgnore
+    public boolean isNew() {
+        return true;
+    }
+}
+
diff --git a/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/repository/DepartmentRepository.java b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/repository/DepartmentRepository.java
new file mode 100644
index 0000000000..85edf964b7
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/repository/DepartmentRepository.java
@@ -0,0 +1,10 @@
+package com.baeldung.examples.r2dbc.flyway.repository;
+
+import java.util.UUID;
+
+import org.springframework.data.repository.reactive.ReactiveCrudRepository;
+
+import com.baeldung.examples.r2dbc.flyway.model.Department;
+
+public interface DepartmentRepository extends ReactiveCrudRepository<Department, UUID> {
+}
diff --git a/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/repository/StudentRepository.java b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/repository/StudentRepository.java
new file mode 100644
index 0000000000..1fc3ae1641
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/repository/StudentRepository.java
@@ -0,0 +1,10 @@
+package com.baeldung.examples.r2dbc.flyway.repository;
+
+import java.util.UUID;
+
+import org.springframework.data.repository.reactive.ReactiveCrudRepository;
+
+import com.baeldung.examples.r2dbc.flyway.model.Student;
+
+public interface StudentRepository extends ReactiveCrudRepository<Student, UUID> {
+}
diff --git a/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/rest/DepartmentResource.java b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/rest/DepartmentResource.java
new file mode 100644
index 0000000000..32c3d5bbd8
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/rest/DepartmentResource.java
@@ -0,0 +1,29 @@
+package com.baeldung.examples.r2dbc.flyway.rest;
+
+import java.util.List;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baeldung.examples.r2dbc.flyway.model.Department;
+import com.baeldung.examples.r2dbc.flyway.repository.DepartmentRepository;
+
+import lombok.RequiredArgsConstructor;
+import reactor.core.publisher.Mono;
+
+@RestController
+@RequiredArgsConstructor
+public class DepartmentResource {
+
+    private final DepartmentRepository departmentRepository;
+
+    @GetMapping(path = "/department")
+    public Mono<ResponseEntity<List<Department>>> getDepartments() {
+        return departmentRepository.findAll()
+          .collectList()
+          .map(departments -> new ResponseEntity(departments, HttpStatus.OK));
+    }
+
+}
diff --git a/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/rest/StudentResource.java b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/rest/StudentResource.java
new file mode 100644
index 0000000000..624f673406
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/java/com/baeldung/examples/r2dbc/flyway/rest/StudentResource.java
@@ -0,0 +1,29 @@
+package com.baeldung.examples.r2dbc.flyway.rest;
+
+import javax.validation.Valid;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baeldung.examples.r2dbc.flyway.model.Student;
+import com.baeldung.examples.r2dbc.flyway.repository.StudentRepository;
+
+import lombok.RequiredArgsConstructor;
+import reactor.core.publisher.Mono;
+
+@RestController
+@RequiredArgsConstructor
+public class StudentResource {
+
+    private final StudentRepository studentRepository;
+
+    @PostMapping(path = "/student")
+    public Mono<ResponseEntity<Student>> createStudent(@RequestBody @Valid Mono<Student> createStudentRequest) {
+        return createStudentRequest.flatMap(studentRepository::save)
+          .map(student -> new ResponseEntity(student, HttpStatus.CREATED));
+    }
+
+}
diff --git a/persistence-modules/r2dbc/src/main/resources/application.yml b/persistence-modules/r2dbc/src/main/resources/application.yml
index bb47c7261c..919a088209 100644
--- a/persistence-modules/r2dbc/src/main/resources/application.yml
+++ b/persistence-modules/r2dbc/src/main/resources/application.yml
@@ -1,7 +1,14 @@
 spring:
   application:
     name: r2dbc-test
-    
+
+  r2dbc:
+    username: local
+    password: local
+    url: r2dbc:postgresql://localhost:8082/flyway-test-db
+  flyway:
+    url: jdbc:postgresql://localhost:8082/flyway-test-db
+    locations: classpath:db/postgres/migration
 # R2DBC URL
 r2dbc:
   url: r2dbc:h2:mem://./testdb
diff --git a/persistence-modules/r2dbc/src/main/resources/db/docker-compose.yml b/persistence-modules/r2dbc/src/main/resources/db/docker-compose.yml
new file mode 100644
index 0000000000..5b95899e4b
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/resources/db/docker-compose.yml
@@ -0,0 +1,14 @@
+version: '3.9'
+networks:
+  obref:
+services:
+  postgres_db_service:
+    container_name: postgres_db_service
+    image: postgres:11
+    ports:
+      - "8082:5432"
+    hostname:   postgres_db_service
+    environment:
+      - POSTGRES_PASSWORD=local
+      - POSTGRES_USER=local
+      - POSTGRES_DB=flyway-test-db
\ No newline at end of file
diff --git a/persistence-modules/r2dbc/src/main/resources/db/postgres/migration/V1_1__create_tables.sql b/persistence-modules/r2dbc/src/main/resources/db/postgres/migration/V1_1__create_tables.sql
new file mode 100644
index 0000000000..23ecd2ca59
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/resources/db/postgres/migration/V1_1__create_tables.sql
@@ -0,0 +1,17 @@
+
+CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
+
+CREATE TABLE IF NOT EXISTS department
+(
+    id uuid PRIMARY KEY UNIQUE DEFAULT uuid_generate_v4(),
+    name varchar(255)
+);
+
+CREATE TABLE IF NOT EXISTS student
+(
+    id uuid PRIMARY KEY UNIQUE DEFAULT uuid_generate_v4(),
+    first_name  varchar(255),
+    last_name   varchar(255),
+    date_of_birth  DATE NOT NULL,
+    department uuid NOT NULL CONSTRAINT student_foreign_key1 REFERENCES department (id)
+);
\ No newline at end of file
diff --git a/persistence-modules/r2dbc/src/main/resources/db/postgres/migration/V1_2__insert_department.sql b/persistence-modules/r2dbc/src/main/resources/db/postgres/migration/V1_2__insert_department.sql
new file mode 100644
index 0000000000..62fa654d57
--- /dev/null
+++ b/persistence-modules/r2dbc/src/main/resources/db/postgres/migration/V1_2__insert_department.sql
@@ -0,0 +1,3 @@
+
+insert into department(name) values ('Computer Science');
+insert into department(name) values ('Biomedical');
\ No newline at end of file
diff --git a/persistence-modules/r2dbc/src/test/java/com/baeldung/examples/r2dbc/flyway/rest/StudentResourceUnitTest.java b/persistence-modules/r2dbc/src/test/java/com/baeldung/examples/r2dbc/flyway/rest/StudentResourceUnitTest.java
new file mode 100644
index 0000000000..455b6862f8
--- /dev/null
+++ b/persistence-modules/r2dbc/src/test/java/com/baeldung/examples/r2dbc/flyway/rest/StudentResourceUnitTest.java
@@ -0,0 +1,71 @@
+package com.baeldung.examples.r2dbc.flyway.rest;
+
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+import java.time.LocalDate;
+import java.util.List;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import org.springframework.web.reactive.function.BodyInserters;
+
+import com.baeldung.examples.r2dbc.flyway.model.Department;
+import com.baeldung.examples.r2dbc.flyway.model.Student;
+
+import reactor.core.publisher.Mono;
+
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = RANDOM_PORT)
+class StudentResourceUnitTest {
+
+    private static final String DEPARTMENT_ENDPOINT = "/department";
+    private static final String STUDENT_ENDPOINT = "/student";
+
+    @Autowired
+    protected WebTestClient webTestClient;
+
+    @Test
+    void givenDepartmentExists_WhenCreateStudentRequestIsSent_ShouldBeProcessedSuccessfully() {
+
+        // Given
+        List<Department> departmentList = webTestClient.get()
+          .uri(DEPARTMENT_ENDPOINT)
+          .exchange()
+          .expectStatus()
+          .isOk()
+          .expectBodyList(Department.class)
+          .returnResult()
+          .getResponseBody();
+
+        Assertions.assertNotNull(departmentList);
+
+        // When
+        Student student = webTestClient.post()
+          .uri(STUDENT_ENDPOINT)
+          .body(BodyInserters.fromPublisher(Mono.just(Student.builder()
+            .firstName("John")
+            .lastName("Doe")
+            .dateOfBirth(LocalDate.of(2015, 12, 1))
+            .department(departmentList.get(0)
+              .getId())
+            .build()), Student.class))
+          .exchange()
+          .expectStatus()
+          .isEqualTo(201)
+          .expectBody(Student.class)
+          .returnResult()
+          .getResponseBody();
+
+        // Then
+        Assertions.assertNotNull(student.getId());
+        Assertions.assertEquals("John", student.getFirstName());
+        Assertions.assertEquals("Doe", student.getLastName());
+        Assertions.assertEquals(LocalDate.of(2015, 12, 1), student.getDateOfBirth());
+    }
+
+}
\ No newline at end of file
diff --git a/persistence-modules/r2dbc/src/test/resources/application.yml b/persistence-modules/r2dbc/src/test/resources/application.yml
index 8925116e4a..f99f02c9c1 100644
--- a/persistence-modules/r2dbc/src/test/resources/application.yml
+++ b/persistence-modules/r2dbc/src/test/resources/application.yml
@@ -1,6 +1,32 @@
 # R2DBC Test configuration
 r2dbc:
   url: r2dbc:h2:mem://./testdb
-  
+  user: local
+  password: local
+
+server:
+  port: 8080
+
+spring:
+  r2dbc:
+    host: localhost
+    port: 8082
+    database: testdb
+    username: local
+    password: local
+
+  h2:
+    console:
+      enabled: true
+      path: h2-console
+
+
+  flyway:
+    url: jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;
+    user: local
+    password: local
+    locations: classpath:db/h2/migration
+  main:
+    allow-bean-definition-overriding: true
   
   
diff --git a/persistence-modules/r2dbc/src/test/resources/db/h2/migration/V1_1__create_tables.sql b/persistence-modules/r2dbc/src/test/resources/db/h2/migration/V1_1__create_tables.sql
new file mode 100644
index 0000000000..388b23fcf5
--- /dev/null
+++ b/persistence-modules/r2dbc/src/test/resources/db/h2/migration/V1_1__create_tables.sql
@@ -0,0 +1,19 @@
+
+CREATE TABLE department
+(
+    id uuid DEFAULT random_uuid() PRIMARY KEY UNIQUE NOT NULL,
+    name varchar(255)
+);
+
+CREATE TABLE student
+(
+    id uuid DEFAULT random_uuid() UNIQUE NOT NULL,
+    first_name  varchar(255),
+    last_name   varchar(255),
+    date_of_birth  DATE NOT NULL,
+    department uuid NOT NULL
+);
+
+
+ALTER TABLE student
+    ADD FOREIGN KEY (department) REFERENCES department(id);
\ No newline at end of file
diff --git a/persistence-modules/r2dbc/src/test/resources/db/h2/migration/V1_2__insert_department.sql b/persistence-modules/r2dbc/src/test/resources/db/h2/migration/V1_2__insert_department.sql
new file mode 100644
index 0000000000..62fa654d57
--- /dev/null
+++ b/persistence-modules/r2dbc/src/test/resources/db/h2/migration/V1_2__insert_department.sql
@@ -0,0 +1,3 @@
+
+insert into department(name) values ('Computer Science');
+insert into department(name) values ('Biomedical');
\ No newline at end of file
diff --git a/persistence-modules/rethinkdb/README.md b/persistence-modules/rethinkdb/README.md
new file mode 100644
index 0000000000..e8cf1415e7
--- /dev/null
+++ b/persistence-modules/rethinkdb/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Getting Started With RethinkDB](https://www.baeldung.com/rethinkdb)
diff --git a/persistence-modules/spring-boot-persistence-2/pom.xml b/persistence-modules/spring-boot-persistence-2/pom.xml
index 1a02b18e50..260c558875 100644
--- a/persistence-modules/spring-boot-persistence-2/pom.xml
+++ b/persistence-modules/spring-boot-persistence-2/pom.xml
@@ -17,13 +17,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.junit</groupId>
-                <artifactId>junit-bom</artifactId>
-                <version>${junit-jupiter.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
@@ -33,7 +26,7 @@
             </dependency>
             <dependency>
                 <groupId>org.jdbi</groupId>
-                <artifactId>jdbi3-spring4</artifactId>
+                <artifactId>jdbi3-spring5</artifactId>
                 <version>${jdbi.version}</version>
             </dependency>
             <dependency>
@@ -55,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>org.jdbi</groupId>
-            <artifactId>jdbi3-spring4</artifactId>
+            <artifactId>jdbi3-spring5</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jdbi</groupId>
@@ -103,6 +96,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql-connector-java.version}</version>
         </dependency>
         <dependency>
             <groupId>org.xerial</groupId>
@@ -143,10 +137,14 @@
     </build>
 
     <properties>
-        <jdbi.version>3.9.1</jdbi.version>
-        <spring.boot.dependencies>2.1.8.RELEASE</spring.boot.dependencies>
-        <c3p0.version>0.9.5.2</c3p0.version>
-        <oracle-database.version>21.1.0.0</oracle-database.version>
+        <jdbi.version>3.38.0</jdbi.version>
+        <spring.boot.dependencies>3.0.5</spring.boot.dependencies>
+        <c3p0.version>0.9.5.5</c3p0.version>
+        <oracle-database.version>21.9.0.0</oracle-database.version>
+        <!--add note in the root pom.xml-->
+        <org.slf4j.version>2.0.7</org.slf4j.version>
+        <logback.version>1.4.6</logback.version>
+        <mysql-connector-java.version>8.0.33</mysql-connector-java.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/boot/jdbi/JdbiConfiguration.java b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/boot/jdbi/JdbiConfiguration.java
index ddbe6cc118..d744a46f3f 100644
--- a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/boot/jdbi/JdbiConfiguration.java
+++ b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/boot/jdbi/JdbiConfiguration.java
@@ -31,11 +31,11 @@ public class JdbiConfiguration {
         
         // Register all available plugins
         log.info("[I27] Installing plugins... ({} found)", jdbiPlugins.size());
-        jdbiPlugins.forEach(plugin -> jdbi.installPlugin(plugin));
+        jdbiPlugins.forEach(jdbi::installPlugin);
         
         // Register all available rowMappers
         log.info("[I31] Installing rowMappers... ({} found)", rowMappers.size());
-        rowMappers.forEach(mapper -> jdbi.registerRowMapper(mapper));
+        rowMappers.forEach(jdbi::registerRowMapper);
         
         return jdbi;
     }
diff --git a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/boot/jdbi/domain/CarModel.java b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/boot/jdbi/domain/CarModel.java
index 80b615801b..36cfd59b6d 100644
--- a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/boot/jdbi/domain/CarModel.java
+++ b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/boot/jdbi/domain/CarModel.java
@@ -8,7 +8,7 @@ import lombok.Data;
 public class CarModel {
     private Long id;
     private String name;
-    private Integer year;
+    private Integer yearDate;
     private String sku;
     private Long makerId;
 }
diff --git a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/boot/jdbi/mapper/CarModelMapper.java b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/boot/jdbi/mapper/CarModelMapper.java
index eeceafd649..b2311ef6a9 100644
--- a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/boot/jdbi/mapper/CarModelMapper.java
+++ b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/boot/jdbi/mapper/CarModelMapper.java
@@ -18,7 +18,7 @@ public class CarModelMapper implements RowMapper<CarModel>{
             .id(rs.getLong("id"))
             .name(rs.getString("name"))
             .sku(rs.getString("sku"))
-            .year(rs.getInt("year"))
+            .yearDate(rs.getInt("year"))
             .build();
     }
 
diff --git a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/db/indexing/Image.java b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/db/indexing/Image.java
index e3fcf53f81..7c7a558777 100644
--- a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/db/indexing/Image.java
+++ b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/db/indexing/Image.java
@@ -1,9 +1,9 @@
 package com.baeldung.db.indexing;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Lob;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Lob;
 
 @Entity
 class Image {
diff --git a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/spring/oracle/pooling/entity/Book.java b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/spring/oracle/pooling/entity/Book.java
index fb2c3fcf6a..af4199e65b 100644
--- a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/spring/oracle/pooling/entity/Book.java
+++ b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/spring/oracle/pooling/entity/Book.java
@@ -1,9 +1,9 @@
 package com.baeldung.spring.oracle.pooling.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Entity
 public class Book {
diff --git a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/springboothsqldb/application/entities/Customer.java b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/springboothsqldb/application/entities/Customer.java
index ee2735abb8..cd4fafb60f 100644
--- a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/springboothsqldb/application/entities/Customer.java
+++ b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/springboothsqldb/application/entities/Customer.java
@@ -1,10 +1,10 @@
 package com.baeldung.springboothsqldb.application.entities;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "customers")
diff --git a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/states/UserEntity.java b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/states/UserEntity.java
index 90bd275240..8c3494d1e4 100644
--- a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/states/UserEntity.java
+++ b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/states/UserEntity.java
@@ -5,9 +5,9 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 @Entity
 @AllArgsConstructor
diff --git a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/states/UserEntityWithCascade.java b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/states/UserEntityWithCascade.java
index de0d62bfe2..ada6b87ae3 100644
--- a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/states/UserEntityWithCascade.java
+++ b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/states/UserEntityWithCascade.java
@@ -5,10 +5,10 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 
 @Entity
 @AllArgsConstructor
diff --git a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/tomcatconnectionpool/application/entities/Customer.java b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/tomcatconnectionpool/application/entities/Customer.java
index 712506eb98..02af097dc0 100644
--- a/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/tomcatconnectionpool/application/entities/Customer.java
+++ b/persistence-modules/spring-boot-persistence-2/src/main/java/com/baeldung/tomcatconnectionpool/application/entities/Customer.java
@@ -1,11 +1,11 @@
 package com.baeldung.tomcatconnectionpool.application.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "customers")
diff --git a/persistence-modules/spring-boot-persistence-2/src/main/resources/com/baeldung/boot/jdbi/dao/CarMakerDao/insert.sql b/persistence-modules/spring-boot-persistence-2/src/main/resources/com/baeldung/boot/jdbi/dao/CarMakerDao/insert.sql
index 0e045d7274..0b1a93158b 100644
--- a/persistence-modules/spring-boot-persistence-2/src/main/resources/com/baeldung/boot/jdbi/dao/CarMakerDao/insert.sql
+++ b/persistence-modules/spring-boot-persistence-2/src/main/resources/com/baeldung/boot/jdbi/dao/CarMakerDao/insert.sql
@@ -1,4 +1,4 @@
 --
 -- Insert
 --
-insert into car_maker(id,name) values (:id,:name);
+insert into car_maker(name) values (:name);
diff --git a/persistence-modules/spring-boot-persistence-2/src/main/resources/com/baeldung/boot/jdbi/dao/CarModelDao/insert.sql b/persistence-modules/spring-boot-persistence-2/src/main/resources/com/baeldung/boot/jdbi/dao/CarModelDao/insert.sql
index b277213584..6bca3a0d6d 100644
--- a/persistence-modules/spring-boot-persistence-2/src/main/resources/com/baeldung/boot/jdbi/dao/CarModelDao/insert.sql
+++ b/persistence-modules/spring-boot-persistence-2/src/main/resources/com/baeldung/boot/jdbi/dao/CarModelDao/insert.sql
@@ -1,8 +1,8 @@
 --
 -- Insert
 --
-insert into car_model(maker_fk,name,sku,year) values (
+insert into car_model(maker_fk,name,sku,yearDate) values (
  :makerId,
  :name,
  :sku,
- :year );
+ :yearDate );
diff --git a/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/boot/jdbi/SpringBootJdbiApplicationIntegrationTest.java b/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/boot/jdbi/SpringBootJdbiApplicationIntegrationTest.java
index ac5661afbc..948d197f14 100644
--- a/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/boot/jdbi/SpringBootJdbiApplicationIntegrationTest.java
+++ b/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/boot/jdbi/SpringBootJdbiApplicationIntegrationTest.java
@@ -76,7 +76,7 @@ public class SpringBootJdbiApplicationIntegrationTest {
     @Test
     public void givenExistingCarMaker_whenFindById_thenReturnExistingCarMaker() {
     
-        CarMaker maker = carMakerDao.findById(1l);
+        CarMaker maker = carMakerDao.findById(1L);
         assertThat(maker).isNotNull();
         assertThat(maker.getId()).isEqualTo(1);
         
@@ -85,12 +85,12 @@ public class SpringBootJdbiApplicationIntegrationTest {
     @Test
     public void givenExistingCarMaker_whenBulkInsertFails_thenRollback() {
         
-        CarMaker maker = carMakerDao.findById(1l);
+        CarMaker maker = carMakerDao.findById(1L);
         CarModel m1 = CarModel.builder()
           .makerId(maker.getId())
           .name("Model X1")
           .sku("1-M1")
-          .year(2019)
+          .yearDate(2019)
           .build();
         maker.getModels().add(m1);
 
@@ -98,7 +98,7 @@ public class SpringBootJdbiApplicationIntegrationTest {
             .makerId(maker.getId())
             .name("Model X1")
             .sku("1-M1")
-            .year(2019)
+            .yearDate(2019)
             .build();
         maker.getModels().add(m2);
         
diff --git a/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/db/indexing/FileSystemImageIntegrationTest.java b/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/db/indexing/FileSystemImageIntegrationTest.java
index 83f5bae095..809d04cc96 100644
--- a/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/db/indexing/FileSystemImageIntegrationTest.java
+++ b/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/db/indexing/FileSystemImageIntegrationTest.java
@@ -4,8 +4,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import java.io.File;
 import java.io.InputStream;
-import java.nio.file.Paths;
+import java.net.URISyntaxException;
+import java.net.URL;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,10 +66,13 @@ class FileSystemImageIntegrationTest {
 
     private FileSystemResource baeldungJpegResource() {
         ClassLoader classLoader = ClassLoader.getSystemClassLoader();
-        String imagePath = classLoader.getResource("baeldung.jpeg")
-            .getFile();
-
-        return new FileSystemResource(Paths.get(imagePath));
+        try {
+            final URL resource = classLoader.getResource("baeldung.jpeg");
+            if (resource != null) {
+                return new FileSystemResource(new File(resource.toURI()).getAbsolutePath());
+            }
+        } catch (URISyntaxException ignore) {}
+        return null;
     }
 
 }
diff --git a/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/db/indexing/ImageIntegrationTest.java b/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/db/indexing/ImageIntegrationTest.java
index e38e0a21a9..09e13aefd4 100644
--- a/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/db/indexing/ImageIntegrationTest.java
+++ b/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/db/indexing/ImageIntegrationTest.java
@@ -7,6 +7,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Optional;
@@ -68,11 +70,15 @@ class ImageIntegrationTest {
 
     private Image baeldungImage() throws IOException {
         ClassLoader classLoader = ClassLoader.getSystemClassLoader();
-
-        Image mockImage = new Image();
-        mockImage.setContent(Files.readAllBytes(Paths.get(classLoader.getResource("baeldung.jpeg")
-            .getFile())));
-        return mockImage;
+        try {
+            final URL resource = classLoader.getResource("baeldung.jpeg");
+            if (resource != null) {
+                Image mockImage = new Image();
+                mockImage.setContent(Files.readAllBytes(Paths.get(resource.toURI())));
+                return mockImage;
+            }
+        } catch (URISyntaxException ignore) {}
+        return null;
     }
 
 }
diff --git a/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/springboothsqldb/application/tests/CustomerControllerIntegrationTest.java b/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/springboothsqldb/application/tests/CustomerControllerIntegrationTest.java
index 6956df0b13..bdd9a19b68 100644
--- a/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/springboothsqldb/application/tests/CustomerControllerIntegrationTest.java
+++ b/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/springboothsqldb/application/tests/CustomerControllerIntegrationTest.java
@@ -29,8 +29,7 @@ public class CustomerControllerIntegrationTest {
 
     @Before
     public void setUpJsonMediaType() {
-        MEDIA_TYPE_JSON = new MediaType(MediaType.APPLICATION_JSON.getType(), MediaType.APPLICATION_JSON.getSubtype(), Charset.forName("utf8"));
-
+        MEDIA_TYPE_JSON = new MediaType(MediaType.APPLICATION_JSON.getType(), MediaType.APPLICATION_JSON.getSubtype());
     }
 
     @Test
diff --git a/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/states/UserEntityIntegrationTest.java b/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/states/UserEntityIntegrationTest.java
index 5d0dc99ad7..0ce3ff34ce 100644
--- a/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/states/UserEntityIntegrationTest.java
+++ b/persistence-modules/spring-boot-persistence-2/src/test/java/com/baeldung/states/UserEntityIntegrationTest.java
@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
diff --git a/persistence-modules/spring-boot-persistence-2/src/test/resources/data.sql b/persistence-modules/spring-boot-persistence-2/src/test/resources/data.sql
index e3e1f4ae32..fb97140b48 100644
--- a/persistence-modules/spring-boot-persistence-2/src/test/resources/data.sql
+++ b/persistence-modules/spring-boot-persistence-2/src/test/resources/data.sql
@@ -1,12 +1,12 @@
 
-insert into car_maker(id,name) values (1,'Special Motors');
-insert into car_maker(id,name) values (2,'BWM');
-insert into car_maker(id,name) values (3,'Dolores');
+insert into car_maker(id,name) values (99,'Special Motors');
+insert into car_maker(id,name) values (100,'BWM');
+insert into car_maker(id,name) values (102,'Dolores');
 
-insert into car_model(id,maker_fk,name,sku,year) values(1,1,'Muze','SM001',2018);
-insert into car_model(id,maker_fk,name,sku,year) values(2,1,'Empada','SM002',2008);
+insert into car_model(id,maker_fk,name,sku,yearDate) values(132,99,'Muze','SM001',2018);
+insert into car_model(id,maker_fk,name,sku,yearDate) values(145,99,'Empada','SM002',2008);
 
-insert into car_model(id,maker_fk,name,sku,year) values(4,2,'BWM-100','BWM100',2008);
-insert into car_model(id,maker_fk,name,sku,year) values(5,2,'BWM-200','BWM200',2009);
-insert into car_model(id,maker_fk,name,sku,year) values(6,2,'BWM-300','BWM300',2008);
+insert into car_model(id,maker_fk,name,sku,yearDate) values(43,100,'BWM-100','BWM100',2008);
+insert into car_model(id,maker_fk,name,sku,yearDate) values(564,100,'BWM-200','BWM200',2009);
+insert into car_model(id,maker_fk,name,sku,yearDate) values(343,100,'BWM-300','BWM300',2008);
 
diff --git a/persistence-modules/spring-boot-persistence-2/src/test/resources/schema.sql b/persistence-modules/spring-boot-persistence-2/src/test/resources/schema.sql
index 8d7db6c9f3..72f9e606de 100644
--- a/persistence-modules/spring-boot-persistence-2/src/test/resources/schema.sql
+++ b/persistence-modules/spring-boot-persistence-2/src/test/resources/schema.sql
@@ -19,9 +19,9 @@ create table car_model(
   maker_fk int not null, 
   name varchar(128) not null, 
   sku varchar(128) not null, 
-  year int not null 
+  yearDate int not null
 );
 
 create unique index ui_car_model_01 on car_model(maker_fk,sku);
-create unique index ui_car_model_02 on car_model(maker_fk,name,year);
+create unique index ui_car_model_02 on car_model(maker_fk,name,yearDate);
 
diff --git a/persistence-modules/spring-boot-persistence-h2/README.md b/persistence-modules/spring-boot-persistence-h2/README.md
index 1d47907a98..7f6e243677 100644
--- a/persistence-modules/spring-boot-persistence-h2/README.md
+++ b/persistence-modules/spring-boot-persistence-h2/README.md
@@ -5,3 +5,4 @@
 - [Hibernate @NotNull vs @Column(nullable = false)](https://www.baeldung.com/hibernate-notnull-vs-nullable)
 - [Quick Guide to Hibernate enable_lazy_load_no_trans Property](https://www.baeldung.com/hibernate-lazy-loading-workaround)
 - [Where Does H2’s Embedded Database Store The Data?](https://www.baeldung.com/h2-embedded-db-data-storage)
+- [Spring Boot H2 JdbcSQLSyntaxErrorException expected “identifier”](https://www.baeldung.com/spring-boot-h2-jdbcsqlsyntaxerrorexception-expected-identifier)
diff --git a/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2/exceptions/SpringBootH2Exceptions.java b/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2/exceptions/SpringBootH2Exceptions.java
new file mode 100644
index 0000000000..c7684423a2
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2/exceptions/SpringBootH2Exceptions.java
@@ -0,0 +1,15 @@
+package com.baeldung.h2.exceptions;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.PropertySource;
+
+@SpringBootApplication
+@PropertySource("classpath:app-h2.properties")
+public class SpringBootH2Exceptions {
+
+    public static void main(String... args) {
+        SpringApplication.run(SpringBootH2Exceptions.class, args);
+    }
+
+}
diff --git a/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2/exceptions/models/User.java b/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2/exceptions/models/User.java
new file mode 100644
index 0000000000..e54e725fd0
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2/exceptions/models/User.java
@@ -0,0 +1,38 @@
+package com.baeldung.h2.exceptions.models;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class User {
+
+    @Id
+    private int id;
+    private String login;
+    private String password;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getLogin() {
+        return login;
+    }
+
+    public void setLogin(String login) {
+        this.login = login;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+}
diff --git a/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2/exceptions/repos/UserRepository.java b/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2/exceptions/repos/UserRepository.java
new file mode 100644
index 0000000000..d014fb16c6
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2/exceptions/repos/UserRepository.java
@@ -0,0 +1,11 @@
+package com.baeldung.h2.exceptions.repos;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.baeldung.h2.exceptions.models.User;
+
+@Repository
+public interface UserRepository extends JpaRepository<User, Integer> {
+
+}
diff --git a/persistence-modules/spring-boot-persistence-h2/src/main/resources/app-h2.properties b/persistence-modules/spring-boot-persistence-h2/src/main/resources/app-h2.properties
new file mode 100644
index 0000000000..bb88e7fef4
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-h2/src/main/resources/app-h2.properties
@@ -0,0 +1 @@
+spring.sql.init.data-locations=user-data.sql
diff --git a/persistence-modules/spring-boot-persistence-h2/src/main/resources/user-data.sql b/persistence-modules/spring-boot-persistence-h2/src/main/resources/user-data.sql
new file mode 100644
index 0000000000..cea758c74e
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-h2/src/main/resources/user-data.sql
@@ -0,0 +1,8 @@
+/* These commented lines will cause Spring Boot to fail at startup 
+ * 
+ * INSERT INTO user VALUES (1, 'admin', 'p@ssw@rd'); 
+ * INSERT INTO user VALUES (2, 'user', 'userpasswd');
+ * 
+*/
+INSERT INTO "user" VALUES (1, 'admin', 'p@ssw@rd');
+INSERT INTO "user" VALUES (2, 'user', 'userpasswd');
\ No newline at end of file
diff --git a/persistence-modules/spring-boot-persistence-h2/src/test/java/com/baeldung/h2/exceptions/SpringBootH2ExceptionsIntegrationTest.java b/persistence-modules/spring-boot-persistence-h2/src/test/java/com/baeldung/h2/exceptions/SpringBootH2ExceptionsIntegrationTest.java
new file mode 100644
index 0000000000..94cf08fb76
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-h2/src/test/java/com/baeldung/h2/exceptions/SpringBootH2ExceptionsIntegrationTest.java
@@ -0,0 +1,30 @@
+package com.baeldung.h2.exceptions;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.h2.exceptions.models.User;
+import com.baeldung.h2.exceptions.repos.UserRepository;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringBootH2Exceptions.class)
+public class SpringBootH2ExceptionsIntegrationTest {
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Test
+    public void givenValidInitData_whenCallingFindAll_thenReturnData() {
+        List<User> users = userRepository.findAll();
+
+        assertThat(users).hasSize(2);
+    }
+
+}
diff --git a/persistence-modules/spring-boot-persistence-mongodb-2/pom.xml b/persistence-modules/spring-boot-persistence-mongodb-2/pom.xml
index cd7198b931..121581498a 100644
--- a/persistence-modules/spring-boot-persistence-mongodb-2/pom.xml
+++ b/persistence-modules/spring-boot-persistence-mongodb-2/pom.xml
@@ -5,7 +5,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-boot-persistence-mongodb-2</artifactId>
     <name>spring-boot-persistence-mongodb-2</name>
-    <packaging>war</packaging>
     <description>This is simple boot application for Spring boot persistence mongodb test</description>
 
     <parent>
diff --git a/persistence-modules/spring-boot-persistence-mongodb-3/pom.xml b/persistence-modules/spring-boot-persistence-mongodb-3/pom.xml
index b9a47aa703..b699a33559 100644
--- a/persistence-modules/spring-boot-persistence-mongodb-3/pom.xml
+++ b/persistence-modules/spring-boot-persistence-mongodb-3/pom.xml
@@ -5,7 +5,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-boot-persistence-mongodb-3</artifactId>
     <name>spring-boot-persistence-mongodb-3</name>
-    <packaging>war</packaging>
     <description>This is simple boot application for Spring boot persistence mongodb</description>
 
     <parent>
@@ -16,6 +15,21 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>org.mongodb</groupId>
+            <artifactId>mongodb-driver-sync</artifactId>
+            <version>${mongodb-driver.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mongodb</groupId>
+            <artifactId>mongodb-driver-core</artifactId>
+            <version>${mongodb-driver.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mongodb</groupId>
+            <artifactId>bson</artifactId>
+            <version>${mongodb-driver.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -23,6 +37,16 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mongodb</groupId>
+                    <artifactId>mongodb-driver-sync</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mongodb</groupId>
+                    <artifactId>mongodb-driver-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency> 
             <groupId>org.mongodb</groupId> 
@@ -37,7 +61,8 @@
     </dependencies>
 
     <properties>
-        <mongodb-crypt.version>1.6.1</mongodb-crypt.version>
+        <mongodb-crypt.version>1.7.3</mongodb-crypt.version>
+        <mongodb-driver.version>4.9.1</mongodb-driver.version>
     </properties>
     
 </project>
diff --git a/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/csfle/config/EncryptionConfig.java b/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/csfle/config/EncryptionConfig.java
index 0ff97eb6c1..1a74340057 100644
--- a/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/csfle/config/EncryptionConfig.java
+++ b/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/csfle/config/EncryptionConfig.java
@@ -1,5 +1,7 @@
 package com.baeldung.boot.csfle.config;
 
+import java.io.File;
+
 import org.bson.BsonBinary;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
@@ -17,7 +19,13 @@ public class EncryptionConfig {
     private String keyVaultAlias;
 
     @Value("${com.baeldung.csfle.auto-decryption:false}")
-    private Boolean autoDecryption;
+    private boolean autoDecryption;
+
+    @Value("${com.baeldung.csfle.auto-encryption:false}")
+    private boolean autoEncryption;
+
+    @Value("${com.baeldung.csfle.auto-encryption-lib:#{null}}")
+    private File autoEncryptionLib;
 
     private BsonBinary dataKeyId;
 
@@ -41,7 +49,23 @@ public class EncryptionConfig {
         return masterKeyPath;
     }
 
-    public Boolean getAutoDecryption() {
+    public boolean isAutoDecryption() {
         return autoDecryption;
     }
+
+    public boolean isAutoEncryption() {
+        return autoEncryption;
+    }
+
+    public File getAutoEncryptionLib() {
+        return autoEncryptionLib;
+    }
+
+    public String dataKeyIdUuid() {
+        if (dataKeyId == null)
+            throw new IllegalStateException("data key not initialized");
+
+        return dataKeyId.asUuid()
+            .toString();
+    }
 }
diff --git a/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/csfle/config/MongoClientConfig.java b/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/csfle/config/MongoClientConfig.java
index 0dff1ec86d..19d0af08b2 100644
--- a/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/csfle/config/MongoClientConfig.java
+++ b/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/csfle/config/MongoClientConfig.java
@@ -1,14 +1,15 @@
 package com.baeldung.boot.csfle.config;
 
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.bson.BsonBinary;
 import org.bson.BsonDocument;
 import org.bson.Document;
-import org.bson.conversions.Bson;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -51,14 +52,10 @@ public class MongoClientConfig extends AbstractMongoClientConfiguration {
     @Bean
     @Override
     public MongoClient mongoClient() {
-        MongoClient client;
         try {
-            client = MongoClients.create(clientSettings());
-
             ClientEncryption encryption = clientEncryption();
-            encryptionConfig.setDataKeyId(createOrRetrieveDataKey(client, encryption));
-
-            return client;
+            encryptionConfig.setDataKeyId(createOrRetrieveDataKey(encryption));
+            return MongoClients.create(clientSettings());
         } catch (IOException e) {
             throw new IllegalStateException("unable to create client", e);
         }
@@ -77,19 +74,10 @@ public class MongoClientConfig extends AbstractMongoClientConfiguration {
         return ClientEncryptions.create(encryptionSettings);
     }
 
-    private BsonBinary createOrRetrieveDataKey(MongoClient client, ClientEncryption encryption) {
-        MongoNamespace namespace = new MongoNamespace(encryptionConfig.getKeyVaultNamespace());
-        MongoCollection<Document> keyVault = client.getDatabase(namespace.getDatabaseName())
-            .getCollection(namespace.getCollectionName());
-
-        Bson query = Filters.in("keyAltNames", encryptionConfig.getKeyVaultAlias());
-        BsonDocument key = keyVault.withDocumentClass(BsonDocument.class)
-            .find(query)
-            .first();
-
+    private BsonBinary createOrRetrieveDataKey(ClientEncryption encryption) {
+        BsonDocument key = encryption.getKeyByAltName(encryptionConfig.getKeyVaultAlias());
         if (key == null) {
-            keyVault.createIndex(Indexes.ascending("keyAltNames"), new IndexOptions().unique(true)
-                .partialFilterExpression(Filters.exists("keyAltNames")));
+            createKeyUniqueIndex();
 
             DataKeyOptions options = new DataKeyOptions();
             options.keyAltNames(Arrays.asList(encryptionConfig.getKeyVaultAlias()));
@@ -99,16 +87,68 @@ public class MongoClientConfig extends AbstractMongoClientConfiguration {
         }
     }
 
+    private void createKeyUniqueIndex() {
+        try (MongoClient client = MongoClients.create(MongoClientSettings.builder()
+            .applyConnectionString(new ConnectionString(uri))
+            .build())) {
+            MongoNamespace namespace = new MongoNamespace(encryptionConfig.getKeyVaultNamespace());
+            MongoCollection<Document> keyVault = client.getDatabase(namespace.getDatabaseName())
+                .getCollection(namespace.getCollectionName());
+
+            keyVault.createIndex(Indexes.ascending("keyAltNames"), new IndexOptions().unique(true)
+                .partialFilterExpression(Filters.exists("keyAltNames")));
+        }
+    }
+
     private MongoClientSettings clientSettings() throws FileNotFoundException, IOException {
         Builder settings = MongoClientSettings.builder()
             .applyConnectionString(new ConnectionString(uri));
 
-        if (encryptionConfig.getAutoDecryption()) {
-            settings.autoEncryptionSettings(AutoEncryptionSettings.builder()
+        if (encryptionConfig.isAutoDecryption()) {
+            AutoEncryptionSettings.Builder builder = AutoEncryptionSettings.builder()
                 .keyVaultNamespace(encryptionConfig.getKeyVaultNamespace())
-                .kmsProviders(LocalKmsUtils.providersMap(encryptionConfig.getMasterKeyPath()))
-                .bypassAutoEncryption(true)
-                .build());
+                .kmsProviders(LocalKmsUtils.providersMap(encryptionConfig.getMasterKeyPath()));
+
+            if (encryptionConfig.isAutoEncryption() && encryptionConfig.getDataKeyId() != null) {
+                File autoEncryptionLib = encryptionConfig.getAutoEncryptionLib();
+                if (!autoEncryptionLib.isFile()) {
+                    throw new IllegalArgumentException("encryption lib must be an existing file");
+                }
+
+                Map<String, Object> map = new HashMap<>();
+                map.put("cryptSharedLibRequired", true);
+                map.put("cryptSharedLibPath", autoEncryptionLib.toString());
+                builder.extraOptions(map);
+                
+                String keyUuid = encryptionConfig.dataKeyIdUuid();
+                HashMap<String, BsonDocument> schemaMap = new HashMap<>();
+                schemaMap.put(getDatabaseName() + ".citizens",
+                    BsonDocument.parse("{"
+                        + "  bsonType: \"object\","
+                        + "  encryptMetadata: {"
+                        + "    keyId: [UUID(\"" + keyUuid + "\")]"
+                        + "  },"
+                        + "  properties: {"
+                        + "    email: {"
+                        + "      encrypt: {"
+                        + "        bsonType: \"string\","
+                        + "        algorithm: \"AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic\""
+                        + "      }"
+                        + "    },"
+                        + "    birthYear: {"
+                        + "      encrypt: {"
+                        + "        bsonType: \"int\","
+                        + "        algorithm: \"AEAD_AES_256_CBC_HMAC_SHA_512-Random\""
+                        + "      }"
+                        + "    }"
+                        + "  }"
+                        + "}"));
+                builder.schemaMap(schemaMap);
+            } else {
+                builder.bypassAutoEncryption(true);
+            }
+
+            settings.autoEncryptionSettings(builder.build());
         }
 
         return settings.build();
diff --git a/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/csfle/service/CitizenService.java b/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/csfle/service/CitizenService.java
index 6b3c463d0d..c93b00f3f8 100644
--- a/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/csfle/service/CitizenService.java
+++ b/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/csfle/service/CitizenService.java
@@ -35,16 +35,20 @@ public class CitizenService {
     @Autowired
     private ClientEncryption clientEncryption;
 
-    public EncryptedCitizen save(Citizen citizen) {
-        EncryptedCitizen encryptedCitizen = new EncryptedCitizen(citizen);
-        encryptedCitizen.setEmail(encrypt(citizen.getEmail(), DETERMINISTIC_ALGORITHM));
-        encryptedCitizen.setBirthYear(encrypt(citizen.getBirthYear(), RANDOM_ALGORITHM));
+    public Object save(Citizen citizen) {
+        if (encryptionConfig.isAutoEncryption()) {
+            return mongo.save(citizen);
+        } else {
+            EncryptedCitizen encryptedCitizen = new EncryptedCitizen(citizen);
+            encryptedCitizen.setEmail(encrypt(citizen.getEmail(), DETERMINISTIC_ALGORITHM));
+            encryptedCitizen.setBirthYear(encrypt(citizen.getBirthYear(), RANDOM_ALGORITHM));
 
-        return mongo.save(encryptedCitizen);
+            return mongo.save(encryptedCitizen);
+        }
     }
 
     public List<Citizen> findAll() {
-        if (!encryptionConfig.getAutoDecryption()) {
+        if (!encryptionConfig.isAutoDecryption()) {
             List<EncryptedCitizen> allEncrypted = mongo.findAll(EncryptedCitizen.class);
 
             return allEncrypted.stream()
@@ -56,13 +60,20 @@ public class CitizenService {
     }
 
     public Citizen findByEmail(String email) {
-        Query byEmail = new Query(Criteria.where("email")
-            .is(encrypt(email, DETERMINISTIC_ALGORITHM)));
-        if (!encryptionConfig.getAutoDecryption()) {
+        Criteria emailCriteria = Criteria.where("email");
+        if (encryptionConfig.isAutoEncryption()) {
+            emailCriteria.is(email);
+        } else {
+            emailCriteria
+                .is(encrypt(email, DETERMINISTIC_ALGORITHM));
+        }
+
+        Query byEmail = new Query(emailCriteria);
+        if (encryptionConfig.isAutoDecryption()) {
+            return mongo.findOne(byEmail, Citizen.class);
+        } else {
             EncryptedCitizen encryptedCitizen = mongo.findOne(byEmail, EncryptedCitizen.class);
             return decrypt(encryptedCitizen);
-        } else {
-            return mongo.findOne(byEmail, Citizen.class);
         }
     }
 
diff --git a/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/csfle/web/CitizenController.java b/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/csfle/web/CitizenController.java
index d17435fb5e..7a2b2605cd 100644
--- a/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/csfle/web/CitizenController.java
+++ b/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/csfle/web/CitizenController.java
@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.baeldung.boot.csfle.data.Citizen;
-import com.baeldung.boot.csfle.data.EncryptedCitizen;
 import com.baeldung.boot.csfle.service.CitizenService;
 
 @RestController
@@ -32,7 +31,7 @@ public class CitizenController {
     }
 
     @PostMapping
-    public EncryptedCitizen post(@RequestBody Citizen citizen) {
+    public Object post(@RequestBody Citizen citizen) {
         return service.save(citizen);
     }
 }
diff --git a/persistence-modules/spring-boot-persistence-mongodb-3/src/test/java/com/baeldung/boot/csfle/CitizenServiceLiveTest.java b/persistence-modules/spring-boot-persistence-mongodb-3/src/test/java/com/baeldung/boot/csfle/CitizenServiceLiveTest.java
index 471cb2883a..d57da43751 100644
--- a/persistence-modules/spring-boot-persistence-mongodb-3/src/test/java/com/baeldung/boot/csfle/CitizenServiceLiveTest.java
+++ b/persistence-modules/spring-boot-persistence-mongodb-3/src/test/java/com/baeldung/boot/csfle/CitizenServiceLiveTest.java
@@ -38,10 +38,14 @@ public class CitizenServiceLiveTest {
         citizen.setName("Foo");
         citizen.setEmail("foo@citizen.com");
 
-        Binary encryptedEmail = service.encrypt(citizen.getEmail(), CitizenService.DETERMINISTIC_ALGORITHM);
+        Object saved = service.save(citizen);
+        if (saved instanceof EncryptedCitizen) {
+            Binary encryptedEmail = service.encrypt(citizen.getEmail(), CitizenService.DETERMINISTIC_ALGORITHM);
 
-        EncryptedCitizen saved = service.save(citizen);
-        assertEquals(encryptedEmail, saved.getEmail());
+            assertEquals(encryptedEmail, ((EncryptedCitizen) saved).getEmail());
+        } else {
+            assertEquals(citizen.getEmail(), ((Citizen) saved).getEmail());
+        }
     }
 
     @Test
diff --git a/persistence-modules/spring-boot-persistence-mongodb-3/src/test/resources/embedded.properties b/persistence-modules/spring-boot-persistence-mongodb-3/src/test/resources/embedded.properties
index 5325354e55..cd1c1d43c7 100644
--- a/persistence-modules/spring-boot-persistence-mongodb-3/src/test/resources/embedded.properties
+++ b/persistence-modules/spring-boot-persistence-mongodb-3/src/test/resources/embedded.properties
@@ -1,10 +1,10 @@
 spring.mongodb.embedded.version=4.4.9
 
-spring.data.mongodb.uri=changeit
-spring.data.mongodb.database=changeit
+#spring.data.mongodb.uri=changeit
+#spring.data.mongodb.database=changeit
 
 com.baeldung.csfle.kms-provider=local
 com.baeldung.csfle.key-vault.namespace=encryption._keyVault
 com.baeldung.csfle.key-vault.alias=master.key
-com.baeldung.csfle.master-key-path=/tmp/master.key
+#com.baeldung.csfle.master-key-path=/tmp/master.key
 com.baeldung.csfle.auto-decryption=false
diff --git a/persistence-modules/spring-boot-persistence-mongodb/pom.xml b/persistence-modules/spring-boot-persistence-mongodb/pom.xml
index 724fa38f7e..aae307f7f8 100644
--- a/persistence-modules/spring-boot-persistence-mongodb/pom.xml
+++ b/persistence-modules/spring-boot-persistence-mongodb/pom.xml
@@ -5,7 +5,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-boot-persistence-mongodb</artifactId>
     <name>spring-boot-persistence-mongodb</name>
-    <packaging>war</packaging>
     <description>This is simple boot application for Spring boot persistence mongodb test</description>
 
     <parent>
diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dataloading/ApplicationDataLoading.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dataloading/ApplicationDataLoading.java
new file mode 100644
index 0000000000..40742d303e
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dataloading/ApplicationDataLoading.java
@@ -0,0 +1,16 @@
+package com.baeldung.dataloading;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.core.env.AbstractEnvironment;
+
+@SpringBootApplication(scanBasePackages = { "com.baeldung.dataloading" })
+public class ApplicationDataLoading {
+
+	public static void main(String[] args) {
+		System.setProperty(AbstractEnvironment.ACTIVE_PROFILES_PROPERTY_NAME, "datasource");
+
+		SpringApplication.run(ApplicationDataLoading.class, args);
+	}
+
+}
diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dataloading/model/Country.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dataloading/model/Country.java
new file mode 100644
index 0000000000..692d48caf0
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dataloading/model/Country.java
@@ -0,0 +1,36 @@
+package com.baeldung.dataloading.model;
+
+import static javax.persistence.GenerationType.IDENTITY;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class Country {
+
+	@Id
+	@GeneratedValue(strategy = IDENTITY)
+	private Integer id;
+
+	@Column(nullable = false)
+	private String name;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+}
diff --git a/persistence-modules/spring-boot-persistence/src/main/resources/application-datasource.properties b/persistence-modules/spring-boot-persistence/src/main/resources/application-datasource.properties
new file mode 100644
index 0000000000..98cf2ba965
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence/src/main/resources/application-datasource.properties
@@ -0,0 +1,14 @@
+spring.datasource.driver-class-name=org.h2.Driver
+spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
+spring.datasource.username=sa
+spring.datasource.password=
+
+spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
+spring.jpa.hibernate.ddl-auto=create
+spring.jpa.defer-datasource-initialization=true
+
+# Enabling H2 Console
+spring.h2.console.enabled=true
+
+# By default enabled for Embedded Databases
+#spring.sql.init.mode=always
\ No newline at end of file
diff --git a/persistence-modules/spring-data-cassandra-2/README.md b/persistence-modules/spring-data-cassandra-2/README.md
index f5cf20b8a9..3f49d6ae93 100644
--- a/persistence-modules/spring-data-cassandra-2/README.md
+++ b/persistence-modules/spring-data-cassandra-2/README.md
@@ -1,3 +1,4 @@
 ### Relevant Articles:
 
 - [Using Test Containers With Spring Data Cassandra](https://www.baeldung.com/spring-data-cassandra-test-containers)
+- [Cassandra – Object Mapping with DataStax Java Driver](https://www.baeldung.com/cassandra-object-mapping-datastax-java-driver)
diff --git a/persistence-modules/spring-data-jpa-annotations/README.md b/persistence-modules/spring-data-jpa-annotations/README.md
index 5a5440b1ed..d7e6189ae5 100644
--- a/persistence-modules/spring-data-jpa-annotations/README.md
+++ b/persistence-modules/spring-data-jpa-annotations/README.md
@@ -10,6 +10,7 @@ This module contains articles about annotations used in Spring Data JPA
 - [Programmatic Transaction Management in Spring](https://www.baeldung.com/spring-programmatic-transaction-management)
 - [JPA Entity Lifecycle Events](https://www.baeldung.com/jpa-entity-lifecycle-events)
 - [Overriding Column Definition With @AttributeOverride](https://www.baeldung.com/jpa-attributeoverride)
+- [A Spring Custom Annotation for a Better DAO](http://www.baeldung.com/spring-annotation-bean-pre-processor)
 
 ### Eclipse Config 
 After importing the project into Eclipse, you may see the following error:  
diff --git a/spring-core-3/src/main/java/com/baeldung/customannotation/CustomAnnotationConfiguration.java b/persistence-modules/spring-data-jpa-annotations/src/main/java/com/baeldung/customannotation/CustomAnnotationConfiguration.java
similarity index 100%
rename from spring-core-3/src/main/java/com/baeldung/customannotation/CustomAnnotationConfiguration.java
rename to persistence-modules/spring-data-jpa-annotations/src/main/java/com/baeldung/customannotation/CustomAnnotationConfiguration.java
diff --git a/spring-core-3/src/main/java/com/baeldung/customannotation/DataAccess.java b/persistence-modules/spring-data-jpa-annotations/src/main/java/com/baeldung/customannotation/DataAccess.java
similarity index 100%
rename from spring-core-3/src/main/java/com/baeldung/customannotation/DataAccess.java
rename to persistence-modules/spring-data-jpa-annotations/src/main/java/com/baeldung/customannotation/DataAccess.java
diff --git a/spring-core-3/src/main/java/com/baeldung/customannotation/DataAccessAnnotationProcessor.java b/persistence-modules/spring-data-jpa-annotations/src/main/java/com/baeldung/customannotation/DataAccessAnnotationProcessor.java
similarity index 100%
rename from spring-core-3/src/main/java/com/baeldung/customannotation/DataAccessAnnotationProcessor.java
rename to persistence-modules/spring-data-jpa-annotations/src/main/java/com/baeldung/customannotation/DataAccessAnnotationProcessor.java
diff --git a/spring-core-3/src/main/java/com/baeldung/customannotation/DataAccessFieldCallback.java b/persistence-modules/spring-data-jpa-annotations/src/main/java/com/baeldung/customannotation/DataAccessFieldCallback.java
similarity index 100%
rename from spring-core-3/src/main/java/com/baeldung/customannotation/DataAccessFieldCallback.java
rename to persistence-modules/spring-data-jpa-annotations/src/main/java/com/baeldung/customannotation/DataAccessFieldCallback.java
diff --git a/spring-core-3/src/main/java/com/baeldung/customannotation/GenericDAO.java b/persistence-modules/spring-data-jpa-annotations/src/main/java/com/baeldung/customannotation/GenericDAO.java
similarity index 100%
rename from spring-core-3/src/main/java/com/baeldung/customannotation/GenericDAO.java
rename to persistence-modules/spring-data-jpa-annotations/src/main/java/com/baeldung/customannotation/GenericDAO.java
diff --git a/spring-core-3/src/test/java/com/baeldung/customannotation/Account.java b/persistence-modules/spring-data-jpa-annotations/src/test/java/com/baeldung/customannotation/Account.java
similarity index 100%
rename from spring-core-3/src/test/java/com/baeldung/customannotation/Account.java
rename to persistence-modules/spring-data-jpa-annotations/src/test/java/com/baeldung/customannotation/Account.java
diff --git a/spring-core-3/src/test/java/com/baeldung/customannotation/BeanWithGenericDAO.java b/persistence-modules/spring-data-jpa-annotations/src/test/java/com/baeldung/customannotation/BeanWithGenericDAO.java
similarity index 100%
rename from spring-core-3/src/test/java/com/baeldung/customannotation/BeanWithGenericDAO.java
rename to persistence-modules/spring-data-jpa-annotations/src/test/java/com/baeldung/customannotation/BeanWithGenericDAO.java
diff --git a/spring-core-3/src/test/java/com/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java b/persistence-modules/spring-data-jpa-annotations/src/test/java/com/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java
similarity index 100%
rename from spring-core-3/src/test/java/com/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java
rename to persistence-modules/spring-data-jpa-annotations/src/test/java/com/baeldung/customannotation/DataAccessAnnotationIntegrationTest.java
diff --git a/spring-core-3/src/test/java/com/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java b/persistence-modules/spring-data-jpa-annotations/src/test/java/com/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java
similarity index 100%
rename from spring-core-3/src/test/java/com/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java
rename to persistence-modules/spring-data-jpa-annotations/src/test/java/com/baeldung/customannotation/DataAccessFieldCallbackIntegrationTest.java
diff --git a/spring-core-3/src/test/java/com/baeldung/customannotation/Person.java b/persistence-modules/spring-data-jpa-annotations/src/test/java/com/baeldung/customannotation/Person.java
similarity index 100%
rename from spring-core-3/src/test/java/com/baeldung/customannotation/Person.java
rename to persistence-modules/spring-data-jpa-annotations/src/test/java/com/baeldung/customannotation/Person.java
diff --git a/persistence-modules/spring-data-jpa-filtering/src/main/java/com/baeldung/entity/Customer.java b/persistence-modules/spring-data-jpa-filtering/src/main/java/com/baeldung/entity/Customer.java
index efcae73853..5af96d7822 100644
--- a/persistence-modules/spring-data-jpa-filtering/src/main/java/com/baeldung/entity/Customer.java
+++ b/persistence-modules/spring-data-jpa-filtering/src/main/java/com/baeldung/entity/Customer.java
@@ -1,8 +1,11 @@
 package com.baeldung.entity;
 
+import org.hibernate.annotations.Type;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import java.util.UUID;
 
 @Entity
 public class Customer {
@@ -13,11 +16,20 @@ public class Customer {
     private String name;
     private String email;
 
+    @Type(type = "org.hibernate.type.UUIDCharType")
+    private UUID uuid;
+
     public Customer(String name, String email) {
         this.name = name;
         this.email = email;
     }
 
+    public Customer(String name, String email, UUID uuid) {
+        this.name = name;
+        this.email = email;
+        this.uuid = uuid;
+    }
+
     public String getName() {
         return name;
     }
@@ -34,4 +46,7 @@ public class Customer {
         this.email = email;
     }
 
+    public UUID getUuid() {
+        return this.uuid;
+    }
 }
diff --git a/persistence-modules/spring-data-jpa-filtering/src/main/java/com/baeldung/repository/CustomerRepository.java b/persistence-modules/spring-data-jpa-filtering/src/main/java/com/baeldung/repository/CustomerRepository.java
index 65b22bbd84..5f9710b839 100644
--- a/persistence-modules/spring-data-jpa-filtering/src/main/java/com/baeldung/repository/CustomerRepository.java
+++ b/persistence-modules/spring-data-jpa-filtering/src/main/java/com/baeldung/repository/CustomerRepository.java
@@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
 import java.util.List;
+import java.util.UUID;
 
 public interface CustomerRepository extends JpaRepository<Customer, Long> {
 
@@ -16,4 +17,5 @@ public interface CustomerRepository extends JpaRepository<Customer, Long> {
     @Query("SELECT c FROM Customer c WHERE (:name is null or c.name = :name) and (:email is null or c.email = :email)")
     List<Customer> findCustomerByNameAndEmail(@Param("name") String name, @Param("email") String email);
 
+    List<Customer> findCustomerByUuid(@Param("uuid") UUID uuid);
 }
diff --git a/persistence-modules/spring-data-jpa-filtering/src/test/java/com/baeldung/repository/CustomerRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-filtering/src/test/java/com/baeldung/repository/CustomerRepositoryIntegrationTest.java
index 5d6457ce30..27208507f1 100644
--- a/persistence-modules/spring-data-jpa-filtering/src/test/java/com/baeldung/repository/CustomerRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-data-jpa-filtering/src/test/java/com/baeldung/repository/CustomerRepositoryIntegrationTest.java
@@ -12,6 +12,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import java.util.List;
+import java.util.UUID;
 
 import static org.junit.Assert.assertEquals;
 
@@ -30,6 +31,7 @@ public class CustomerRepositoryIntegrationTest {
         entityManager.persist(new Customer("A", "A@example.com"));
         entityManager.persist(new Customer("D", null));
         entityManager.persist(new Customer("D", "D@example.com"));
+        entityManager.persist(new Customer("C", null, UUID.fromString("c7c19ff4-8636-4b99-9591-c3327652f191")));
     }
 
     @Test
@@ -57,6 +59,20 @@ public class CustomerRepositoryIntegrationTest {
         assertEquals(2, customers.size());
     }
 
+    @Test
+    public void givenUUIDIsPresent_whenQueryMethod_thenFetchedCorrectly() {
+        List<Customer> customers = repository.findCustomerByUuid(UUID.fromString("c7c19ff4-8636-4b99-9591-c3327652f191"));
+
+        assertEquals(1, customers.size());
+    }
+
+    @Test
+    public void givenNullUuid_whenQueryMethod_thenFetchedCorrectly() {
+        List<Customer> customers = repository.findCustomerByUuid(null);
+
+        assertEquals(3, customers.size());
+    }
+
     @After
     public void cleanUp() {
         repository.deleteAll();
diff --git a/persistence-modules/spring-data-jpa-repo-2/README.md b/persistence-modules/spring-data-jpa-repo-2/README.md
index 23134ec02d..dc94ba41d0 100644
--- a/persistence-modules/spring-data-jpa-repo-2/README.md
+++ b/persistence-modules/spring-data-jpa-repo-2/README.md
@@ -9,4 +9,5 @@
 - [Difference Between JPA and Spring Data JPA](https://www.baeldung.com/spring-data-jpa-vs-jpa)
 - [Differences Between Spring Data JPA findFirst() and findTop()](https://www.baeldung.com/spring-data-jpa-findfirst-vs-findtop)
 - [Difference Between findBy and findAllBy in Spring Data JPA](https://www.baeldung.com/spring-data-jpa-find-by-vs-find-all-by)
+- [Unidirectional One-to-Many and Cascading Delete in JPA](https://www.baeldung.com/spring-jpa-unidirectional-one-to-many-and-cascading-delete)
 - More articles: [[<-- prev]](../spring-data-jpa-repo)
diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/truncate/EntityManagerRepository.java b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/truncate/EntityManagerRepository.java
new file mode 100644
index 0000000000..9d04d7bde7
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/truncate/EntityManagerRepository.java
@@ -0,0 +1,22 @@
+package com.baeldung.spring.data.persistence.truncate;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+
+@Repository
+public class EntityManagerRepository {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Transactional
+    public void truncateTable(String tableName) {
+        String sql = "TRUNCATE TABLE " + tableName;
+        Query query = entityManager.createNativeQuery(sql);
+        query.executeUpdate();
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/truncate/JdbcTemplateRepository.java b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/truncate/JdbcTemplateRepository.java
new file mode 100644
index 0000000000..29706311cb
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/truncate/JdbcTemplateRepository.java
@@ -0,0 +1,20 @@
+package com.baeldung.spring.data.persistence.truncate;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+@Repository
+public class JdbcTemplateRepository {
+    private final JdbcTemplate jdbcTemplate;
+
+    public JdbcTemplateRepository(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    @Transactional
+    public void truncateTable(String tableName) {
+        String sql = "TRUNCATE TABLE " + tableName;
+        jdbcTemplate.execute(sql);
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/truncate/MyEntity.java b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/truncate/MyEntity.java
new file mode 100644
index 0000000000..29f82ed717
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/truncate/MyEntity.java
@@ -0,0 +1,45 @@
+package com.baeldung.spring.data.persistence.truncate;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Objects;
+
+@Entity
+@Table(name = MyEntity.TABLE_NAME)
+public class MyEntity {
+
+    public final static String TABLE_NAME = "my_entity";
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        MyEntity myEntity = (MyEntity) o;
+        return Objects.equals(id, myEntity.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
+
+    @Override
+    public String toString() {
+        return "MyEntity{" +
+                "id=" + id +
+                '}';
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/truncate/MyEntityRepository.java b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/truncate/MyEntityRepository.java
new file mode 100644
index 0000000000..d0e032bebe
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/truncate/MyEntityRepository.java
@@ -0,0 +1,20 @@
+package com.baeldung.spring.data.persistence.truncate;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+import javax.transaction.Transactional;
+
+@Repository
+public interface MyEntityRepository extends CrudRepository<MyEntity, Long> {
+
+    @Modifying
+    @Transactional
+    // need to wrap in double quotes due to
+    // spring.jpa.properties.hibernate.globally_quoted_identifiers=true backward compatibility
+    // property disabled in tests
+    @Query(value = "truncate table " + MyEntity.TABLE_NAME, nativeQuery = true)
+    void truncateTable();
+}
diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/truncate/TruncateSpringBootApplication.java b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/truncate/TruncateSpringBootApplication.java
new file mode 100644
index 0000000000..322549e19b
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/truncate/TruncateSpringBootApplication.java
@@ -0,0 +1,14 @@
+package com.baeldung.spring.data.persistence.truncate;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+
+@EntityScan(basePackageClasses = MyEntity.class)
+@SpringBootApplication
+public class TruncateSpringBootApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(TruncateSpringBootApplication.class);
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/unidirectionalcascadingdelete/Article.java b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/unidirectionalcascadingdelete/Article.java
new file mode 100644
index 0000000000..97f79515cc
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/unidirectionalcascadingdelete/Article.java
@@ -0,0 +1,46 @@
+package com.baeldung.spring.data.persistence.unidirectionalcascadingdelete;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+
+@Entity
+public class Article {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private long id;
+    private String name;
+    @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
+    private Set<Comment> comments = new HashSet<>();
+
+    public Set<Comment> getComments() {
+        return comments;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setComments(Set<Comment> comments) {
+        this.comments = comments;
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/unidirectionalcascadingdelete/ArticleRepository.java b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/unidirectionalcascadingdelete/ArticleRepository.java
new file mode 100644
index 0000000000..7cf88c73b1
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/unidirectionalcascadingdelete/ArticleRepository.java
@@ -0,0 +1,9 @@
+package com.baeldung.spring.data.persistence.unidirectionalcascadingdelete;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ArticleRepository extends JpaRepository<Article, Long> {
+
+}
diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/unidirectionalcascadingdelete/ArticleService.java b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/unidirectionalcascadingdelete/ArticleService.java
new file mode 100644
index 0000000000..b0f9bdb05e
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/unidirectionalcascadingdelete/ArticleService.java
@@ -0,0 +1,17 @@
+package com.baeldung.spring.data.persistence.unidirectionalcascadingdelete;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ArticleService {
+
+    @Autowired
+    private ArticleRepository articleRepository;
+
+    public void deleteArticle(Article article) {
+        articleRepository.delete(article);
+
+    }
+
+}
diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/unidirectionalcascadingdelete/CascadingDeleteApplication.java b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/unidirectionalcascadingdelete/CascadingDeleteApplication.java
new file mode 100644
index 0000000000..1c417d9cc9
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/unidirectionalcascadingdelete/CascadingDeleteApplication.java
@@ -0,0 +1,12 @@
+package com.baeldung.spring.data.persistence.unidirectionalcascadingdelete;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class CascadingDeleteApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(CascadingDeleteApplication.class, args);
+    }
+
+}
diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/unidirectionalcascadingdelete/Comment.java b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/unidirectionalcascadingdelete/Comment.java
new file mode 100644
index 0000000000..334ac01ea5
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/unidirectionalcascadingdelete/Comment.java
@@ -0,0 +1,45 @@
+package com.baeldung.spring.data.persistence.unidirectionalcascadingdelete;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Comment {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private long id;
+
+    private String description;
+    private Date date;
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setDate(Date total) {
+        this.date = total;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+}
+
diff --git a/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/unidirectionalcascadingdelete/CommentRepository.java b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/unidirectionalcascadingdelete/CommentRepository.java
new file mode 100644
index 0000000000..cadb1d7173
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-2/src/main/java/com/baeldung/spring/data/persistence/unidirectionalcascadingdelete/CommentRepository.java
@@ -0,0 +1,8 @@
+package com.baeldung.spring.data.persistence.unidirectionalcascadingdelete;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CommentRepository extends JpaRepository<Comment, Long> {
+}
diff --git a/persistence-modules/spring-data-jpa-repo-2/src/test/java/com/baeldung/spring/data/persistence/deletionCascading/ArticleRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-repo-2/src/test/java/com/baeldung/spring/data/persistence/deletionCascading/ArticleRepositoryIntegrationTest.java
new file mode 100644
index 0000000000..6ff8d57b6e
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-2/src/test/java/com/baeldung/spring/data/persistence/deletionCascading/ArticleRepositoryIntegrationTest.java
@@ -0,0 +1,75 @@
+package com.baeldung.spring.data.persistence.deletionCascading;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.transaction.Transactional;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import com.baeldung.spring.data.persistence.unidirectionalcascadingdelete.Article;
+import com.baeldung.spring.data.persistence.unidirectionalcascadingdelete.ArticleRepository;
+import com.baeldung.spring.data.persistence.unidirectionalcascadingdelete.ArticleService;
+import com.baeldung.spring.data.persistence.unidirectionalcascadingdelete.CascadingDeleteApplication;
+import com.baeldung.spring.data.persistence.unidirectionalcascadingdelete.Comment;
+import com.baeldung.spring.data.persistence.unidirectionalcascadingdelete.CommentRepository;
+
+@SpringBootTest(classes = CascadingDeleteApplication.class)
+@Transactional
+public class ArticleRepositoryIntegrationTest {
+
+    @Autowired
+    private ArticleRepository articleRepository;
+
+    @Autowired
+    private CommentRepository commentRepository;
+
+    @Autowired
+    private ArticleService articleService;
+
+    @Test
+    @Transactional
+    public void givenAnArticleAndItsComments_whenDeleteArticle_thenCommentsDeletedAutomatically() {
+
+        Set<Comment> comments = new HashSet<>();
+        Article article = new Article();
+        article.setName("introduction to Spring");
+
+        Comment comment1 = new Comment();
+        comment1.setDescription("Explain types of Autowired");
+        comment1.setDate(Date.from(Instant.now()));
+
+        Comment comment2 = new Comment();
+        comment2.setDescription("Good article");
+        comment2.setDate(Date.from(Instant.now()
+          .minus(10, ChronoUnit.MINUTES)));
+
+        comments.add(comment1);
+        comments.add(comment2);
+
+        article.setComments(comments);
+        articleRepository.save(article);
+
+        List<Article> articles = articleRepository.findAll();
+        assertThat(articles.size()).isEqualTo(1);
+        Article retrivedArticle = articles.get(0);
+
+        List<Comment> fetchedComments = commentRepository.findAll();
+        assertThat(fetchedComments.size()).isEqualTo(2);
+
+        articleService.deleteArticle(retrivedArticle);
+        assertThat(articleRepository.findAll()).isEmpty();
+
+        assertThat(commentRepository.findAll()).isEmpty();
+
+    }
+}
+
diff --git a/persistence-modules/spring-data-jpa-repo-2/src/test/java/com/baeldung/spring/data/persistence/truncate/TruncateIntegrationTest.java b/persistence-modules/spring-data-jpa-repo-2/src/test/java/com/baeldung/spring/data/persistence/truncate/TruncateIntegrationTest.java
new file mode 100644
index 0000000000..b2b6a655db
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-2/src/test/java/com/baeldung/spring/data/persistence/truncate/TruncateIntegrationTest.java
@@ -0,0 +1,71 @@
+package com.baeldung.spring.data.persistence.truncate;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest(classes = TruncateSpringBootApplication.class,
+        properties = "spring.jpa.properties.hibernate.globally_quoted_identifiers=false")
+class TruncateIntegrationTest {
+
+    @Autowired
+    private MyEntityRepository myEntityRepository;
+
+    @Autowired
+    private JdbcTemplateRepository jdbcTemplateRepository;
+
+    @Autowired
+    private EntityManagerRepository entityManagerRepository;
+
+    @Test
+    void givenSomeData_whenRepositoryTruncateDate_thenNoDataLeft() {
+        int givenCount = 3;
+        givenDummyData(givenCount);
+
+        myEntityRepository.truncateTable();
+
+        assertThat(myEntityRepository.count())
+            .isNotEqualTo(givenCount)
+            .isZero();
+    }
+
+    @Test
+    void givenSomeData_whenEntityManagerTruncateDate_thenNoDataLeft() {
+        int givenCount = 3;
+        givenDummyData(givenCount);
+
+        entityManagerRepository.truncateTable(MyEntity.TABLE_NAME);
+
+        assertThat(myEntityRepository.count())
+            .isNotEqualTo(givenCount)
+            .isZero();
+    }
+
+    @Test
+    void givenSomeData_whenJDBCTemplateTruncateDate_thenNoDataLeft() {
+        int givenCount = 3;
+        givenDummyData(givenCount);
+
+        jdbcTemplateRepository.truncateTable(MyEntity.TABLE_NAME);
+
+        assertThat(myEntityRepository.count())
+            .isNotEqualTo(givenCount)
+            .isZero();
+    }
+
+    private void givenDummyData(int count) {
+        List<MyEntity> input = Stream.generate(this::givenMyEntity).limit(count).collect(Collectors.toList());
+        myEntityRepository.saveAll(input);
+    }
+
+    private MyEntity givenMyEntity() {
+        return new MyEntity();
+    }
+
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-repo-3/README.md b/persistence-modules/spring-data-jpa-repo-3/README.md
new file mode 100644
index 0000000000..d3782eb1e6
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-3/README.md
@@ -0,0 +1,8 @@
+## Spring Data JPA - Repositories
+
+This module contains articles about Spring Data JPA.
+
+### Relevant Articles:
+- [New CRUD Repository Interfaces in Spring Data 3](https://www.baeldung.com/spring-data-3-crud-repository-interfaces)
+- [How to Persist a List of String in JPA?](https://www.baeldung.com/java-jpa-persist-string-list)
+- More articles: [[<-- prev]](../spring-data-jpa-repo-2)
diff --git a/persistence-modules/spring-data-jpa-repo-3/pom.xml b/persistence-modules/spring-data-jpa-repo-3/pom.xml
new file mode 100644
index 0000000000..8cd8ca7f61
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-3/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-3</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-3</relativePath>
+    </parent>
+    <artifactId>spring-data-jpa-repo-3</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-data-jpa-repo-3</name>
+    <description>spring-data-jpa-repo-3</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+
+</project>
diff --git a/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/Application.java b/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/Application.java
new file mode 100644
index 0000000000..13d9dbf414
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/Application.java
@@ -0,0 +1,12 @@
+package com.baeldung.spring.data.jpa.listrepositories;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootApplication.class, args);
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/entity/Book.java b/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/entity/Book.java
new file mode 100644
index 0000000000..40f9f689a6
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/entity/Book.java
@@ -0,0 +1,57 @@
+package com.baeldung.spring.data.jpa.listrepositories.entity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+
+@Entity
+public class Book {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    private String title;
+    private String author;
+    private String isbn;
+
+    public Book() {
+    }
+
+    public Book(String title, String author, String isbn) {
+        this.title = title;
+        this.author = author;
+        this.isbn = isbn;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public String getIsbn() {
+        return isbn;
+    }
+
+    public void setIsbn(String isbn) {
+        this.isbn = isbn;
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/entity/Library.java b/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/entity/Library.java
new file mode 100644
index 0000000000..04c0ad5e0a
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/entity/Library.java
@@ -0,0 +1,66 @@
+package com.baeldung.spring.data.jpa.listrepositories.entity;
+
+import jakarta.persistence.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity(name = "library")
+public class Library {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String name;
+
+    @Convert(converter = StringListConverter.class)
+    @Column(name = "addresses", nullable = false)
+    private List<String> addresses = new ArrayList<>();
+
+    @ElementCollection(targetClass = String.class, fetch = FetchType.EAGER)
+    @CollectionTable(name = "book", joinColumns = @JoinColumn(name = "library_id"))
+    @Column(name = "book", nullable = false)
+    private List<String> books = new ArrayList<>();
+
+    public Library() {
+    }
+
+    public Library(String name, List<String> addresses, List<String> books) {
+        this.name = name;
+        this.addresses = addresses;
+        this.books = books;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<String> getAddresses() {
+        return addresses;
+    }
+
+    public void setAddresses(List<String> addresses) {
+        this.addresses = addresses;
+    }
+
+    public List<String> getBooks() {
+        return books;
+    }
+
+    public void setBooks(List<String> books) {
+        this.books = books;
+    }
+}
diff --git a/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/entity/StringListConverter.java b/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/entity/StringListConverter.java
new file mode 100644
index 0000000000..ffc097ee18
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/entity/StringListConverter.java
@@ -0,0 +1,25 @@
+package com.baeldung.spring.data.jpa.listrepositories.entity;
+
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+
+import java.util.Arrays;
+import java.util.List;
+
+
+import static java.util.Collections.*;
+
+@Converter
+public class StringListConverter implements AttributeConverter<List<String>, String> {
+    private static final String SPLIT_CHAR = ";";
+
+    @Override
+    public String convertToDatabaseColumn(List<String> stringList) {
+        return stringList != null ? String.join(SPLIT_CHAR, stringList) : "";
+    }
+
+    @Override
+    public List<String> convertToEntityAttribute(String string) {
+        return string != null ? Arrays.asList(string.split(SPLIT_CHAR)) : emptyList();
+    }
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/repository/BookListRepository.java b/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/repository/BookListRepository.java
new file mode 100644
index 0000000000..aec8347850
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/repository/BookListRepository.java
@@ -0,0 +1,13 @@
+package com.baeldung.spring.data.jpa.listrepositories.repository;
+
+import com.baeldung.spring.data.jpa.listrepositories.entity.Book;
+import org.springframework.data.repository.ListCrudRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface BookListRepository extends ListCrudRepository<Book, Long> {
+
+    List<Book> findBooksByAuthor(String author);
+}
diff --git a/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/repository/BookPagingAndSortingRepository.java b/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/repository/BookPagingAndSortingRepository.java
new file mode 100644
index 0000000000..1b37b0d1ef
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/repository/BookPagingAndSortingRepository.java
@@ -0,0 +1,15 @@
+package com.baeldung.spring.data.jpa.listrepositories.repository;
+
+import com.baeldung.spring.data.jpa.listrepositories.entity.Book;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.ListCrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface BookPagingAndSortingRepository extends PagingAndSortingRepository<Book, Long>, ListCrudRepository<Book, Long> {
+
+    List<Book> findBooksByAuthor(String author, Pageable pageable);
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/repository/LibraryRepository.java b/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/repository/LibraryRepository.java
new file mode 100644
index 0000000000..71deb04b3e
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-3/src/main/java/com/baeldung/spring/data/jpa/listrepositories/repository/LibraryRepository.java
@@ -0,0 +1,13 @@
+package com.baeldung.spring.data.jpa.listrepositories.repository;
+
+import com.baeldung.spring.data.jpa.listrepositories.entity.Library;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface LibraryRepository extends CrudRepository<Library, Long> {
+    @Query("SELECT l FROM library l JOIN FETCH l.books WHERE l.id = (:id)")
+    Library findById(@Param("id") long id);
+}
diff --git a/persistence-modules/spring-data-jpa-repo-3/src/main/resources/application.properties b/persistence-modules/spring-data-jpa-repo-3/src/main/resources/application.properties
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-3/src/main/resources/application.properties
@@ -0,0 +1 @@
+
diff --git a/persistence-modules/spring-data-jpa-repo-3/src/test/java/com/baeldung/spring/data/jpa/listrepositories/repository/BookListRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-repo-3/src/test/java/com/baeldung/spring/data/jpa/listrepositories/repository/BookListRepositoryIntegrationTest.java
new file mode 100644
index 0000000000..d004d485e4
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-3/src/test/java/com/baeldung/spring/data/jpa/listrepositories/repository/BookListRepositoryIntegrationTest.java
@@ -0,0 +1,28 @@
+package com.baeldung.spring.data.jpa.listrepositories.repository;
+
+import com.baeldung.spring.data.jpa.listrepositories.entity.Book;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.Arrays;
+import java.util.List;
+
+@SpringBootTest
+public class BookListRepositoryIntegrationTest {
+
+    @Autowired
+    private BookListRepository bookListRepository;
+
+    @Test
+    public void givenDbContainsBooks_whenFindBooksByAuthor_thenReturnBooksByAuthor() {
+        Book book1 = new Book("Spring Data", "John Doe", "1234567890");
+        Book book2 = new Book("Spring Data 2", "John Doe", "1234567891");
+        Book book3 = new Book("Spring Data 3", "John Doe", "1234567892");
+        bookListRepository.saveAll(Arrays.asList(book1, book2, book3));
+
+        List<Book> books = bookListRepository.findBooksByAuthor("John Doe");
+        Assertions.assertEquals(3, books.size());
+    }
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-repo-3/src/test/java/com/baeldung/spring/data/jpa/listrepositories/repository/BookPagingAndSortingRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-repo-3/src/test/java/com/baeldung/spring/data/jpa/listrepositories/repository/BookPagingAndSortingRepositoryIntegrationTest.java
new file mode 100644
index 0000000000..8f34e43e3f
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-3/src/test/java/com/baeldung/spring/data/jpa/listrepositories/repository/BookPagingAndSortingRepositoryIntegrationTest.java
@@ -0,0 +1,35 @@
+package com.baeldung.spring.data.jpa.listrepositories.repository;
+
+import com.baeldung.spring.data.jpa.listrepositories.entity.Book;
+import com.baeldung.spring.data.jpa.listrepositories.repository.BookPagingAndSortingRepository;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+
+import java.util.Arrays;
+import java.util.List;
+
+@SpringBootTest
+public class BookPagingAndSortingRepositoryIntegrationTest {
+
+    @Autowired
+    private BookPagingAndSortingRepository bookPagingAndSortingRepository;
+
+    @Test
+    public void givenDbContainsBooks_whenfindBooksByAuthor_thenReturnBooksByAuthor() {
+        Book book1 = new Book("Spring Data", "John Doe", "1234567890");
+        Book book2 = new Book("Spring Data 2", "John Doe", "1234567891");
+        Book book3 = new Book("Spring Data 3", "John Doe", "1234567892");
+        bookPagingAndSortingRepository.saveAll(Arrays.asList(book1, book2, book3));
+
+        Pageable pageable = PageRequest.of(0, 2, Sort.by("title").descending());
+        List<Book> books = bookPagingAndSortingRepository.findBooksByAuthor("John Doe", pageable);
+        Assertions.assertEquals(2, books.size());
+        Assertions.assertEquals(book3.getId(), books.get(0).getId());
+        Assertions.assertEquals(book2.getId(), books.get(1).getId());
+    }
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-repo-3/src/test/java/com/baeldung/spring/data/jpa/listrepositories/repository/LibraryIntegrationTest.java b/persistence-modules/spring-data-jpa-repo-3/src/test/java/com/baeldung/spring/data/jpa/listrepositories/repository/LibraryIntegrationTest.java
new file mode 100644
index 0000000000..7bd1b90407
--- /dev/null
+++ b/persistence-modules/spring-data-jpa-repo-3/src/test/java/com/baeldung/spring/data/jpa/listrepositories/repository/LibraryIntegrationTest.java
@@ -0,0 +1,32 @@
+package com.baeldung.spring.data.jpa.listrepositories.repository;
+
+import com.baeldung.spring.data.jpa.listrepositories.entity.Library;
+import jakarta.transaction.Transactional;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.Arrays;
+
+@SpringBootTest
+public class LibraryIntegrationTest {
+
+    @Autowired
+    private LibraryRepository libraryRepository;
+
+    @Test
+    @Transactional
+    public void givenLibrary_whenGetAddressesAndGetBooks_thenGetListOfItems(){
+        Library library = new Library();
+        library.setAddresses(Arrays.asList("Address 1", "Address 2"));
+        library.setBooks(Arrays.asList("Book 1", "Book 2"));
+
+        libraryRepository.save(library);
+        Library lib = libraryRepository.findById(library.getId().longValue());
+
+        Assertions.assertEquals(2, lib.getAddresses().size());
+        Assertions.assertEquals(2, lib.getBooks().size());
+    }
+
+}
diff --git a/persistence-modules/spring-data-rest/pom.xml b/persistence-modules/spring-data-rest/pom.xml
index f5601cb7ce..fa2cd033f5 100644
--- a/persistence-modules/spring-data-rest/pom.xml
+++ b/persistence-modules/spring-data-rest/pom.xml
@@ -11,9 +11,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
@@ -42,6 +42,17 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-community-dialects</artifactId>
+            <version>${hibernate-community-dialects.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <version>3.3.0</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -64,23 +75,6 @@
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
-            <plugin>
-                <groupId>com.mysema.maven</groupId>
-                <artifactId>maven-apt-plugin</artifactId>
-                <version>${maven.version}</version>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>target/generated-sources</outputDirectory>
-                            <processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
@@ -91,6 +85,7 @@
     <properties>
         <start-class>com.baeldung.books.SpringDataRestApplication</start-class>
         <maven.version>1.0</maven.version>
+        <hibernate-community-dialects.version>6.1.7.Final</hibernate-community-dialects.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteDialect.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteDialect.java
deleted file mode 100644
index 6e840eec43..0000000000
--- a/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteDialect.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.baeldung.books.dialect;
-
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.identity.IdentityColumnSupport;
-
-import java.sql.Types;
-
-public class SQLiteDialect extends Dialect {
-
-    public SQLiteDialect() {
-        registerColumnType(Types.BIT, "integer");
-        registerColumnType(Types.TINYINT, "tinyint");
-        registerColumnType(Types.SMALLINT, "smallint");
-        registerColumnType(Types.INTEGER, "integer");
-        registerColumnType(Types.BIGINT, "bigint");
-        registerColumnType(Types.FLOAT, "float");
-        registerColumnType(Types.REAL, "real");
-        registerColumnType(Types.DOUBLE, "double");
-        registerColumnType(Types.NUMERIC, "numeric");
-        registerColumnType(Types.DECIMAL, "decimal");
-        registerColumnType(Types.CHAR, "char");
-        registerColumnType(Types.VARCHAR, "varchar");
-        registerColumnType(Types.LONGVARCHAR, "longvarchar");
-        registerColumnType(Types.DATE, "date");
-        registerColumnType(Types.TIME, "time");
-        registerColumnType(Types.TIMESTAMP, "timestamp");
-        registerColumnType(Types.BINARY, "blob");
-        registerColumnType(Types.VARBINARY, "blob");
-        registerColumnType(Types.LONGVARBINARY, "blob");
-        registerColumnType(Types.BLOB, "blob");
-        registerColumnType(Types.CLOB, "clob");
-        registerColumnType(Types.BOOLEAN, "integer");
-    }
-
-    public IdentityColumnSupport getIdentityColumnSupport() {
-        return new SQLiteIdentityColumnSupport();
-    }
-
-    public boolean hasAlterTable() {
-        return false;
-    }
-
-    public boolean dropConstraints() {
-        return false;
-    }
-
-    public String getDropForeignKeyString() {
-        return "";
-    }
-
-    public String getAddForeignKeyConstraintString(String constraintName, String[] foreignKey, String referencedTable, String[] primaryKey, boolean referencesPrimaryKey) {
-        return "";
-    }
-
-    public String getAddPrimaryKeyConstraintString(String constraintName) {
-        return "";
-    }
-
-    public String getForUpdateString() {
-        return "";
-    }
-
-    public String getAddColumnString() {
-        return "add column";
-    }
-
-    public boolean supportsOuterJoinForUpdate() {
-        return false;
-    }
-
-    public boolean supportsIfExistsBeforeTableName() {
-        return true;
-    }
-
-    public boolean supportsCascadeDelete() {
-        return false;
-    }
-}
diff --git a/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteIdentityColumnSupport.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteIdentityColumnSupport.java
deleted file mode 100644
index 682d82c6f1..0000000000
--- a/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/dialect/SQLiteIdentityColumnSupport.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.baeldung.books.dialect;
-
-import org.hibernate.MappingException;
-import org.hibernate.dialect.identity.IdentityColumnSupportImpl;
-
-public class SQLiteIdentityColumnSupport extends IdentityColumnSupportImpl {
-
-    @Override
-    public boolean supportsIdentityColumns() {
-        return true;
-    }
-
-    @Override
-    public String getIdentitySelectString(String table, String column, int type) throws MappingException {
-        return "select last_insert_rowid()";
-    }
-
-    @Override
-    public String getIdentityColumnString(int type) throws MappingException {
-        return "integer";
-    }
-}
diff --git a/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Address.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Address.java
index 3c36db0f3c..2627c21615 100644
--- a/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Address.java
+++ b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Address.java
@@ -1,11 +1,11 @@
 package com.baeldung.books.models;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToOne;
 
 @Entity
 public class Address {
diff --git a/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Author.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Author.java
index aec2e62ebf..385113d800 100644
--- a/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Author.java
+++ b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Author.java
@@ -2,15 +2,15 @@ package com.baeldung.books.models;
 
 import java.util.List;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
 
 @Entity
 public class Author {
diff --git a/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Book.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Book.java
index 7451b04b3b..ea3fb325c1 100644
--- a/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Book.java
+++ b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Book.java
@@ -2,15 +2,15 @@ package com.baeldung.books.models;
 
 import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
 
 @Entity
 public class Book {
diff --git a/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Library.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Library.java
index 5f95169a9b..28a54dbd33 100644
--- a/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Library.java
+++ b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Library.java
@@ -2,14 +2,14 @@ package com.baeldung.books.models;
 
 import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
 
 import org.springframework.data.rest.core.annotation.RestResource;
 
diff --git a/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Subject.java b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Subject.java
index 11a4425fdd..28d16f5054 100644
--- a/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Subject.java
+++ b/persistence-modules/spring-data-rest/src/main/java/com/baeldung/books/models/Subject.java
@@ -1,10 +1,10 @@
 package com.baeldung.books.models;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Entity
 public class Subject {
diff --git a/persistence-modules/spring-data-rest/src/main/resources/persistence-sqlite.properties b/persistence-modules/spring-data-rest/src/main/resources/persistence-sqlite.properties
index b6b5f4e4d6..e570322a82 100644
--- a/persistence-modules/spring-data-rest/src/main/resources/persistence-sqlite.properties
+++ b/persistence-modules/spring-data-rest/src/main/resources/persistence-sqlite.properties
@@ -2,6 +2,6 @@ driverClassName=org.sqlite.JDBC
 url=jdbc:sqlite:memory:myDb?cache=shared
 username=sa
 password=sa
-hibernate.dialect=com.baeldung.dialect.SQLiteDialect
+spring.jpa.database-platform=org.hibernate.community.dialect.SQLiteDialect
 hibernate.hbm2ddl.auto=create-drop
 hibernate.show_sql=true
diff --git a/persistence-modules/spring-jpa-2/README.md b/persistence-modules/spring-jpa-2/README.md
index f9f259cdfa..c1068b6a39 100644
--- a/persistence-modules/spring-jpa-2/README.md
+++ b/persistence-modules/spring-jpa-2/README.md
@@ -7,4 +7,5 @@
 - [The DAO with Spring and Hibernate](https://www.baeldung.com/persistence-layer-with-spring-and-hibernate)
 - [Simplify the DAO with Spring and Java Generics](https://www.baeldung.com/simplifying-the-data-access-layer-with-spring-and-java-generics)
 - [Multitenancy With Spring Data JPA](https://www.baeldung.com/multitenancy-with-spring-data-jpa)
+- [Remove Entity with Many-to-Many Relationship in JPA](https://www.baeldung.com/jpa-remove-entity-many-to-many)
 - More articles: [[<-- prev]](/spring-jpa)
diff --git a/persistence-modules/spring-jpa-2/pom.xml b/persistence-modules/spring-jpa-2/pom.xml
index 19bc9cba14..974dd41df9 100644
--- a/persistence-modules/spring-jpa-2/pom.xml
+++ b/persistence-modules/spring-jpa-2/pom.xml
@@ -101,7 +101,7 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>5.1.5.RELEASE</org.springframework.version>
+        <org.springframework.version>5.2.0.RELEASE</org.springframework.version>
         <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
         <!-- persistence -->
         <tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
diff --git a/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Application.java b/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Application.java
new file mode 100644
index 0000000000..7b8551ee0c
--- /dev/null
+++ b/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Application.java
@@ -0,0 +1,12 @@
+package com.baeldung.manytomanyremoval;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+}
diff --git a/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Author.java b/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Author.java
new file mode 100644
index 0000000000..d9906a21cd
--- /dev/null
+++ b/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Author.java
@@ -0,0 +1,62 @@
+package com.baeldung.manytomanyremoval;
+
+import javax.persistence.*;
+import java.util.HashSet;
+import java.util.Set;
+
+@Entity
+@Table(name = "author")
+public class Author {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "name")
+    private String name;
+
+    @ManyToMany(mappedBy = "authors")
+    private Set<Book> books = new HashSet<>();
+
+    // standard getters and setters
+
+    public Author() {
+    }
+
+    public Author(String name) {
+        this.name = name;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Set<Book> getBooks() {
+        return books;
+    }
+
+    public void setBooks(Set<Book> books) {
+        this.books = books;
+    }
+
+    @PreRemove
+    private void removeBookAssociations() {
+        for (Book book : this.books) {
+            book.getAuthors().remove(this);
+        }
+    }
+
+}
diff --git a/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Book.java b/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Book.java
new file mode 100644
index 0000000000..4b49acd000
--- /dev/null
+++ b/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Book.java
@@ -0,0 +1,65 @@
+package com.baeldung.manytomanyremoval;
+
+
+import javax.persistence.*;
+import java.util.HashSet;
+import java.util.Set;
+
+@Entity
+@Table(name = "book")
+public class Book {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "title")
+    private String title;
+
+    @ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
+    @JoinTable(name = "book_author",
+            joinColumns = @JoinColumn(name = "book_id"),
+            inverseJoinColumns = @JoinColumn(name = "author_id")
+    )
+    private Set<Author> authors = new HashSet<>();
+
+    // standard getters and setters
+
+    public Book() {
+    }
+
+    public Book(String title) {
+        this.title = title;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Set<Author> getAuthors() {
+        return authors;
+    }
+
+    public void removeAuthor(Author author) {
+        this.authors.remove(author);
+        author.getBooks().remove(this);
+    }
+
+    public void addAuthor(Author author) {
+        authors.add(author);
+        author.getBooks().add(this);
+    }
+
+}
diff --git a/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Category.java b/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Category.java
new file mode 100644
index 0000000000..f7202f544c
--- /dev/null
+++ b/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Category.java
@@ -0,0 +1,41 @@
+package com.baeldung.manytomanyremoval;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "category")
+public class Category {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "name")
+    private String name;
+
+    // getters and setters
+
+    public Category() {
+    }
+
+    public Category(String name) {
+        this.name = name;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Post.java b/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Post.java
new file mode 100644
index 0000000000..d229a9d0d7
--- /dev/null
+++ b/persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Post.java
@@ -0,0 +1,59 @@
+package com.baeldung.manytomanyremoval;
+
+
+import javax.persistence.*;
+import java.util.HashSet;
+import java.util.Set;
+
+@Entity
+@Table(name = "post")
+public class Post {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "title")
+    private String title;
+
+    @ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH})
+    @JoinTable(name = "post_category",
+            joinColumns = @JoinColumn(name = "post_id"),
+            inverseJoinColumns = @JoinColumn(name = "category_id")
+    )
+    private Set<Category> categories = new HashSet<>();
+
+    // getters and setters
+
+    public Post(String title) {
+        this.title = title;
+    }
+
+    public Post() {
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Set<Category> getCategories() {
+        return categories;
+    }
+
+    public void setCategories(Set<Category> categories) {
+        this.categories = categories;
+    }
+}
diff --git a/persistence-modules/spring-jpa-2/src/test/java/com/baeldung/manytomanyremoval/BidirectionalRemovalUnitTest.java b/persistence-modules/spring-jpa-2/src/test/java/com/baeldung/manytomanyremoval/BidirectionalRemovalUnitTest.java
new file mode 100644
index 0000000000..f214fcdc2a
--- /dev/null
+++ b/persistence-modules/spring-jpa-2/src/test/java/com/baeldung/manytomanyremoval/BidirectionalRemovalUnitTest.java
@@ -0,0 +1,78 @@
+package com.baeldung.manytomanyremoval;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.persistence.EntityManager;
+
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(classes = TestContextConfig.class)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
+@Transactional
+class BidirectionalRemovalUnitTest {
+
+    @Autowired
+    private EntityManager entityManager;
+
+    @BeforeEach
+    void init() {
+        Author author1 = new Author("Erich Gamma");
+        Author author2 = new Author("John Vlissides");
+        Author author3 = new Author("Ralph Johnson");
+        Author author4 = new Author("Richard Helm");
+
+        Book book = new Book();
+        book.setTitle("GOF Java");
+        book.addAuthor(author1);
+        book.addAuthor(author2);
+        book.addAuthor(author3);
+        book.addAuthor(author4);
+        entityManager.persist(book);
+
+        Book book2 = new Book();
+        book2.setTitle("A Lost Age");
+        book2.addAuthor(author3);
+        entityManager.persist(book2);
+    }
+
+    @Test
+    void givenEntities_whenRemoveFromOwner_thenRemoveAssociation() {
+        Author author = (Author) entityManager
+                .createQuery("SELECT author from Author author where author.name = ?1")
+                .setParameter(1, "Ralph Johnson")
+                .getSingleResult();
+
+        Book book1 = entityManager.find(Book.class, 1L);
+        Book book2 = entityManager.find(Book.class, 2L);
+
+        book1.removeAuthor(author);
+        entityManager.persist(book1);
+
+        Assertions.assertEquals(3, book1.getAuthors().size());
+        Assertions.assertEquals(1, book2.getAuthors().size());
+    }
+
+    @Transactional
+    @Test
+    void givenEntities_whenRemoveFromNotOwner_thenRemoveAssociation() {
+        Author author = (Author) entityManager
+                .createQuery("SELECT author from Author author where author.name = ?1")
+                .setParameter(1, "Ralph Johnson")
+                .getSingleResult();
+        Book book1 = entityManager.find(Book.class, 1L);
+        Book book2 = entityManager.find(Book.class, 2L);
+
+        entityManager.remove(author);
+
+        Assertions.assertEquals(3, book1.getAuthors().size());
+        Assertions.assertEquals(0, book2.getAuthors().size());
+    }
+}
+
diff --git a/persistence-modules/spring-jpa-2/src/test/java/com/baeldung/manytomanyremoval/TestContextConfig.java b/persistence-modules/spring-jpa-2/src/test/java/com/baeldung/manytomanyremoval/TestContextConfig.java
new file mode 100644
index 0000000000..6a840824de
--- /dev/null
+++ b/persistence-modules/spring-jpa-2/src/test/java/com/baeldung/manytomanyremoval/TestContextConfig.java
@@ -0,0 +1,12 @@
+package com.baeldung.manytomanyremoval;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+@Configuration
+@PropertySource("classpath:/manytomanyremoval/test.properties")
+@ComponentScan("com.baeldung.manytomanyremoval")
+public class TestContextConfig {
+
+}
diff --git a/persistence-modules/spring-jpa-2/src/test/java/com/baeldung/manytomanyremoval/UnidirectionalRemovalUnitTest.java b/persistence-modules/spring-jpa-2/src/test/java/com/baeldung/manytomanyremoval/UnidirectionalRemovalUnitTest.java
new file mode 100644
index 0000000000..b23b589fb7
--- /dev/null
+++ b/persistence-modules/spring-jpa-2/src/test/java/com/baeldung/manytomanyremoval/UnidirectionalRemovalUnitTest.java
@@ -0,0 +1,55 @@
+package com.baeldung.manytomanyremoval;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.persistence.EntityManager;
+
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(classes = TestContextConfig.class)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
+@Transactional
+class UnidirectionalRemovalUnitTest {
+
+    @Autowired
+    private EntityManager entityManager;
+
+    @BeforeEach
+    void init() {
+        Category category1 = new Category("JPA");
+        Category category2 = new Category("Persistence");
+
+        Post post1 = new Post("Many-to-Many Relationship");
+        post1.getCategories().add(category1);
+        post1.getCategories().add(category2);
+
+        Post post2 = new Post("Entity Manager");
+        post2.getCategories().add(category1);
+
+        entityManager.persist(post1);
+        entityManager.persist(post2);
+
+        Assertions.assertEquals(2, post1.getCategories().size());
+        Assertions.assertEquals(1, post2.getCategories().size());
+    }
+
+    @Test
+    void givenEntities_whenRemove_thenRemoveAssociation() {
+        Post post1 = entityManager.find(Post.class, 1L);
+        Post post2 = entityManager.find(Post.class, 2L);
+        Category category = entityManager.find(Category.class, 1L);
+
+        post1.getCategories().remove(category);
+
+        Assertions.assertEquals(1, post1.getCategories().size());
+        Assertions.assertEquals(1, post2.getCategories().size());
+    }
+
+}
diff --git a/persistence-modules/spring-jpa-2/src/test/resources/manytomanyremoval/test.properties b/persistence-modules/spring-jpa-2/src/test/resources/manytomanyremoval/test.properties
new file mode 100644
index 0000000000..83479cd453
--- /dev/null
+++ b/persistence-modules/spring-jpa-2/src/test/resources/manytomanyremoval/test.properties
@@ -0,0 +1,11 @@
+spring.datasource.url=jdbc:h2:mem:mydb;MODE=LEGACY;
+spring.datasource.driverClassName=org.h2.Driver
+spring.datasource.username=sa
+spring.datasource.password=
+
+hibernate.dialect=org.hibernate.dialect.H2Dialect
+hibernate.hbm2ddl.auto=none
+spring.jpa.show-sql=true
+spring.jpa.hibernate.dialect=org.hibernate.dialect.H2Dialect
+spring.jpa.hibernate.ddl-auto=create-drop
+
diff --git a/persistence-modules/spring-persistence-simple/src/main/resources/com/baeldung/spring/jndi/datasource/mock/datasource.properties b/persistence-modules/spring-persistence-simple/src/main/resources/com/baeldung/spring/jndi/datasource/mock/datasource.properties
index 8be94daf36..6a803f5f4c 100644
--- a/persistence-modules/spring-persistence-simple/src/main/resources/com/baeldung/spring/jndi/datasource/mock/datasource.properties
+++ b/persistence-modules/spring-persistence-simple/src/main/resources/com/baeldung/spring/jndi/datasource/mock/datasource.properties
@@ -1,5 +1,5 @@
 ds.type=javax.sql.DataSource
 ds.driver=org.h2.Driver
-ds.url=jdbc:jdbc:h2:mem:testdb
+ds.url=jdbc:h2:mem:testdb
 ds.user=sa
 ds.password=password
diff --git a/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/spring/jndi/datasource/mock/SimpleJNDIUnitTest.java b/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/spring/jndi/datasource/mock/SimpleJNDIUnitTest.java
index 6576962609..3788c0dde8 100644
--- a/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/spring/jndi/datasource/mock/SimpleJNDIUnitTest.java
+++ b/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/spring/jndi/datasource/mock/SimpleJNDIUnitTest.java
@@ -21,7 +21,7 @@ public class SimpleJNDIUnitTest {
 
     @Test
     public void whenMockJndiDataSource_thenReturnJndiDataSource() throws Exception {
-        String dsString = "org.h2.Driver::::jdbc:jdbc:h2:mem:testdb::::sa";
+        String dsString = "org.h2.Driver::::jdbc:h2:mem:testdb::::sa";
         Context envContext = (Context) this.initContext.lookup("java:/comp/env");
         DataSource ds = (DataSource) envContext.lookup("datasource/ds");
 
diff --git a/pom.xml b/pom.xml
index 3994c713c8..996ebdc459 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,6 +222,9 @@
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <version>${maven-war-plugin.version}</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
             </plugin>
         </plugins>
 
@@ -330,89 +333,41 @@
                 <module>parent-spring-5</module>
                 <module>parent-java</module>
 
-                <module>apache-cxf-modules</module>
+                <module>checker-framework</module>
+                <!-- <module>clojure-modules</module> --> <!-- Not a maven project -->
 
-                <module>azure</module>
-                <module>checker-plugin</module>
-                <!-- <module>clojure</module> --> <!-- Not a maven project -->
+                <module>core-java-modules/core-java-8</module>
+                <module>core-java-modules/core-java-8-2</module>
+                <module>core-java-modules/core-java-8-datetime</module>
+                <module>core-java-modules/core-java-8-datetime-2</module>
+                <module>core-java-modules/core-java-sun</module>
+                <module>core-java-modules/core-java-security</module>
+                <module>core-java-modules/core-java-nio-2</module>
+                <module>core-java-modules/core-java-serialization</module>
+                <module>core-java-modules/core-java-lang</module>
+                <module>core-java-modules/core-java-lang-math-3</module>
+                <module>core-java-modules/core-java-collections-conversions-2</module>
+                <module>core-java-modules/core-java-streams-2</module>
 
-                <module>core-groovy-modules</module>
-                <module>core-java-modules</module>
                 <module>couchbase</module>
-
-                <module>drools</module>
                 <!-- <module>ethereum</module> --> <!-- JAVA-6001 -->
                 <!-- <module>gradle-modules</module> --> <!-- Not a maven project -->
                 <module>gradle-modules/gradle/maven-to-gradle</module>
                 <!-- <module>grails</module> --> <!-- Not a maven project -->
-
-                <module>guava-modules</module>
                 <!-- <module>guest</module> --> <!-- not to be built as its for guest articles  -->
 
-                <module>apache-httpclient</module>
-                <module>httpclient4</module>
-
-
-                <module>jackson-modules</module>
-
-                <module>javafx</module>
-                <module>java-jdi</module>
-                <module>java-websocket</module>
-
-                <module>jaxb</module>
-                <module>jersey</module>
-                <module>jhipster-5</module>
-                <module>jmeter</module>
-                <module>jmh</module>
-
-                <module>jsf</module>
-                <module>json-modules</module>
-
-                <module>kubernetes-modules</module>
-
+                <module>jetbrains</module>
                 <!-- <module>lagom</module> --> <!-- Not a maven project -->
                 <module>language-interop</module>
-                <module>libraries-2</module>
-                <module>libraries-3</module>
-                <module>libraries-data</module>
 
+                <module>libraries-jdk8</module>
 
-                <module>libraries-data-db</module>
-                <module>libraries-security</module>
-                <module>libraries-server-2</module>
-                <module>libraries-testing</module>
-                <module>logging-modules</module>
-                <module>lombok-modules</module>
+                <module>lombok-modules/lombok-custom</module>
 
-                <module>maven-modules</module>
-
-                <module>messaging-modules</module>
-
-                <module>microservices-modules</module>
                 <module>muleesb</module>
 
-
-                <module>netflix-modules</module>
-
-                <module>osgi</module>
-                <module>orika</module>
-
-                <module>patterns-modules</module>
-
-                <module>performance-tests</module>
-                <module>persistence-modules</module>
-
-
-                <module>quarkus-modules</module>
-
-                <module>rule-engines-modules</module>
-                <module>rxjava-modules</module>
-
-                <module>reactive-systems</module>
-                <module>security-modules</module>
-
-                <module>vavr-modules</module>
-                <module>web-modules</module>
+                <module>persistence-modules/deltaspike</module> <!-- delta spike it doesn't yet the jakarta API-->
+                <module>persistence-modules/hibernate-ogm</module> <!-- hibernate-ogm wasn't updated and not support jakarta API -->
             </modules>
 
         </profile>
@@ -457,34 +412,15 @@
                 <module>parent-spring-5</module>
                 <module>parent-java</module>
 
-                <module>saas-modules</module>
-                <module>server-modules</module>
-                <module>spf4j</module>
                 <module>spring-4</module>
                 <module>spring-aop</module>
-                <module>spring-aop-2</module>
-                <module>spring-batch</module>
-                <module>spring-bom</module>
-                <module>spring-boot-modules</module>
-                <module>spring-boot-rest</module>
-                <module>spring-caching</module>
+
                 <module>spring-cloud-modules</module>
                 <!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
-                <module>spring-core</module>
-                <module>spring-core-4</module>
-                <module>spring-di</module>
-                <module>spring-di-2</module>
-                <module>spring-drools</module>
-                <module>spring-ejb-modules</module>
 
                 <module>spring-exceptions</module>
                 <module>spring-integration</module>
                 <module>spring-jenkins-pipeline</module>
-                <module>spring-jersey</module>
-                <module>spring-jinq</module>
-                <module>spring-katharsis</module>
-                <module>spring-mobile</module>
-                <module>spring-remoting-modules</module>
 
                 <!-- <module>spring-roo</module> --> <!-- JAVA-17327 -->
 
@@ -494,7 +430,6 @@
                 <module>spring-spel</module>
                 <module>spring-static-resources</module>
                 <module>spring-swagger-codegen</module>
-                <module>spring-vault</module>
                 <module>spring-web-modules</module>
                 <module>spring-websockets</module>
                 <module>static-analysis</module>
@@ -550,18 +485,7 @@
 
                 <module>jenkins-modules</module>
                 <module>jhipster-modules</module>
-                <module>jhipster-5</module>
                 <module>jws</module>
-
-                <module>libraries</module> <!-- very long running -->
-                <module>libraries-4</module>
-                <module>libraries-5</module>
-                <module>libraries-6</module>
-                <module>spring-boot-modules/spring-boot-react</module>
-                <module>spring-ejb-modules/ejb-beans</module>
-
-                <module>vaadin</module>
-                <module>vavr-modules</module>
             </modules>
         </profile>
 
@@ -597,88 +521,39 @@
                 <module>parent-spring-5</module>
                 <module>parent-java</module>
 
-                <module>apache-cxf-modules</module>
+                <module>checker-framework</module>
+                <!-- <module>clojure-modules</module> --> <!-- Not a maven project -->
 
-                <module>azure</module>
-                <module>checker-plugin</module>
-                <!-- <module>clojure</module> --> <!-- Not a maven project -->
+                <module>core-java-modules/core-java-8</module>
+                <module>core-java-modules/core-java-8-2</module>
+                <module>core-java-modules/core-java-8-datetime</module>
+                <module>core-java-modules/core-java-8-datetime-2</module>
+                <module>core-java-modules/core-java-sun</module>
+                <module>core-java-modules/core-java-security</module>
+                <module>core-java-modules/core-java-nio-2</module>
+                <module>core-java-modules/core-java-serialization</module>
+                <module>core-java-modules/core-java-lang</module>
+                <module>core-java-modules/core-java-lang-math-3</module>
+                <module>core-java-modules/core-java-collections-conversions-2</module>
+                <module>core-java-modules/core-java-streams-2</module>
 
-                <module>core-groovy-modules</module>
-                <module>core-java-modules</module>
                 <module>couchbase</module>
-                <module>drools</module>
                 <!-- <module>ethereum</module> --> <!-- JAVA-6001 -->
                 <!-- <module>gradle-modules</module> --> <!-- Not a maven project -->
                 <module>gradle-modules/gradle/maven-to-gradle</module>
                 <!-- <module>grails</module> --> <!-- Not a maven project -->
-
-                <module>guava-modules</module>
                 <!-- <module>guest</module> --> <!-- not to be built as its for guest articles  -->
 
-                <module>apache-httpclient</module>
-                <module>httpclient4</module>
-
-
-                <module>jackson-modules</module>
-
-                <module>javafx</module>
-                <module>java-jdi</module>
-                <module>java-websocket</module>
-
-                <module>jaxb</module>
-                <module>jersey</module>
-                <module>jhipster-5</module>
-                <module>jmeter</module>
-                <module>jmh</module>
-
-                <module>jsf</module>
-                <module>json-modules</module>
-
-                <module>kubernetes-modules</module>
-
                 <!-- <module>lagom</module> --> <!-- Not a maven project -->
                 <module>language-interop</module>
-                <module>libraries-2</module>
-                <module>libraries-3</module>
-                <module>libraries-data</module>
 
+                <module>libraries-jdk8</module>
 
-                <module>libraries-data-db</module>
-                <module>libraries-security</module>
-                <module>libraries-server-2</module>
-                <module>libraries-testing</module>
-                <module>logging-modules</module>
-                <module>lombok-modules</module>
-
-                <module>maven-modules</module>
-
-                <module>messaging-modules</module>
-
-                <module>microservices-modules</module>
+                <module>lombok-modules/lombok-custom</module>
                 <module>muleesb</module>
 
-
-                <module>netflix-modules</module>
-
-                <module>osgi</module>
-                <module>orika</module>
-
-                <module>patterns-modules</module>
-
-                <module>performance-tests</module>
-                <module>persistence-modules</module>
-
-
-                <module>quarkus-modules</module>
-
-                <module>rule-engines-modules</module>
-                <module>rxjava-modules</module>
-
-                <module>reactive-systems</module>
-                <module>security-modules</module>
-
-                <module>vavr-modules</module>
-                <module>web-modules</module>
+                <module>persistence-modules/deltaspike</module> <!-- delta spike it doesn't yet the jakarta API-->
+                <module>persistence-modules/hibernate-ogm</module> <!-- hibernate-ogm wasn't updated and not support jakarta API -->
             </modules>
 
         </profile>
@@ -715,33 +590,14 @@
                 <module>parent-spring-5</module>
                 <module>parent-java</module>
 
-                <module>saas-modules</module>
-                <module>server-modules</module>
-                <module>spf4j</module>
                 <module>spring-4</module>
-                <module>spring-aop</module>
-                <module>spring-aop-2</module>
-                <module>spring-batch</module>
-                <module>spring-bom</module>
-                <module>spring-boot-modules</module>
-                <module>spring-boot-rest</module>
-                <module>spring-caching</module>
+
                 <module>spring-cloud-modules</module>
                 <!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
-                <module>spring-core</module>
-                <module>spring-core-4</module>
-                <module>spring-di</module>
-                <module>spring-di-2</module>
-                <module>spring-drools</module>
-                <module>spring-ejb-modules</module>
+
                 <module>spring-exceptions</module>
                 <module>spring-integration</module>
                 <module>spring-jenkins-pipeline</module>
-                <module>spring-jersey</module>
-                <module>spring-jinq</module>
-                <module>spring-katharsis</module>
-                <module>spring-mobile</module>
-                <module>spring-remoting-modules</module>
 
                 <!-- <module>spring-roo</module> --> <!-- JAVA-17327 -->
 
@@ -751,7 +607,6 @@
                 <module>spring-spel</module>
                 <module>spring-static-resources</module>
                 <module>spring-swagger-codegen</module>
-                <module>spring-vault</module>
                 <module>spring-web-modules</module>
                 <module>spring-websockets</module>
                 <module>static-analysis</module>
@@ -799,17 +654,7 @@
 
                 <module>jenkins-modules</module>
                 <module>jhipster-modules</module>
-                <module>jhipster-5</module>
                 <module>jws</module>
-
-                <module>libraries</module> <!-- very long running -->
-                <module>libraries-4</module>
-                <module>libraries-5</module>
-                <module>libraries-6</module>
-                <module>spring-boot-modules/spring-boot-react</module>
-                <module>spring-ejb-modules/ejb-beans</module>
-                <module>vaadin</module>
-               <module>vavr-modules</module>
             </modules>
 
         </profile>
@@ -875,6 +720,58 @@
             </build>
 
             <modules>
+                <module>lombok-modules</module>
+                <module>osgi</module>
+                <module>spring-katharsis</module>
+                <module>logging-modules</module>
+                <module>spring-boot-modules</module>
+                <module>apache-httpclient</module>
+                <module>apache-httpclient4</module>
+                <module>apache-httpclient-2</module>
+                <module>spring-mobile</module>
+                <module>microservices-modules</module>
+                <module>spring-ejb-modules</module>
+                <module>spring-di</module>
+                <module>spring-di-2</module>
+                <module>spring-jinq</module>
+                <module>vavr-modules</module>
+                <module>java-websocket</module>
+                <module>azure</module>
+                <module>netflix-modules</module>
+                <module>spf4j</module>
+                <module>spring-jersey</module>
+                <module>jersey</module>
+                <module>jaxb</module>
+
+                <module>javafx</module>
+                <module>spring-batch</module>
+                <module>spring-batch-2</module>
+                <module>spring-boot-rest</module>
+                <module>spring-drools</module>
+                <module>spring-exceptions</module>
+                <module>spring-jenkins-pipeline</module>
+                <module>spring-core</module>
+                <module>spring-core-4</module>
+                <module>spring-integration</module>
+                <module>spring-remoting-modules</module>
+                <module>libraries-security</module>
+                <module>libraries-data-db</module>
+
+                <module>performance-tests</module>
+                <module>security-modules</module>
+                <module>libraries-server-2</module>
+                <module>orika</module>
+                <module>patterns-modules</module>
+                <module>json-modules</module>
+                <module>libraries-data</module>
+                <module>saas-modules</module>
+                <module>server-modules</module>
+                <module>apache-cxf-modules</module>
+
+                <module>spring-aop</module>
+                <module>jmeter</module>
+                <module>spring-aop-2</module>
+
                 <module>algorithms-modules</module>
                 <module>apache-libraries</module>
                 <module>apache-poi</module>
@@ -882,15 +779,12 @@
                 <module>di-modules</module>
                 <module>asciidoctor</module>
                 <module>aws-modules</module>
-                <module>core-java-modules/core-java-9</module>
-                <module>core-java-modules/core-java-9-improvements</module>
-                <module>core-java-modules/core-java-9-jigsaw</module>
+
+                <module>couchbase</module>
+                <module>core-groovy-modules</module>
+
+                <module>core-java-modules</module>
                 <!-- <module>core-java-modules/core-java-9-new-features</module> --> <!-- uses preview features, to be decided how to handle -->
-                <module>core-java-modules/core-java-9-streams</module>
-                <module>core-java-modules/core-java-10</module>
-                <module>core-java-modules/core-java-11</module>
-                <module>core-java-modules/core-java-11-2</module>
-                <module>core-java-modules/core-java-11-3</module>
                 <!-- <module>core-java-modules/core-java-12</module> --> <!-- uses preview features, to be decided how to handle -->
                 <!-- <module>core-java-modules/core-java-13</module> --> <!-- uses preview features, to be decided how to handle -->
                 <!-- <module>core-java-modules/core-java-14</module> --> <!-- uses preview features, to be decided how to handle -->
@@ -898,53 +792,34 @@
                 <!-- <module>core-java-modules/core-java-16</module> --> <!-- uses preview features, to be decided how to handle -->
                 <!-- <module>core-java-modules/core-java-17</module> --> <!-- uses preview features, to be decided how to handle -->
                 <!-- <module>core-java-modules/core-java-19</module> --> <!-- uses preview features, to be decided how to handle -->
-                <module>core-java-modules/core-java-collections-set</module>
-                <module>core-java-modules/core-java-collections-list-4</module>
-                <module>core-java-modules/core-java-collections-array-list</module>
-                <module>core-java-modules/core-java-collections-maps-4</module>
-                <module>core-java-modules/core-java-collections-maps-5</module>
-                <module>core-java-modules/core-java-concurrency-simple</module>
-                <module>core-java-modules/core-java-date-operations-1</module>
-                <module>core-java-modules/core-java-datetime-conversion</module>
-                <module>core-java-modules/core-java-datetime-string</module>
-                <module>core-java-modules/core-java-io-conversions-2</module>
-                <module>core-java-modules/core-java-jpms</module>
-                <module>core-java-modules/core-java-os</module>
-                <module>core-java-modules/core-java-streams-4</module>
-                <module>core-java-modules/core-java-string-algorithms-3</module>
-                <module>core-java-modules/core-java-string-operations-3</module>
-                <module>core-java-modules/core-java-string-operations-4</module>
-                <module>core-java-modules/core-java-string-operations-5</module>
-                <module>core-java-modules/core-java-time-measurements</module>
-                <module>core-java-modules/core-java-networking-3</module>
-                <module>core-java-modules/core-java-strings</module>
-                <module>core-java-modules/core-java-httpclient</module>
-				<module>custom-pmd</module>
-                <module>spring-core-6</module>
+                <module>custom-pmd</module>
                 <module>data-structures</module>
                 <module>ddd-contexts</module>
+                <module>jackson-modules</module>
+                <module>jmh</module>
                 <module>deeplearning4j</module>
                 <module>docker-modules</module>
-                <module>apache-httpclient-2</module>
-                <module>kubernetes-modules/kubernetes-spring</module>
+                <module>drools</module>
+                <module>guava-modules</module>
+                <module>kubernetes-modules</module>
                 <module>libraries-concurrency</module>
-                <module>maven-modules/compiler-plugin-java-9</module>
-                <module>maven-modules/maven-generate-war</module>
-                <module>maven-modules/multimodulemavenproject</module>
+                <module>jhipster-6</module>
+                <module>libraries-testing</module>
+                <module>maven-modules</module>
                 <module>optaplanner</module>
-                <module>persistence-modules/sirix</module>
-                <module>persistence-modules/spring-data-cassandra-2</module>
-                <module>quarkus-modules/quarkus-vs-springboot</module>
-                <module>quarkus-modules/quarkus-jandex</module>
-                <module>spring-boot-modules/spring-boot-cassandre</module>
-                <module>spring-boot-modules/spring-boot-3</module>
-                <module>spring-boot-modules/spring-boot-3-native</module>
-                <module>spring-boot-modules/spring-boot-3-observation</module>
-                <module>spring-boot-modules/spring-boot-3-test-pitfalls</module>
+                <module>persistence-modules</module>
+                <module>quarkus-modules</module>
                 <module>spring-reactive-modules</module>
                 <module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
                 <module>testing-modules/testing-assertions</module>
                 <module>persistence-modules/fauna</module>
+                <module>persistence-modules/spring-data-rest</module>
+
+                <module>rule-engines-modules</module>
+
+                <module>reactive-systems</module>
+                <module>rxjava-modules</module>
+
                 <module>lightrun</module>
                 <module>tablesaw</module>
                 <module>geotools</module>
@@ -953,7 +828,6 @@
 
                 <module>akka-modules</module>
                 <module>annotations</module>
-                <module>apache-httpclient</module>
                 <module>httpclient-simple</module>
                 <module>antlr</module>
                 <module>apache-kafka</module>
@@ -961,23 +835,22 @@
                 <module>apache-olingo</module>
 
                 <module>apache-poi-2</module>
-                <module>apache-rocketmq</module>
                 <module>apache-thrift</module>
                 <module>apache-tika</module>
 
                 <module>asm</module>
                 <module>atomikos</module>
                 <module>atomix</module>
+
                 <module>axon</module>
 
                 <module>bazel</module>
-                <module>code-generation</module>
+                <module>google-auto-project</module>
                 <module>ddd</module>
-                <module>discord4j</module>
                 <module>disruptor</module>
                 <module>dozer</module>
                 <module>dubbo</module>
-                <module>feign</module>
+                <!-- <module>feign</module> --> <!-- JAVA-19475 -->
                 <module>google-cloud</module>
                 <module>graphql-modules</module>
                 <module>grpc</module>
@@ -985,7 +858,7 @@
                 <module>hystrix</module>
                 <module>jackson-simple</module>
                 <module>java-blockchain</module>
-
+                <module>java-jdi</module>
                 <module>java-rmi</module>
                 <module>java-spi</module>
                 <module>javax-sound</module>
@@ -998,7 +871,14 @@
                 <module>java-native</module>
                 <module>jsoup</module>
                 <module>ksqldb</module>
-                <module>libraries-7</module>
+                <module>jsf</module>
+
+                <module>libraries</module> <!-- very long running -->
+                <module>libraries-2</module>
+                <module>libraries-4</module>
+                <module>libraries-5</module>
+                <module>libraries-6</module>
+
                 <module>libraries-apache-commons</module>
                 <module>libraries-apache-commons-collections</module>
                 <module>libraries-apache-commons-io</module>
@@ -1023,7 +903,6 @@
                 <module>protobuffer</module>
                 <module>reactor-core</module>
                 <module>rsocket</module>
-                <module>slack</module>
 
 
                 <!--  Modules from default second-->
@@ -1031,17 +910,16 @@
                 <module>spring-5-webflux</module>
                 <module>spring-5-webflux-2</module>
                 <module>spring-activiti</module>
-                <module>spring-batch-2</module>
-                <module>spring-caching-2</module>
                 <module>spring-core-2</module>
                 <module>spring-core-3</module>
-                <module>spring-core-5</module>
+                <module>spring-credhub</module>
                 <module>spring-di-3</module>
                 <module>spring-cucumber</module>
 
                 <module>spring-kafka</module>
 
                 <module>spring-native</module>
+                <module>spring-security-modules/spring-security-oauth2-testing</module>
                 <module>spring-protobuf</module>
                 <module>spring-quartz</module>
 
@@ -1049,16 +927,30 @@
 
                 <module>spring-state-machine</module>
                 <module>spring-threads</module>
+				<module>spring-vault</module>
                 <module>tensorflow-java</module>
                 <module>xstream</module>
                 <module>webrtc</module>
-                <module>messaging-modules/spring-apache-camel</module>
+                <module>persistence-modules/java-mongodb</module>
+
+                <module>messaging-modules</module>
+
+                <module>persistence-modules/questdb</module>
+                <module>vaadin</module>
+                <module>libraries-3</module>
+                <module>web-modules/apache-tapestry</module>
+                <module>web-modules/blade</module>
+                <module>web-modules/bootique</module>
+                <module>web-modules/dropwizard</module>
+                <module>web-modules/google-web-toolkit</module>
+                <module>web-modules/jakarta-ee</module>
             </modules>
 
             <properties>
                 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                 <java.version>11</java.version>
-                <java.version>11</java.version>
+                <maven.compiler.source>11</maven.compiler.source>
+                <maven.compiler.target>11</maven.compiler.target>
             </properties>
         </profile>
 
@@ -1085,6 +977,54 @@
             </build>
 
             <modules>
+                <module>lombok-modules</module>
+                <module>osgi</module>
+                <module>spring-katharsis</module>
+                <module>logging-modules</module>
+                <module>spring-boot-modules</module>
+                <module>apache-httpclient</module>
+                <module>apache-httpclient4</module>
+                <module>apache-httpclient-2</module>
+                <module>spring-mobile</module>
+                <module>microservices-modules</module>
+                <module>spring-ejb-modules</module>
+                <module>spring-di</module>
+                <module>spring-di-2</module>
+                <module>spring-jinq</module>
+                <module>vavr-modules</module>
+                <module>java-websocket</module>
+                <module>azure</module>
+                <module>netflix-modules</module>
+                <module>spf4j</module>
+                <module>spring-jersey</module>
+                <module>jersey</module>
+                <module>jaxb</module>
+
+                <module>javafx</module>
+                <module>spring-batch</module>
+                <module>spring-batch-2</module>
+                <module>spring-boot-rest</module>
+                <module>spring-drools</module>
+                <module>spring-exceptions</module>
+                <module>spring-jenkins-pipeline</module>
+                <module>spring-core</module>
+                <module>spring-core-4</module>
+                <module>spring-integration</module>
+                <module>spring-remoting-modules</module>
+                <module>libraries-security</module>
+                <module>libraries-data-db</module>
+
+                <module>performance-tests</module>
+                <module>security-modules</module>
+                <module>libraries-server-2</module>
+                <module>orika</module>
+                <module>patterns-modules</module>
+                <module>json-modules</module>
+                <module>libraries-data</module>
+                <module>saas-modules</module>
+                <module>server-modules</module>
+                <module>apache-cxf-modules</module>
+
                 <module>algorithms-modules</module>
                 <module>apache-libraries</module>
                 <module>apache-poi</module>
@@ -1093,15 +1033,12 @@
                 <module>asciidoctor</module>
                 <module>aws-modules</module>
 
-                <module>core-java-modules/core-java-9</module>
-                <module>core-java-modules/core-java-9-improvements</module>
-                <module>core-java-modules/core-java-9-jigsaw</module>
+                <module>couchbase</module>
+
+                <module>core-groovy-modules</module>
+
+                <module>core-java-modules</module>
                 <!-- <module>core-java-modules/core-java-9-new-features</module> --> <!-- uses preview features, to be decided how to handle -->
-                <module>core-java-modules/core-java-9-streams</module>
-                <module>core-java-modules/core-java-10</module>
-                <module>core-java-modules/core-java-11</module>
-                <module>core-java-modules/core-java-11-2</module>
-                <module>core-java-modules/core-java-11-3</module>
                 <!-- <module>core-java-modules/core-java-12</module> --> <!-- uses preview features, to be decided how to handle -->
                 <!-- <module>core-java-modules/core-java-13</module> --> <!-- uses preview features, to be decided how to handle -->
                 <!-- <module>core-java-modules/core-java-14</module> --> <!-- uses preview features, to be decided how to handle -->
@@ -1109,53 +1046,37 @@
                 <!-- <module>core-java-modules/core-java-16</module> --> <!-- uses preview features, to be decided how to handle -->
                 <!-- <module>core-java-modules/core-java-17</module> --> <!-- uses preview features, to be decided how to handle -->
                 <!-- <module>core-java-modules/core-java-19</module> --> <!-- uses preview features, to be decided how to handle -->
-                <module>core-java-modules/core-java-collections-set</module>
-                <module>core-java-modules/core-java-collections-list-4</module>
-                <module>core-java-modules/core-java-collections-array-list</module>
-                <module>core-java-modules/core-java-collections-maps-4</module>
-                <module>core-java-modules/core-java-collections-maps-5</module>
-                <module>core-java-modules/core-java-concurrency-simple</module>
-                <module>core-java-modules/core-java-date-operations-1</module>
-                <module>core-java-modules/core-java-datetime-conversion</module>
-                <module>core-java-modules/core-java-datetime-string</module>
-                <module>core-java-modules/core-java-io-conversions-2</module>
-                <module>core-java-modules/core-java-jpms</module>
-                <module>core-java-modules/core-java-os</module>
-                <module>core-java-modules/core-java-streams-4</module>
-                <module>core-java-modules/core-java-string-algorithms-3</module>
-                <module>core-java-modules/core-java-string-operations-3</module>
-                <module>core-java-modules/core-java-string-operations-4</module>
-                <module>core-java-modules/core-java-string-operations-5</module>
-                <module>core-java-modules/core-java-time-measurements</module>
-                <module>core-java-modules/core-java-networking-3</module>
-                <module>core-java-modules/core-java-strings</module>
-                <module>core-java-modules/core-java-httpclient</module>
-				<module>custom-pmd</module>
-                <module>spring-core-6</module>
+                <module>spring-aop</module>
+                <module>spring-aop-2</module>
+                <module>custom-pmd</module>
                 <module>data-structures</module>
                 <module>ddd-contexts</module>
+                <module>jackson-modules</module>
+                <module>jmh</module>
                 <module>deeplearning4j</module>
+                <module>jmeter</module>
                 <module>docker-modules</module>
-                <module>apache-httpclient-2</module>
-                <module>kubernetes-modules/kubernetes-spring</module>
+                <module>drools</module>
+                <module>guava-modules</module>
+                <module>kubernetes-modules</module>
                 <module>libraries-concurrency</module>
-                <module>maven-modules/compiler-plugin-java-9</module>
-                <module>maven-modules/maven-generate-war</module>
-                <module>maven-modules/multimodulemavenproject</module>
+                <module>jhipster-6</module>
+                <module>libraries-testing</module>
+                <module>maven-modules</module>
                 <module>optaplanner</module>
-                <module>persistence-modules/sirix</module>
-                <module>persistence-modules/spring-data-cassandra-2</module>
-                <module>quarkus-modules/quarkus-vs-springboot</module>
-                <module>quarkus-modules/quarkus-jandex</module>
-                <module>spring-boot-modules/spring-boot-cassandre</module>
-                <module>spring-boot-modules/spring-boot-3</module>
-                <module>spring-boot-modules/spring-boot-3-native</module>
-                <module>spring-boot-modules/spring-boot-3-observation</module>
-                <module>spring-boot-modules/spring-boot-3-test-pitfalls</module>
+                <module>persistence-modules</module>
+                <module>quarkus-modules</module>
                 <module>spring-reactive-modules</module>
                 <module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
                 <module>testing-modules/testing-assertions</module>
                 <module>persistence-modules/fauna</module>
+                <module>persistence-modules/spring-data-rest</module>
+
+                <module>rule-engines-modules</module>
+
+                <module>reactive-systems</module>
+                <module>rxjava-modules</module>
+
                 <module>lightrun</module>
                 <module>tablesaw</module>
                 <module>geotools</module>
@@ -1164,31 +1085,29 @@
 
                 <module>akka-modules</module>
                 <module>annotations</module>
-                <module>apache-httpclient</module>
                 <module>antlr</module>
                 <module>apache-kafka</module>
                 <module>apache-kafka-2</module>
                 <module>apache-olingo</module>
 
                 <module>apache-poi-2</module>
-                <module>apache-rocketmq</module>
                 <module>apache-thrift</module>
                 <module>apache-tika</module>
 
                 <module>asm</module>
                 <module>atomikos</module>
                 <module>atomix</module>
+
                 <module>axon</module>
 
                 <module>bazel</module>
-                <module>code-generation</module>
+                <module>google-auto-project</module>
                 <module>ddd</module>
-                <module>discord4j</module>
                 <module>disruptor</module>
                 <module>dozer</module>
 
                 <module>dubbo</module>
-                <module>feign</module>
+                <!-- <module>feign</module> -->
                 <module>google-cloud</module>
                 <module>graphql-modules</module>
                 <module>grpc</module>
@@ -1197,7 +1116,7 @@
                 <module>hystrix</module>
                 <module>jackson-simple</module>
                 <module>java-blockchain</module>
-
+                <module>java-jdi</module>
                 <module>java-rmi</module>
                 <module>java-spi</module>
                 <module>javax-sound</module>
@@ -1209,9 +1128,14 @@
 
                 <module>java-native</module>
                 <module>jsoup</module>
+                <module>jsf</module>
                 <module>ksqldb</module>
 
-                <module>libraries-7</module>
+                <module>libraries</module> <!-- very long running -->
+                <module>libraries-2</module>
+                <module>libraries-4</module>
+                <module>libraries-5</module>
+                <module>libraries-6</module>
                 <module>libraries-apache-commons</module>
                 <module>libraries-apache-commons-collections</module>
                 <module>libraries-apache-commons-io</module>
@@ -1221,6 +1145,7 @@
                 <module>libraries-http</module>
                 <module>libraries-http-2</module>
                 <module>libraries-io</module>
+                <module>libraries-ai</module>
                 <module>libraries-primitive</module>
                 <module>libraries-rpc</module>
                 <module>libraries-server</module>
@@ -1236,7 +1161,6 @@
                 <module>protobuffer</module>
                 <module>reactor-core</module>
                 <module>rsocket</module>
-                <module>slack</module>
 
 
                 <!--  Modules from default second-->
@@ -1245,11 +1169,9 @@
                 <module>spring-5-webflux</module>
                 <module>spring-5-webflux-2</module>
                 <module>spring-activiti</module>
-                <module>spring-batch-2</module>
-                <module>spring-caching-2</module>
                 <module>spring-core-2</module>
                 <module>spring-core-3</module>
-                <module>spring-core-5</module>
+                <module>spring-credhub</module>
                 <module>spring-di-3</module>
                 <module>spring-cucumber</module>
 
@@ -1263,16 +1185,30 @@
 
                 <module>spring-state-machine</module>
                 <module>spring-threads</module>
+				<module>spring-vault</module>
                 <module>tensorflow-java</module>
                 <module>xstream</module>
                 <module>webrtc</module>
-                <module>messaging-modules/spring-apache-camel</module>
+                <module>persistence-modules/java-mongodb</module>
+
+                <module>messaging-modules</module>
+
+                <module>persistence-modules/questdb</module>
+                <module>vaadin</module>
+                <module>libraries-3</module>
+                <module>web-modules/apache-tapestry</module>
+                <module>web-modules/blade</module>
+                <module>web-modules/bootique</module>
+                <module>web-modules/dropwizard</module>
+                <module>web-modules/google-web-toolkit</module>
+                <module>web-modules/google-jakarta-ee</module>
             </modules>
 
             <properties>
                 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                 <java.version>11</java.version>
-                <java.version>11</java.version>
+                <maven.compiler.source>11</maven.compiler.source>
+                <maven.compiler.target>11</maven.compiler.target>
             </properties>
         </profile>
 
@@ -1318,6 +1254,7 @@
         <byte-buddy.version>1.12.13</byte-buddy.version>
 
         <!-- logging -->
+        <!-- overwriting in the slf4j and logback in the hibernate-jpa. When updated to the latest version remove the version from that module-->
         <org.slf4j.version>1.7.32</org.slf4j.version>
         <logback.version>1.2.7</logback.version>
 
@@ -1336,15 +1273,15 @@
         <commons-lang.version>2.6</commons-lang.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <commons-cli.version>1.5.0</commons-cli.version>
-        <maven-war-plugin.version>3.0.0</maven-war-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
         <jstl-api.version>1.2</jstl-api.version>
         <javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version>
         <jstl.version>1.2</jstl.version>
         <jackson.version>2.13.3</jackson.version>
         <commons-fileupload.version>1.4</commons-fileupload.version>
-        <junit-platform.version>1.8.1</junit-platform.version>
-        <junit-jupiter.version>5.8.1</junit-jupiter.version>
+        <junit-platform.version>1.9.2</junit-platform.version>
+        <junit-jupiter.version>5.9.2</junit-jupiter.version>
         <junit-platform-surefire-provider.version>1.3.2</junit-platform-surefire-provider.version>
         <directory-maven-plugin.version>0.3.1</directory-maven-plugin.version>
         <maven-install-plugin.version>2.5.2</maven-install-plugin.version>
diff --git a/quarkus-modules/pom.xml b/quarkus-modules/pom.xml
index 94fe1ae10f..ab9f7c3906 100644
--- a/quarkus-modules/pom.xml
+++ b/quarkus-modules/pom.xml
@@ -16,7 +16,8 @@
     <modules>
         <module>quarkus</module>
         <module>quarkus-extension</module>
-        <!--Disabled because requires Java-9 <module>quarkus-jandex</module> <module>quarkus-vs-springboot</module> -->
+        <module>quarkus-jandex</module>
+        <module>quarkus-vs-springboot</module>
     </modules>
 
 </project>
\ No newline at end of file
diff --git a/quarkus-modules/quarkus/pom.xml b/quarkus-modules/quarkus/pom.xml
index 3e1cbff01c..99d18579c3 100644
--- a/quarkus-modules/quarkus/pom.xml
+++ b/quarkus-modules/quarkus/pom.xml
@@ -182,7 +182,7 @@
     </profiles>
 
     <properties>
-        <quarkus.version>1.7.0.Final</quarkus.version>
+        <quarkus.version>2.16.3.Final</quarkus.version>
         <mockito.version>3.3.0</mockito.version>
     </properties>
 
diff --git a/rule-engines-modules/easy-rules/pom.xml b/rule-engines-modules/easy-rules/pom.xml
index c8e875944c..6f43307e89 100644
--- a/rule-engines-modules/easy-rules/pom.xml
+++ b/rule-engines-modules/easy-rules/pom.xml
@@ -23,7 +23,7 @@
     </dependencies>
 
     <properties>
-        <easy-rules.version>3.0.0</easy-rules.version>
+        <easy-rules.version>4.1.0</easy-rules.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/rule-engines-modules/evrete/pom.xml b/rule-engines-modules/evrete/pom.xml
index d94da2853f..5b7f195722 100644
--- a/rule-engines-modules/evrete/pom.xml
+++ b/rule-engines-modules/evrete/pom.xml
@@ -30,7 +30,7 @@
     </dependencies>
 
     <properties>
-        <evrete.version>2.1.04</evrete.version>
+        <evrete.version>3.0.01</evrete.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/rule-engines-modules/openl-tablets/pom.xml b/rule-engines-modules/openl-tablets/pom.xml
index 204efce6c5..a24e06c44d 100644
--- a/rule-engines-modules/openl-tablets/pom.xml
+++ b/rule-engines-modules/openl-tablets/pom.xml
@@ -28,7 +28,7 @@
     </dependencies>
 
     <properties>
-        <openl.version>5.19.4</openl.version>
+        <openl.version>5.26.5</openl.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/rule-engines-modules/rulebook/pom.xml b/rule-engines-modules/rulebook/pom.xml
index 55e312289e..88feb148e2 100644
--- a/rule-engines-modules/rulebook/pom.xml
+++ b/rule-engines-modules/rulebook/pom.xml
@@ -23,7 +23,7 @@
     </dependencies>
 
     <properties>
-        <rulebook.version>0.6.2</rulebook.version>
+        <rulebook.version>0.12</rulebook.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/rxjava-modules/pom.xml b/rxjava-modules/pom.xml
index cd46270d92..2f2597b644 100644
--- a/rxjava-modules/pom.xml
+++ b/rxjava-modules/pom.xml
@@ -17,6 +17,7 @@
 
     <modules>
         <module>rxjava-core</module>
+        <module>rxjava-core-2</module>
         <module>rxjava-libraries</module>
         <module>rxjava-observables</module>
         <module>rxjava-operators</module>
diff --git a/rxjava-modules/rxjava-core-2/src/test/java/com/baeldung/rxjava/justvscallable/SingleJustVsFromCallableTest.java b/rxjava-modules/rxjava-core-2/src/test/java/com/baeldung/rxjava/justvscallable/SingleJustVsFromCallableTest.java
index d0de86fed8..a693432343 100644
--- a/rxjava-modules/rxjava-core-2/src/test/java/com/baeldung/rxjava/justvscallable/SingleJustVsFromCallableTest.java
+++ b/rxjava-modules/rxjava-core-2/src/test/java/com/baeldung/rxjava/justvscallable/SingleJustVsFromCallableTest.java
@@ -12,7 +12,7 @@ import org.mockito.Mockito;
 import rx.Single;
 import rx.observers.TestSubscriber;
 
-class SingleJustVsFromCallableTest {
+class SingleJustVsFromCallableUnitTest {
 
     public EmployeeRepository repository = mock(EmployeeRepository.class);
 
diff --git a/discord4j/.gitignore b/saas-modules/discord4j/.gitignore
similarity index 100%
rename from discord4j/.gitignore
rename to saas-modules/discord4j/.gitignore
diff --git a/discord4j/README.md b/saas-modules/discord4j/README.md
similarity index 100%
rename from discord4j/README.md
rename to saas-modules/discord4j/README.md
diff --git a/discord4j/pom.xml b/saas-modules/discord4j/pom.xml
similarity index 90%
rename from discord4j/pom.xml
rename to saas-modules/discord4j/pom.xml
index 3ea85c05c7..ff398dd1a3 100644
--- a/discord4j/pom.xml
+++ b/saas-modules/discord4j/pom.xml
@@ -3,17 +3,14 @@
     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>
-    <groupId>com.baeldung</groupId>
     <artifactId>discord4j</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>discord4j</name>
     <description>Demo Discord bot using Discord4J + Spring Boot</description>
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <artifactId>saas-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/discord4j/src/main/java/com/baeldung/discordbot/BotConfiguration.java b/saas-modules/discord4j/src/main/java/com/baeldung/discordbot/BotConfiguration.java
similarity index 100%
rename from discord4j/src/main/java/com/baeldung/discordbot/BotConfiguration.java
rename to saas-modules/discord4j/src/main/java/com/baeldung/discordbot/BotConfiguration.java
diff --git a/discord4j/src/main/java/com/baeldung/discordbot/DiscordBotApplication.java b/saas-modules/discord4j/src/main/java/com/baeldung/discordbot/DiscordBotApplication.java
similarity index 100%
rename from discord4j/src/main/java/com/baeldung/discordbot/DiscordBotApplication.java
rename to saas-modules/discord4j/src/main/java/com/baeldung/discordbot/DiscordBotApplication.java
diff --git a/discord4j/src/main/java/com/baeldung/discordbot/events/EventListener.java b/saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/EventListener.java
similarity index 100%
rename from discord4j/src/main/java/com/baeldung/discordbot/events/EventListener.java
rename to saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/EventListener.java
diff --git a/discord4j/src/main/java/com/baeldung/discordbot/events/MessageCreateListener.java b/saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/MessageCreateListener.java
similarity index 100%
rename from discord4j/src/main/java/com/baeldung/discordbot/events/MessageCreateListener.java
rename to saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/MessageCreateListener.java
diff --git a/discord4j/src/main/java/com/baeldung/discordbot/events/MessageListener.java b/saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/MessageListener.java
similarity index 100%
rename from discord4j/src/main/java/com/baeldung/discordbot/events/MessageListener.java
rename to saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/MessageListener.java
diff --git a/discord4j/src/main/java/com/baeldung/discordbot/events/MessageUpdateListener.java b/saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/MessageUpdateListener.java
similarity index 100%
rename from discord4j/src/main/java/com/baeldung/discordbot/events/MessageUpdateListener.java
rename to saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/MessageUpdateListener.java
diff --git a/discord4j/src/main/resources/application.yml b/saas-modules/discord4j/src/main/resources/application.yml
similarity index 100%
rename from discord4j/src/main/resources/application.yml
rename to saas-modules/discord4j/src/main/resources/application.yml
diff --git a/discord4j/src/test/java/com/baeldung/discordbot/DiscordBotLiveTest.java b/saas-modules/discord4j/src/test/java/com/baeldung/discordbot/DiscordBotLiveTest.java
similarity index 100%
rename from discord4j/src/test/java/com/baeldung/discordbot/DiscordBotLiveTest.java
rename to saas-modules/discord4j/src/test/java/com/baeldung/discordbot/DiscordBotLiveTest.java
diff --git a/saas-modules/pom.xml b/saas-modules/pom.xml
index 7e8adebdd9..16ed50918c 100644
--- a/saas-modules/pom.xml
+++ b/saas-modules/pom.xml
@@ -16,11 +16,13 @@
     </parent>
 
     <modules>
+        <module>discord4j</module>
         <module>jira-rest-integration</module>
+        <module>sentry-servlet</module>
+        <module>slack</module>
         <module>stripe</module>
         <module>twilio</module>
         <module>twitter4j</module>
-        <module>sentry-servlet</module>
     </modules>
 
     <build>
diff --git a/saas-modules/sentry-servlet/pom.xml b/saas-modules/sentry-servlet/pom.xml
index c86fcbce03..2e4f95b5fb 100644
--- a/saas-modules/sentry-servlet/pom.xml
+++ b/saas-modules/sentry-servlet/pom.xml
@@ -15,6 +15,7 @@
     <properties>
       <sentry.version>6.11.0</sentry.version>
       <cargo.version>1.10.4</cargo.version>
+      <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
     
     <dependencies>
diff --git a/saas-modules/sentry-servlet/src/main/java/com/baeldung/sentry/support/SentryFilter.java b/saas-modules/sentry-servlet/src/main/java/com/baeldung/sentry/support/SentryFilter.java
index e853368ad9..51055f321d 100644
--- a/saas-modules/sentry-servlet/src/main/java/com/baeldung/sentry/support/SentryFilter.java
+++ b/saas-modules/sentry-servlet/src/main/java/com/baeldung/sentry/support/SentryFilter.java
@@ -21,7 +21,7 @@ public class SentryFilter implements Filter {
         try {
             chain.doFilter(request, response);
             int rc = ((HttpServletResponse) response).getStatus();
-            if (rc/100 == 5) {
+            if (rc / 100 == 5) {
                 Sentry.captureMessage("Application error: code=" + rc, SentryLevel.ERROR);
             }
         } catch (Throwable t) {
diff --git a/saas-modules/sentry-servlet/src/main/resources/sentry.properties b/saas-modules/sentry-servlet/src/main/resources/sentry.properties
index c937874420..cd8b3005dd 100644
--- a/saas-modules/sentry-servlet/src/main/resources/sentry.properties
+++ b/saas-modules/sentry-servlet/src/main/resources/sentry.properties
@@ -1,3 +1,3 @@
 # Sentry configuration file
-# put your DSN here
-dsn=https://xxxxxxxxxxxxxxxx@zzzzzzz.ingest.sentry.io/wwww
\ No newline at end of file
+# put your own DSN here. This one is NOT valid !!!
+dsn=https://c295098aadd04f719f1c9f50d801f93e@o75061.ingest.sentry.io/4504455033978880
\ No newline at end of file
diff --git a/slack/README.md b/saas-modules/slack/README.md
similarity index 100%
rename from slack/README.md
rename to saas-modules/slack/README.md
diff --git a/slack/pom.xml b/saas-modules/slack/pom.xml
similarity index 97%
rename from slack/pom.xml
rename to saas-modules/slack/pom.xml
index 690bf5132c..326167c055 100644
--- a/slack/pom.xml
+++ b/saas-modules/slack/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
+        <artifactId>saas-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/slack/src/main/java/com/baeldung/examples/slack/DiskSpaceErrorChecker.java b/saas-modules/slack/src/main/java/com/baeldung/examples/slack/DiskSpaceErrorChecker.java
similarity index 100%
rename from slack/src/main/java/com/baeldung/examples/slack/DiskSpaceErrorChecker.java
rename to saas-modules/slack/src/main/java/com/baeldung/examples/slack/DiskSpaceErrorChecker.java
diff --git a/slack/src/main/java/com/baeldung/examples/slack/ErrorChecker.java b/saas-modules/slack/src/main/java/com/baeldung/examples/slack/ErrorChecker.java
similarity index 100%
rename from slack/src/main/java/com/baeldung/examples/slack/ErrorChecker.java
rename to saas-modules/slack/src/main/java/com/baeldung/examples/slack/ErrorChecker.java
diff --git a/slack/src/main/java/com/baeldung/examples/slack/ErrorReporter.java b/saas-modules/slack/src/main/java/com/baeldung/examples/slack/ErrorReporter.java
similarity index 100%
rename from slack/src/main/java/com/baeldung/examples/slack/ErrorReporter.java
rename to saas-modules/slack/src/main/java/com/baeldung/examples/slack/ErrorReporter.java
diff --git a/slack/src/main/java/com/baeldung/examples/slack/MainClass.java b/saas-modules/slack/src/main/java/com/baeldung/examples/slack/MainClass.java
similarity index 100%
rename from slack/src/main/java/com/baeldung/examples/slack/MainClass.java
rename to saas-modules/slack/src/main/java/com/baeldung/examples/slack/MainClass.java
diff --git a/slack/src/main/java/com/baeldung/examples/slack/SlackChannelErrorReporter.java b/saas-modules/slack/src/main/java/com/baeldung/examples/slack/SlackChannelErrorReporter.java
similarity index 100%
rename from slack/src/main/java/com/baeldung/examples/slack/SlackChannelErrorReporter.java
rename to saas-modules/slack/src/main/java/com/baeldung/examples/slack/SlackChannelErrorReporter.java
diff --git a/slack/src/main/java/com/baeldung/examples/slack/SlackUserErrorReporter.java b/saas-modules/slack/src/main/java/com/baeldung/examples/slack/SlackUserErrorReporter.java
similarity index 100%
rename from slack/src/main/java/com/baeldung/examples/slack/SlackUserErrorReporter.java
rename to saas-modules/slack/src/main/java/com/baeldung/examples/slack/SlackUserErrorReporter.java
diff --git a/slack/src/main/resources/logback.xml b/saas-modules/slack/src/main/resources/logback.xml
similarity index 100%
rename from slack/src/main/resources/logback.xml
rename to saas-modules/slack/src/main/resources/logback.xml
diff --git a/security-modules/pom.xml b/security-modules/pom.xml
index 70f29cecd7..d0edced4e0 100644
--- a/security-modules/pom.xml
+++ b/security-modules/pom.xml
@@ -17,7 +17,7 @@
         <module>apache-shiro</module>
         <module>cas</module>
         <module>cloud-foundry-uaa</module>
-        <!-- <module>java-ee-8-security-api</module> --> <!-- long running -->
+        <module>java-ee-8-security-api</module> <!-- long running -->
         <module>jee-7-security</module>
         <module>jjwt</module>
         <module>jwt</module>
@@ -25,4 +25,8 @@
         <module>sql-injection-samples</module>
     </modules>
 
+    <properties>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/server-modules/wildfly/pom.xml b/server-modules/wildfly/pom.xml
index eaec4d176c..af742c7bd3 100644
--- a/server-modules/wildfly/pom.xml
+++ b/server-modules/wildfly/pom.xml
@@ -13,7 +13,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
@@ -63,6 +63,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
+                <version>${maven-war-plugin.version}</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -74,4 +75,8 @@
         </plugins>
     </build>
 
+    <properties>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/spf4j/spf4j-aspects-app/pom.xml b/spf4j/spf4j-aspects-app/pom.xml
index 09ca41ea47..3eccdd879a 100644
--- a/spf4j/spf4j-aspects-app/pom.xml
+++ b/spf4j/spf4j-aspects-app/pom.xml
@@ -55,11 +55,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler.plugin.version}</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -98,7 +93,6 @@
 
     <properties>
         <spf4j.version>8.9.0</spf4j.version>
-        <compiler.plugin.version>3.8.0</compiler.plugin.version>
         <dependency.plugin.version>3.1.1</dependency.plugin.version>
     </properties>
 
diff --git a/spf4j/spf4j-core-app/pom.xml b/spf4j/spf4j-core-app/pom.xml
index 2f7f3745f1..20251860aa 100644
--- a/spf4j/spf4j-core-app/pom.xml
+++ b/spf4j/spf4j-core-app/pom.xml
@@ -61,11 +61,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler.plugin.version}</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -104,7 +99,6 @@
 
     <properties>
         <spf4j.version>8.9.0</spf4j.version>
-        <compiler.plugin.version>3.8.0</compiler.plugin.version>
         <dependency.plugin.version>3.1.1</dependency.plugin.version>
     </properties>
 
diff --git a/spring-aop-2/pom.xml b/spring-aop-2/pom.xml
index 76e4780e72..cb84ed4ca2 100644
--- a/spring-aop-2/pom.xml
+++ b/spring-aop-2/pom.xml
@@ -39,8 +39,22 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${maven-war-plugin.version}</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
-        <aspectj-plugin.version>1.11</aspectj-plugin.version>
+        <aspectj-plugin.version>1.14.0</aspectj-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-aop/pom.xml b/spring-aop/pom.xml
index 0d48c479ca..ae5ab5fce1 100644
--- a/spring-aop/pom.xml
+++ b/spring-aop/pom.xml
@@ -69,11 +69,20 @@
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${maven-war-plugin.version}</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
     <properties>
-        <aspectj-plugin.version>1.11</aspectj-plugin.version>
+        <aspectj-plugin.version>1.14.0</aspectj-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-batch-2/pom.xml b/spring-batch-2/pom.xml
index 12d31aca14..378191c91c 100644
--- a/spring-batch-2/pom.xml
+++ b/spring-batch-2/pom.xml
@@ -11,9 +11,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
@@ -51,8 +51,9 @@
     </dependencies>
 
     <properties>
-        <spring.batch.version>4.3.0</spring.batch.version>
-        <awaitility.version>3.1.1</awaitility.version>
+        <spring.batch.version>5.0.0</spring.batch.version>
+        <awaitility.version>4.2.0</awaitility.version>
+        <start-class>com.baeldung.batch.SpringBootBatchProcessingApplication</start-class>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-batch-2/src/main/java/com/baeldung/batch/BatchConfiguration.java b/spring-batch-2/src/main/java/com/baeldung/batch/BatchConfiguration.java
index 0c053dd86c..770b6330dd 100644
--- a/spring-batch-2/src/main/java/com/baeldung/batch/BatchConfiguration.java
+++ b/spring-batch-2/src/main/java/com/baeldung/batch/BatchConfiguration.java
@@ -4,31 +4,24 @@ import javax.sql.DataSource;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
-import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
-import org.springframework.batch.core.configuration.annotation.JobBuilderFactory;
-import org.springframework.batch.core.configuration.annotation.StepBuilderFactory;
+import org.springframework.batch.core.job.builder.JobBuilder;
 import org.springframework.batch.core.launch.support.RunIdIncrementer;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.batch.item.database.BeanPropertyItemSqlParameterSourceProvider;
 import org.springframework.batch.item.database.JdbcBatchItemWriter;
 import org.springframework.batch.item.database.builder.JdbcBatchItemWriterBuilder;
 import org.springframework.batch.item.file.FlatFileItemReader;
 import org.springframework.batch.item.file.builder.FlatFileItemReaderBuilder;
 import org.springframework.batch.item.file.mapping.BeanWrapperFieldSetMapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.transaction.PlatformTransactionManager;
 
 @Configuration
-@EnableBatchProcessing
 public class BatchConfiguration {
-
-    @Autowired
-    public JobBuilderFactory jobBuilderFactory;
-
-    @Autowired
-    public StepBuilderFactory stepBuilderFactory;
     
     @Value("${file.input}")
     private String fileInput;
@@ -59,8 +52,8 @@ public class BatchConfiguration {
     }
 
     @Bean
-    public Job importUserJob(JobCompletionNotificationListener listener, Step step1) {
-        return jobBuilderFactory.get("importUserJob")
+    public Job importUserJob(JobRepository jobRepository, JobCompletionNotificationListener listener, Step step1) {
+        return new JobBuilder("importUserJob", jobRepository)
             .incrementer(new RunIdIncrementer())
             .listener(listener)
             .flow(step1)
@@ -69,9 +62,9 @@ public class BatchConfiguration {
     }
 
     @Bean
-    public Step step1(JdbcBatchItemWriter<Coffee> writer) {
-        return stepBuilderFactory.get("step1")
-            .<Coffee, Coffee> chunk(10)
+    public Step step1(JobRepository jobRepository, PlatformTransactionManager transactionManager, JdbcBatchItemWriter<Coffee> writer) {
+        return new StepBuilder("step1", jobRepository)
+            .<Coffee, Coffee> chunk(10, transactionManager)
             .reader(reader())
             .processor(processor())
             .writer(writer)
diff --git a/spring-batch-2/src/main/java/com/baeldung/batch/CoffeeItemProcessor.java b/spring-batch-2/src/main/java/com/baeldung/batch/CoffeeItemProcessor.java
index b154b80453..bd4173e9ed 100644
--- a/spring-batch-2/src/main/java/com/baeldung/batch/CoffeeItemProcessor.java
+++ b/spring-batch-2/src/main/java/com/baeldung/batch/CoffeeItemProcessor.java
@@ -10,7 +10,7 @@ public class CoffeeItemProcessor implements ItemProcessor<Coffee, Coffee> {
     private static final Logger LOGGER = LoggerFactory.getLogger(CoffeeItemProcessor.class);
 
     @Override
-    public Coffee process(final Coffee coffee) throws Exception {
+    public Coffee process(final Coffee coffee) {
         String brand = coffee.getBrand().toUpperCase();
         String origin = coffee.getOrigin().toUpperCase();
         String chracteristics = coffee.getCharacteristics().toUpperCase();
diff --git a/spring-batch-2/src/main/java/com/baeldung/batch/JobCompletionNotificationListener.java b/spring-batch-2/src/main/java/com/baeldung/batch/JobCompletionNotificationListener.java
index ca1de40aea..b61faeb13b 100644
--- a/spring-batch-2/src/main/java/com/baeldung/batch/JobCompletionNotificationListener.java
+++ b/spring-batch-2/src/main/java/com/baeldung/batch/JobCompletionNotificationListener.java
@@ -4,13 +4,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.listener.JobExecutionListenerSupport;
+import org.springframework.batch.core.JobExecutionListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 
 @Component
-public class JobCompletionNotificationListener extends JobExecutionListenerSupport {
+public class JobCompletionNotificationListener implements JobExecutionListener {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(JobCompletionNotificationListener.class);
 
diff --git a/spring-batch-2/src/main/java/com/baeldung/batchscheduler/SpringBatchScheduler.java b/spring-batch-2/src/main/java/com/baeldung/batchscheduler/SpringBatchScheduler.java
index c830a41855..dcb2bc5199 100644
--- a/spring-batch-2/src/main/java/com/baeldung/batchscheduler/SpringBatchScheduler.java
+++ b/spring-batch-2/src/main/java/com/baeldung/batchscheduler/SpringBatchScheduler.java
@@ -7,15 +7,16 @@ import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobParametersBuilder;
 import org.springframework.batch.core.Step;
-import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
-import org.springframework.batch.core.configuration.annotation.JobBuilderFactory;
-import org.springframework.batch.core.configuration.annotation.StepBuilderFactory;
+import org.springframework.batch.core.job.builder.JobBuilder;
 import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.item.file.FlatFileItemReader;
 import org.springframework.batch.item.file.builder.FlatFileItemReaderBuilder;
 import org.springframework.batch.item.file.mapping.BeanWrapperFieldSetMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
@@ -24,17 +25,16 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.scheduling.support.ScheduledMethodRunnable;
+import org.springframework.transaction.PlatformTransactionManager;
 
 import java.util.Date;
 import java.util.IdentityHashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
 @Configuration
-@EnableBatchProcessing
 @EnableScheduling
 public class SpringBatchScheduler {
 
@@ -46,21 +46,21 @@ public class SpringBatchScheduler {
 
     private final Map<Object, ScheduledFuture<?>> scheduledTasks = new IdentityHashMap<>();
 
-    @Autowired
-    private JobBuilderFactory jobBuilderFactory;
-
-    @Autowired
-    private StepBuilderFactory stepBuilderFactory;
-
     @Autowired
     private JobLauncher jobLauncher;
 
+    @Autowired
+    private JobRepository jobRepository;
+
+    @Autowired
+    private PlatformTransactionManager transactionManager;
+
     @Scheduled(fixedRate = 2000)
     public void launchJob() throws Exception {
         Date date = new Date();
         logger.debug("scheduler starts at " + date);
         if (enabled.get()) {
-            JobExecution jobExecution = jobLauncher.run(job(), new JobParametersBuilder().addDate("launchDate", date)
+            JobExecution jobExecution = jobLauncher.run(job(jobRepository, transactionManager), new JobParametersBuilder().addDate("launchDate", date)
                     .toJobParameters());
             batchRunCounter.incrementAndGet();
             logger.debug("Batch job ends with status as " + jobExecution.getStatus());
@@ -106,17 +106,16 @@ public class SpringBatchScheduler {
     }
 
     @Bean
-    public Job job() {
-        return jobBuilderFactory
-                .get("job")
-                .start(readBooks())
+    public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
+        return new JobBuilder("job", jobRepository)
+                .start(readBooks(jobRepository, transactionManager))
                 .build();
     }
 
     @Bean
-    protected Step readBooks() {
-        return stepBuilderFactory.get("readBooks")
-                .<Book, Book> chunk(2)
+    protected Step readBooks(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
+        return new StepBuilder("readBooks", jobRepository)
+                .<Book, Book> chunk(2, transactionManager)
                 .reader(reader())
                 .writer(writer())
                 .build();
@@ -128,7 +127,7 @@ public class SpringBatchScheduler {
                 .resource(new ClassPathResource("books.csv"))
                 .delimited()
                 .names(new String[] { "id", "name" })
-                .fieldSetMapper(new BeanWrapperFieldSetMapper<Book>() {
+                .fieldSetMapper(new BeanWrapperFieldSetMapper<>() {
                     {
                         setTargetType(Book.class);
                     }
@@ -138,15 +137,10 @@ public class SpringBatchScheduler {
 
     @Bean
     public ItemWriter<Book> writer() {
-        return new ItemWriter<Book>() {
-
-            @Override
-            public void write(List<? extends Book> items) throws Exception {
-                logger.debug("writer..." + items.size());
-                for (Book item : items) {
-                    logger.debug(item.toString());
-                }
-
+        return items -> {
+            logger.debug("writer..." + items.size());
+            for (Book item : items) {
+                logger.debug(item.toString());
             }
         };
     }
diff --git a/spring-batch-2/src/test/java/com/baeldung/batch/SpringBootBatchIntegrationTest.java b/spring-batch-2/src/test/java/com/baeldung/batch/SpringBootBatchIntegrationTest.java
index ba2b8a6a13..21fd7bf4b1 100644
--- a/spring-batch-2/src/test/java/com/baeldung/batch/SpringBootBatchIntegrationTest.java
+++ b/spring-batch-2/src/test/java/com/baeldung/batch/SpringBootBatchIntegrationTest.java
@@ -1,11 +1,10 @@
 package com.baeldung.batch;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
 
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobInstance;
@@ -13,16 +12,17 @@ import org.springframework.batch.test.JobLauncherTestUtils;
 import org.springframework.batch.test.JobRepositoryTestUtils;
 import org.springframework.batch.test.context.SpringBatchTest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
 @SpringBatchTest
-@SpringBootTest
 @DirtiesContext
+@SpringJUnitConfig(BatchConfiguration.class)
 @PropertySource("classpath:application.properties")
-@RunWith(SpringRunner.class)
+@EnableAutoConfiguration
 public class SpringBootBatchIntegrationTest {
 
     @Autowired
@@ -31,7 +31,10 @@ public class SpringBootBatchIntegrationTest {
     @Autowired
     private JobRepositoryTestUtils jobRepositoryTestUtils;
 
-    @After
+    @MockBean
+    private JobCompletionNotificationListener jobCompletionNotificationListener;
+
+    @AfterEach
     public void cleanUp() {
         jobRepositoryTestUtils.removeJobExecutions();
     }
@@ -42,8 +45,8 @@ public class SpringBootBatchIntegrationTest {
         JobInstance jobInstance = jobExecution.getJobInstance();
         ExitStatus jobExitStatus = jobExecution.getExitStatus();
 
-        assertThat(jobInstance.getJobName(), is("importUserJob"));
-        assertThat(jobExitStatus.getExitCode(), is("COMPLETED"));
+        assertEquals("importUserJob", jobInstance.getJobName());
+        assertEquals("COMPLETED", jobExitStatus.getExitCode());
     }
 
 }
diff --git a/spring-batch-2/src/test/java/com/baeldung/batchscheduler/SpringBatchSchedulerIntegrationTest.java b/spring-batch-2/src/test/java/com/baeldung/batchscheduler/SpringBatchSchedulerIntegrationTest.java
index 61e5a1dd74..297e8d989f 100644
--- a/spring-batch-2/src/test/java/com/baeldung/batchscheduler/SpringBatchSchedulerIntegrationTest.java
+++ b/spring-batch-2/src/test/java/com/baeldung/batchscheduler/SpringBatchSchedulerIntegrationTest.java
@@ -1,28 +1,20 @@
 package com.baeldung.batchscheduler;
 
-import com.baeldung.batchscheduler.SpringBatchScheduler;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.batch.test.context.SpringBatchTest;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.awaitility.Awaitility.await;
 import static java.util.concurrent.TimeUnit.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@SpringBatchTest
 @SpringBootTest
 @DirtiesContext
 @PropertySource("classpath:application.properties")
-@RunWith(SpringRunner.class)
 public class SpringBatchSchedulerIntegrationTest {
 
     @Autowired
@@ -31,37 +23,36 @@ public class SpringBatchSchedulerIntegrationTest {
     @Test
     public void stopJobsWhenSchedulerDisabled() {
         SpringBatchScheduler schedulerBean = context.getBean(SpringBatchScheduler.class);
-        await().untilAsserted(() -> Assert.assertEquals(2, schedulerBean.getBatchRunCounter()
+        await().untilAsserted(() -> assertEquals(2, schedulerBean.getBatchRunCounter()
                 .get()));
         schedulerBean.stop();
         await().atLeast(3, SECONDS);
 
-        Assert.assertEquals(2, schedulerBean.getBatchRunCounter()
-                .get());
+        assertEquals(2, schedulerBean.getBatchRunCounter().get());
     }
 
     @Test
-    public void stopJobSchedulerWhenSchedulerDestroyed() throws Exception {
+    public void stopJobSchedulerWhenSchedulerDestroyed() {
         ScheduledAnnotationBeanPostProcessor bean = context.getBean(ScheduledAnnotationBeanPostProcessor.class);
         SpringBatchScheduler schedulerBean = context.getBean(SpringBatchScheduler.class);
-        await().untilAsserted(() -> Assert.assertEquals(2, schedulerBean.getBatchRunCounter()
+        await().untilAsserted(() -> assertEquals(2, schedulerBean.getBatchRunCounter()
                 .get()));
         bean.postProcessBeforeDestruction(schedulerBean, "SpringBatchScheduler");
         await().atLeast(3, SECONDS);
 
-        Assert.assertEquals(2, schedulerBean.getBatchRunCounter()
+        assertEquals(2, schedulerBean.getBatchRunCounter()
                 .get());
     }
 
     @Test
-    public void stopJobSchedulerWhenFutureTasksCancelled() throws Exception {
+    public void stopJobSchedulerWhenFutureTasksCancelled() {
         SpringBatchScheduler schedulerBean = context.getBean(SpringBatchScheduler.class);
-        await().untilAsserted(() -> Assert.assertEquals(2, schedulerBean.getBatchRunCounter()
+        await().untilAsserted(() -> assertEquals(2, schedulerBean.getBatchRunCounter()
                 .get()));
         schedulerBean.cancelFutureSchedulerTasks();
         await().atLeast(3, SECONDS);
 
-        Assert.assertEquals(2, schedulerBean.getBatchRunCounter()
+        assertEquals(2, schedulerBean.getBatchRunCounter()
                 .get());
     }
 
diff --git a/spring-batch/pom.xml b/spring-batch/pom.xml
index 32126fec9b..810ddcdcdd 100644
--- a/spring-batch/pom.xml
+++ b/spring-batch/pom.xml
@@ -11,9 +11,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
@@ -22,25 +22,15 @@
             <artifactId>jackson-datatype-jsr310</artifactId>
             <version>${jackson-datatype.version}</version>
         </dependency>
-        <!-- JAXB APIs & runtime no longer provided in JDK 11 -->
-        <!-- see http://openjdk.java.net/jeps/320 -->
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>${jaxb.version}</version>
-            <scope>runtime</scope>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
             <version>${jaxb.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <!-- SQLite database driver -->
-        <dependency>
-            <groupId>org.xerial</groupId>
-            <artifactId>sqlite-jdbc</artifactId>
-            <version>${sqlite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -53,20 +43,9 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.batch</groupId>
-            <artifactId>spring-batch-core</artifactId>
-            <version>${spring.batch.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.batch</groupId>
             <artifactId>spring-batch-test</artifactId>
-            <version>${spring.batch.version}</version>
         </dependency>
         <dependency>
             <groupId>com.opencsv</groupId>
@@ -78,19 +57,29 @@
             <artifactId>spring-boot-starter-batch</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <scope>runtime</scope>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${http-client.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jettison</groupId>
+            <artifactId>jettison</artifactId>
+            <version>${jettison.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
         </dependency>
     </dependencies>
 
     <properties>
-        <spring.version>5.3.0</spring.version>
-        <spring.batch.version>4.3.0</spring.batch.version>
-        <sqlite.version>3.15.1</sqlite.version>
-        <opencsv.version>4.1</opencsv.version>
-        <jaxb.version>2.3.1</jaxb.version>
-        <jackson-datatype.version>2.12.3</jackson-datatype.version>
+        <spring.version>6.0.6</spring.version>
+        <opencsv.version>5.7.1</opencsv.version>
+        <jaxb.version>4.0.2</jaxb.version>
+        <jackson-datatype.version>2.14.2</jackson-datatype.version>
+        <http-client.version>4.5.14</http-client.version>
+        <jettison.version>1.5.3</jettison.version>
+        <start-class>com.baeldung.batchtesting.SpringBatchApplication</start-class>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-batch/repository.sqlite b/spring-batch/repository.sqlite
index b6a954554c..ddf5d0c16f 100644
Binary files a/spring-batch/repository.sqlite and b/spring-batch/repository.sqlite differ
diff --git a/spring-batch/src/main/java/com/baeldung/batch/App.java b/spring-batch/src/main/java/com/baeldung/batch/App.java
index c2db446965..c5823590d8 100644
--- a/spring-batch/src/main/java/com/baeldung/batch/App.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/App.java
@@ -18,20 +18,19 @@ public class App {
     public static void main(final String[] args) {
         // Spring Java config
         final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-        context.register(SpringConfig.class);
+        context.getEnvironment().addActiveProfile("spring");
         context.register(SpringBatchConfig.class);
         context.register(SpringBatchRetryConfig.class);
 
         context.refresh();
 
         // Spring xml config
-        // ApplicationContext context = new ClassPathXmlApplicationContext("spring-batch.xml");
+        // ApplicationContext context = new ClassPathXmlApplicationContext("spring-batch-intro.xml");
 
         runJob(context, "firstBatchJob");
         runJob(context, "skippingBatchJob");
         runJob(context, "skipPolicyBatchJob");
         runJob(context, "retryBatchJob");
-
     }
 
     private static void runJob(AnnotationConfigApplicationContext context, String batchJobName) {
diff --git a/spring-batch/src/main/java/com/baeldung/batch/SpringBatchConfig.java b/spring-batch/src/main/java/com/baeldung/batch/SpringBatchConfig.java
index 5546df22fc..5d999c68e7 100644
--- a/spring-batch/src/main/java/com/baeldung/batch/SpringBatchConfig.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/SpringBatchConfig.java
@@ -1,5 +1,7 @@
 package com.baeldung.batch;
 
+import javax.sql.DataSource;
+
 import com.baeldung.batch.model.Transaction;
 import com.baeldung.batch.service.CustomItemProcessor;
 import com.baeldung.batch.service.CustomSkipPolicy;
@@ -7,10 +9,15 @@ import com.baeldung.batch.service.MissingUsernameException;
 import com.baeldung.batch.service.NegativeAmountException;
 import com.baeldung.batch.service.RecordFieldSetMapper;
 import com.baeldung.batch.service.SkippingItemProcessor;
+
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
-import org.springframework.batch.core.configuration.annotation.JobBuilderFactory;
-import org.springframework.batch.core.configuration.annotation.StepBuilderFactory;
+import org.springframework.batch.core.job.builder.JobBuilder;
+import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.launch.support.TaskExecutorJobLauncher;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
+import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
@@ -19,24 +26,23 @@ import org.springframework.batch.item.file.FlatFileItemReader;
 import org.springframework.batch.item.file.mapping.DefaultLineMapper;
 import org.springframework.batch.item.file.transform.DelimitedLineTokenizer;
 import org.springframework.batch.item.xml.StaxEventItemWriter;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.io.Resource;
+import org.springframework.core.io.WritableResource;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 import org.springframework.oxm.Marshaller;
 import org.springframework.oxm.jaxb.Jaxb2Marshaller;
+import org.springframework.transaction.PlatformTransactionManager;
 
-import java.text.ParseException;
-
+@Configuration
 @Profile("spring")
 public class SpringBatchConfig {
-    @Autowired
-    private JobBuilderFactory jobBuilderFactory;
-
-    @Autowired
-    private StepBuilderFactory stepBuilderFactory;
 
     @Value("input/record.csv")
     private Resource inputCsv;
@@ -45,9 +51,9 @@ public class SpringBatchConfig {
     private Resource invalidInputCsv;
 
     @Value("file:xml/output.xml")
-    private Resource outputXml;
+    private WritableResource outputXml;
 
-    public ItemReader<Transaction> itemReader(Resource inputData) throws UnexpectedInputException, ParseException {
+    public ItemReader<Transaction> itemReader(Resource inputData) throws UnexpectedInputException {
         FlatFileItemReader<Transaction> reader = new FlatFileItemReader<>();
         DelimitedLineTokenizer tokenizer = new DelimitedLineTokenizer();
         String[] tokens = {"username", "userid", "transactiondate", "amount"};
@@ -88,10 +94,10 @@ public class SpringBatchConfig {
     }
 
     @Bean
-    protected Step step1(@Qualifier("itemProcessor") ItemProcessor<Transaction, Transaction> processor, ItemWriter<Transaction> writer) throws ParseException {
-        return stepBuilderFactory
-                .get("step1")
-                .<Transaction, Transaction> chunk(10)
+    protected Step step1(JobRepository jobRepository, PlatformTransactionManager transactionManager, @Qualifier("itemProcessor") ItemProcessor<Transaction,
+            Transaction> processor, ItemWriter<Transaction> writer) {
+        return new StepBuilder("step1", jobRepository)
+                .<Transaction, Transaction> chunk(10, transactionManager)
                 .reader(itemReader(inputCsv))
                 .processor(processor)
                 .writer(writer)
@@ -99,16 +105,15 @@ public class SpringBatchConfig {
     }
 
     @Bean(name = "firstBatchJob")
-    public Job job(@Qualifier("step1") Step step1) {
-        return jobBuilderFactory.get("firstBatchJob").start(step1).build();
+    public Job job(JobRepository jobRepository, @Qualifier("step1") Step step1) {
+        return new JobBuilder("firstBatchJob", jobRepository).preventRestart().start(step1).build();
     }
 
     @Bean
-    public Step skippingStep(@Qualifier("skippingItemProcessor") ItemProcessor<Transaction, Transaction> processor,
-                             ItemWriter<Transaction> writer) throws ParseException {
-        return stepBuilderFactory
-                .get("skippingStep")
-                .<Transaction, Transaction>chunk(10)
+    public Step skippingStep(JobRepository jobRepository, PlatformTransactionManager transactionManager, @Qualifier("skippingItemProcessor") ItemProcessor<Transaction,
+            Transaction> processor, ItemWriter<Transaction> writer) {
+        return new StepBuilder("skippingStep", jobRepository)
+                .<Transaction, Transaction>chunk(10, transactionManager)
                 .reader(itemReader(invalidInputCsv))
                 .processor(processor)
                 .writer(writer)
@@ -120,19 +125,18 @@ public class SpringBatchConfig {
     }
 
     @Bean(name = "skippingBatchJob")
-    public Job skippingJob(@Qualifier("skippingStep") Step skippingStep) {
-        return jobBuilderFactory
-                .get("skippingBatchJob")
+    public Job skippingJob(JobRepository jobRepository, PlatformTransactionManager transactionManager, @Qualifier("skippingStep") Step skippingStep) {
+        return new JobBuilder("skippingBatchJob", jobRepository)
                 .start(skippingStep)
+                .preventRestart()
                 .build();
     }
 
     @Bean
-    public Step skipPolicyStep(@Qualifier("skippingItemProcessor") ItemProcessor<Transaction, Transaction> processor,
-                               ItemWriter<Transaction> writer) throws ParseException {
-        return stepBuilderFactory
-                .get("skipPolicyStep")
-                .<Transaction, Transaction>chunk(10)
+    public Step skipPolicyStep(JobRepository jobRepository, PlatformTransactionManager transactionManager, @Qualifier("skippingItemProcessor") ItemProcessor<Transaction, Transaction> processor,
+                               ItemWriter<Transaction> writer) {
+        return new StepBuilder("skipPolicyStep", jobRepository)
+                .<Transaction, Transaction>chunk(10, transactionManager)
                 .reader(itemReader(invalidInputCsv))
                 .processor(processor)
                 .writer(writer)
@@ -142,11 +146,44 @@ public class SpringBatchConfig {
     }
 
     @Bean(name = "skipPolicyBatchJob")
-    public Job skipPolicyBatchJob(@Qualifier("skipPolicyStep") Step skipPolicyStep) {
-        return jobBuilderFactory
-                .get("skipPolicyBatchJob")
+    public Job skipPolicyBatchJob(JobRepository jobRepository, @Qualifier("skipPolicyStep") Step skipPolicyStep) {
+        return new JobBuilder("skipPolicyBatchJob", jobRepository)
                 .start(skipPolicyStep)
+                .preventRestart()
                 .build();
     }
 
+    public DataSource dataSource() {
+        EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
+        return builder.setType(EmbeddedDatabaseType.H2)
+                .addScript("classpath:org/springframework/batch/core/schema-drop-h2.sql")
+                .addScript("classpath:org/springframework/batch/core/schema-h2.sql")
+                .build();
+    }
+
+    @Bean(name = "transactionManager")
+    public PlatformTransactionManager getTransactionManager() {
+        return new ResourcelessTransactionManager();
+    }
+
+    @Bean(name = "jobRepository")
+    public JobRepository getJobRepository() throws Exception {
+        JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean();
+        factory.setDataSource(dataSource());
+        factory.setTransactionManager(getTransactionManager());
+        // JobRepositoryFactoryBean's methods Throws Generic Exception,
+        // it would have been better to have a specific one
+        factory.afterPropertiesSet();
+        return factory.getObject();
+    }
+
+    @Bean(name = "jobLauncher")
+    public JobLauncher getJobLauncher() throws Exception {
+        TaskExecutorJobLauncher jobLauncher = new TaskExecutorJobLauncher();
+        // TaskExecutorJobLauncher's methods Throws Generic Exception,
+        // it would have been better to have a specific one
+        jobLauncher.setJobRepository(getJobRepository());
+        jobLauncher.afterPropertiesSet();
+        return jobLauncher;
+    }
 }
diff --git a/spring-batch/src/main/java/com/baeldung/batch/SpringBatchRetryConfig.java b/spring-batch/src/main/java/com/baeldung/batch/SpringBatchRetryConfig.java
index a329df3016..4b6246c074 100644
--- a/spring-batch/src/main/java/com/baeldung/batch/SpringBatchRetryConfig.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/SpringBatchRetryConfig.java
@@ -1,17 +1,18 @@
 package com.baeldung.batch;
 
+import com.baeldung.batch.model.Transaction;
+import com.baeldung.batch.service.RecordFieldSetMapper;
+import com.baeldung.batch.service.RetryItemProcessor;
+
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
-import com.baeldung.batch.model.Transaction;
-import com.baeldung.batch.service.RecordFieldSetMapper;
-import com.baeldung.batch.service.RetryItemProcessor;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
-import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
-import org.springframework.batch.core.configuration.annotation.JobBuilderFactory;
-import org.springframework.batch.core.configuration.annotation.StepBuilderFactory;
+import org.springframework.batch.core.job.builder.JobBuilder;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
@@ -19,38 +20,30 @@ import org.springframework.batch.item.file.FlatFileItemReader;
 import org.springframework.batch.item.file.mapping.DefaultLineMapper;
 import org.springframework.batch.item.file.transform.DelimitedLineTokenizer;
 import org.springframework.batch.item.xml.StaxEventItemWriter;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.Resource;
+import org.springframework.core.io.WritableResource;
 import org.springframework.dao.DeadlockLoserDataAccessException;
 import org.springframework.oxm.Marshaller;
 import org.springframework.oxm.jaxb.Jaxb2Marshaller;
-
-import java.text.ParseException;
+import org.springframework.transaction.PlatformTransactionManager;
 
 @Configuration
-@EnableBatchProcessing
 public class SpringBatchRetryConfig {
-    
+
     private static final String[] tokens = { "username", "userid", "transactiondate", "amount" };
     private static final int TWO_SECONDS = 2000;
 
-    @Autowired
-    private JobBuilderFactory jobBuilderFactory;
-
-    @Autowired
-    private StepBuilderFactory stepBuilderFactory;
-
     @Value("input/recordRetry.csv")
     private Resource inputCsv;
 
     @Value("file:xml/retryOutput.xml")
-    private Resource outputXml;
+    private WritableResource outputXml;
 
-    public ItemReader<Transaction> itemReader(Resource inputData) throws ParseException {
+    public ItemReader<Transaction> itemReader(Resource inputData) {
         DelimitedLineTokenizer tokenizer = new DelimitedLineTokenizer();
         tokenizer.setNames(tokens);
         DefaultLineMapper<Transaction> lineMapper = new DefaultLineMapper<>();
@@ -93,10 +86,11 @@ public class SpringBatchRetryConfig {
     }
 
     @Bean
-    public Step retryStep(@Qualifier("retryItemProcessor") ItemProcessor<Transaction, Transaction> processor,
-      ItemWriter<Transaction> writer) throws ParseException {
-        return stepBuilderFactory.get("retryStep")
-          .<Transaction, Transaction>chunk(10)
+    public Step retryStep(
+            JobRepository jobRepository, PlatformTransactionManager transactionManager, @Qualifier("retryItemProcessor") ItemProcessor<Transaction, Transaction> processor,
+            ItemWriter<Transaction> writer) {
+        return new StepBuilder("retryStep", jobRepository)
+          .<Transaction, Transaction>chunk(10, transactionManager)
           .reader(itemReader(inputCsv))
           .processor(processor)
           .writer(writer)
@@ -108,9 +102,8 @@ public class SpringBatchRetryConfig {
     }
 
     @Bean(name = "retryBatchJob")
-    public Job retryJob(@Qualifier("retryStep") Step retryStep) {
-        return jobBuilderFactory
-          .get("retryBatchJob")
+    public Job retryJob(JobRepository jobRepository, @Qualifier("retryStep") Step retryStep) {
+        return new JobBuilder("retryBatchJob", jobRepository)
           .start(retryStep)
           .build();
     }
diff --git a/spring-batch/src/main/java/com/baeldung/batch/SpringConfig.java b/spring-batch/src/main/java/com/baeldung/batch/SpringConfig.java
deleted file mode 100644
index dc6c242996..0000000000
--- a/spring-batch/src/main/java/com/baeldung/batch/SpringConfig.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.baeldung.batch;
-
-import java.net.MalformedURLException;
-
-import javax.sql.DataSource;
-
-import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.batch.core.launch.support.SimpleJobLauncher;
-import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
-import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.core.io.Resource;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.jdbc.datasource.init.DataSourceInitializer;
-import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
-import org.springframework.transaction.PlatformTransactionManager;
-
-@Configuration
-@EnableBatchProcessing
-@Profile("spring")
-public class SpringConfig {
-
-    @Value("org/springframework/batch/core/schema-drop-sqlite.sql")
-    private Resource dropReopsitoryTables;
-
-    @Value("org/springframework/batch/core/schema-sqlite.sql")
-    private Resource dataReopsitorySchema;
-
-    @Bean
-    public DataSource dataSource() {
-        DriverManagerDataSource dataSource = new DriverManagerDataSource();
-        dataSource.setDriverClassName("org.sqlite.JDBC");
-        dataSource.setUrl("jdbc:sqlite:repository.sqlite");
-        return dataSource;
-    }
-
-    @Bean
-    public DataSourceInitializer dataSourceInitializer(DataSource dataSource) throws MalformedURLException {
-        ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator();
-
-        databasePopulator.addScript(dropReopsitoryTables);
-        databasePopulator.addScript(dataReopsitorySchema);
-        databasePopulator.setIgnoreFailedDrops(true);
-
-        DataSourceInitializer initializer = new DataSourceInitializer();
-        initializer.setDataSource(dataSource);
-        initializer.setDatabasePopulator(databasePopulator);
-
-        return initializer;
-    }
-
-    private JobRepository getJobRepository() throws Exception {
-        JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean();
-        factory.setDataSource(dataSource());
-        factory.setTransactionManager(getTransactionManager());
-        // JobRepositoryFactoryBean's methods Throws Generic Exception,
-        // it would have been better to have a specific one
-        factory.afterPropertiesSet();
-        return (JobRepository) factory.getObject();
-    }
-
-    private PlatformTransactionManager getTransactionManager() {
-        return new ResourcelessTransactionManager();
-    }
-
-    public JobLauncher getJobLauncher() throws Exception {
-        SimpleJobLauncher jobLauncher = new SimpleJobLauncher();
-        // SimpleJobLauncher's methods Throws Generic Exception,
-        // it would have been better to have a specific one
-        jobLauncher.setJobRepository(getJobRepository());
-        jobLauncher.afterPropertiesSet();
-        return jobLauncher;
-    }
-
-}
\ No newline at end of file
diff --git a/spring-batch/src/main/java/com/baeldung/batch/model/Transaction.java b/spring-batch/src/main/java/com/baeldung/batch/model/Transaction.java
index ffb6d59a79..c4ca36c1bc 100644
--- a/spring-batch/src/main/java/com/baeldung/batch/model/Transaction.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/model/Transaction.java
@@ -1,10 +1,11 @@
 package com.baeldung.batch.model;
 
+import java.time.LocalDateTime;
+
 import com.baeldung.batch.service.adapter.LocalDateTimeAdapter;
 
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.time.LocalDateTime;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @SuppressWarnings("restriction")
 @XmlRootElement(name = "transactionRecord")
diff --git a/spring-batch/src/main/java/com/baeldung/batch/partitioner/CustomMultiResourcePartitioner.java b/spring-batch/src/main/java/com/baeldung/batch/partitioner/CustomMultiResourcePartitioner.java
index 4fade76ffc..1ff74ce192 100644
--- a/spring-batch/src/main/java/com/baeldung/batch/partitioner/CustomMultiResourcePartitioner.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/partitioner/CustomMultiResourcePartitioner.java
@@ -60,7 +60,7 @@ public class CustomMultiResourcePartitioner implements Partitioner {
      */
     @Override
     public Map<String, ExecutionContext> partition(int gridSize) {
-        Map<String, ExecutionContext> map = new HashMap<String, ExecutionContext>(gridSize);
+        Map<String, ExecutionContext> map = new HashMap<>(gridSize);
         int i = 0, k = 1;
         for (Resource resource : resources) {
             ExecutionContext context = new ExecutionContext();
diff --git a/spring-batch/src/main/java/com/baeldung/batch/partitioner/SpringbatchPartitionConfig.java b/spring-batch/src/main/java/com/baeldung/batch/partitioner/SpringBatchPartitionConfig.java
similarity index 77%
rename from spring-batch/src/main/java/com/baeldung/batch/partitioner/SpringbatchPartitionConfig.java
rename to spring-batch/src/main/java/com/baeldung/batch/partitioner/SpringBatchPartitionConfig.java
index b08c95af53..ceacb36e4d 100644
--- a/spring-batch/src/main/java/com/baeldung/batch/partitioner/SpringbatchPartitionConfig.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/partitioner/SpringBatchPartitionConfig.java
@@ -5,13 +5,13 @@ import com.baeldung.batch.service.RecordFieldSetMapper;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
-import org.springframework.batch.core.configuration.annotation.JobBuilderFactory;
-import org.springframework.batch.core.configuration.annotation.StepBuilderFactory;
 import org.springframework.batch.core.configuration.annotation.StepScope;
+import org.springframework.batch.core.job.builder.JobBuilder;
 import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.batch.core.launch.support.SimpleJobLauncher;
+import org.springframework.batch.core.launch.support.TaskExecutorJobLauncher;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
+import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.batch.item.UnexpectedInputException;
 import org.springframework.batch.item.file.FlatFileItemReader;
 import org.springframework.batch.item.file.mapping.DefaultLineMapper;
@@ -36,42 +36,35 @@ import org.springframework.transaction.PlatformTransactionManager;
 
 import javax.sql.DataSource;
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.text.ParseException;
 
 @Configuration
 @EnableBatchProcessing
-public class SpringbatchPartitionConfig {
+public class SpringBatchPartitionConfig {
 
     @Autowired
-    ResourcePatternResolver resoursePatternResolver;
-
-    @Autowired
-    private JobBuilderFactory jobs;
-
-    @Autowired
-    private StepBuilderFactory steps;
+    private ResourcePatternResolver resourcePatternResolver;
 
     @Bean(name = "partitionerJob")
-    public Job partitionerJob() throws UnexpectedInputException, MalformedURLException, ParseException {
-        return jobs.get("partitionerJob")
-          .start(partitionStep())
+    public Job partitionerJob(JobRepository jobRepository, PlatformTransactionManager transactionManager) throws UnexpectedInputException, ParseException {
+        return new JobBuilder("partitionerJob", jobRepository)
+          .start(partitionStep(jobRepository, transactionManager))
           .build();
     }
 
     @Bean
-    public Step partitionStep() throws UnexpectedInputException, MalformedURLException, ParseException {
-        return steps.get("partitionStep")
+    public Step partitionStep(JobRepository jobRepository, PlatformTransactionManager transactionManager) throws UnexpectedInputException, ParseException {
+        return new StepBuilder("partitionStep", jobRepository)
           .partitioner("slaveStep", partitioner())
-          .step(slaveStep())
+          .step(slaveStep(jobRepository, transactionManager))
           .taskExecutor(taskExecutor())
           .build();
     }
 
     @Bean
-    public Step slaveStep() throws UnexpectedInputException, MalformedURLException, ParseException {
-        return steps.get("slaveStep")
-          .<Transaction, Transaction>chunk(1)
+    public Step slaveStep(JobRepository jobRepository, PlatformTransactionManager transactionManager) throws UnexpectedInputException, ParseException {
+        return new StepBuilder("slaveStep", jobRepository)
+          .<Transaction, Transaction>chunk(1, transactionManager)
           .reader(itemReader(null))
           .writer(itemWriter(marshaller(), null))
           .build();
@@ -82,7 +75,7 @@ public class SpringbatchPartitionConfig {
         CustomMultiResourcePartitioner partitioner = new CustomMultiResourcePartitioner();
         Resource[] resources;
         try {
-            resources = resoursePatternResolver.getResources("file:src/main/resources/input/partitioner/*.csv");
+            resources = resourcePatternResolver.getResources("file:src/main/resources/input/partitioner/*.csv");
         } catch (IOException e) {
             throw new RuntimeException("I/O problems when resolving the input file pattern.", e);
         }
@@ -108,7 +101,7 @@ public class SpringbatchPartitionConfig {
 
     @Bean(destroyMethod = "")
     @StepScope
-    public StaxEventItemWriter<Transaction> itemWriter(Marshaller marshaller, @Value("#{stepExecutionContext[opFileName]}") String filename) throws MalformedURLException {
+    public StaxEventItemWriter<Transaction> itemWriter(Marshaller marshaller, @Value("#{stepExecutionContext[opFileName]}") String filename) {
         StaxEventItemWriter<Transaction> itemWriter = new StaxEventItemWriter<>();
         itemWriter.setMarshaller(marshaller);
         itemWriter.setRootTagName("transactionRecord");
@@ -133,7 +126,8 @@ public class SpringbatchPartitionConfig {
         return taskExecutor;
     }
 
-    private JobRepository getJobRepository() throws Exception {
+    @Bean(name = "jobRepository")
+    public JobRepository getJobRepository() throws Exception {
         JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean();
         factory.setDataSource(dataSource());
         factory.setTransactionManager(getTransactionManager());
@@ -143,20 +137,23 @@ public class SpringbatchPartitionConfig {
         return factory.getObject();
     }
 
-    private DataSource dataSource() {
+    @Bean(name = "dataSource")
+    public DataSource dataSource() {
         EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
-        return builder.setType(EmbeddedDatabaseType.HSQL)
+        return builder.setType(EmbeddedDatabaseType.H2)
           .addScript("classpath:org/springframework/batch/core/schema-drop-h2.sql")
           .addScript("classpath:org/springframework/batch/core/schema-h2.sql")
           .build();
     }
 
-    private PlatformTransactionManager getTransactionManager() {
+    @Bean(name = "transactionManager")
+    public PlatformTransactionManager getTransactionManager() {
         return new ResourcelessTransactionManager();
     }
 
+    @Bean(name = "jobLauncher")
     public JobLauncher getJobLauncher() throws Exception {
-        SimpleJobLauncher jobLauncher = new SimpleJobLauncher();
+        TaskExecutorJobLauncher jobLauncher = new TaskExecutorJobLauncher();
         // SimpleJobLauncher's methods Throws Generic Exception,
         // it would have been better to have a specific one
         jobLauncher.setJobRepository(getJobRepository());
diff --git a/spring-batch/src/main/java/com/baeldung/batch/partitioner/SpringbatchPartitionerApp.java b/spring-batch/src/main/java/com/baeldung/batch/partitioner/SpringBatchPartitionerApp.java
similarity index 89%
rename from spring-batch/src/main/java/com/baeldung/batch/partitioner/SpringbatchPartitionerApp.java
rename to spring-batch/src/main/java/com/baeldung/batch/partitioner/SpringBatchPartitionerApp.java
index e755e21ca9..a1661e750e 100644
--- a/spring-batch/src/main/java/com/baeldung/batch/partitioner/SpringbatchPartitionerApp.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/partitioner/SpringBatchPartitionerApp.java
@@ -8,14 +8,14 @@ import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
-public class SpringbatchPartitionerApp {
+public class SpringBatchPartitionerApp {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SpringbatchPartitionerApp.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SpringBatchPartitionerApp.class);
 
     public static void main(final String[] args) {
         // Spring Java config
         final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-        context.register(SpringbatchPartitionConfig.class);
+        context.register(SpringBatchPartitionConfig.class);
         context.refresh();
 
         final JobLauncher jobLauncher = (JobLauncher) context.getBean("jobLauncher");
diff --git a/spring-batch/src/main/java/com/baeldung/batch/service/CustomSkipPolicy.java b/spring-batch/src/main/java/com/baeldung/batch/service/CustomSkipPolicy.java
index 25401de022..af6fe20529 100644
--- a/spring-batch/src/main/java/com/baeldung/batch/service/CustomSkipPolicy.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/service/CustomSkipPolicy.java
@@ -9,19 +9,13 @@ public class CustomSkipPolicy implements SkipPolicy {
     private static final int INVALID_TX_AMOUNT_LIMIT = -1000;
 
     @Override
-    public boolean shouldSkip(Throwable throwable, int skipCount) throws SkipLimitExceededException {
-
+    public boolean shouldSkip(Throwable throwable, long skipCount) throws SkipLimitExceededException {
         if (throwable instanceof MissingUsernameException && skipCount < MAX_SKIP_COUNT) {
             return true;
         }
 
-        if (throwable instanceof NegativeAmountException && skipCount < MAX_SKIP_COUNT ) {
-            NegativeAmountException ex = (NegativeAmountException) throwable;
-            if(ex.getAmount() < INVALID_TX_AMOUNT_LIMIT){
-                return false;
-            } else{
-                return true;
-            }
+        if (throwable instanceof NegativeAmountException ex && skipCount < MAX_SKIP_COUNT ) {
+            return ex.getAmount() >= INVALID_TX_AMOUNT_LIMIT;
         }
 
         return false;
diff --git a/spring-batch/src/main/java/com/baeldung/batch/service/RecordFieldSetMapper.java b/spring-batch/src/main/java/com/baeldung/batch/service/RecordFieldSetMapper.java
index 09478e9a30..97c77d9e6a 100644
--- a/spring-batch/src/main/java/com/baeldung/batch/service/RecordFieldSetMapper.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/service/RecordFieldSetMapper.java
@@ -10,7 +10,7 @@ import java.time.format.DateTimeFormatter;
 
 public class RecordFieldSetMapper implements FieldSetMapper<Transaction> {
 
-    public Transaction mapFieldSet(FieldSet fieldSet) throws BindException {
+    public Transaction mapFieldSet(FieldSet fieldSet) {
 
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("d/M/yyy");
 
diff --git a/spring-batch/src/main/java/com/baeldung/batch/service/RetryItemProcessor.java b/spring-batch/src/main/java/com/baeldung/batch/service/RetryItemProcessor.java
index c380e2c0ab..aa49680b2a 100644
--- a/spring-batch/src/main/java/com/baeldung/batch/service/RetryItemProcessor.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/service/RetryItemProcessor.java
@@ -5,15 +5,13 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.util.EntityUtils;
 import com.baeldung.batch.model.Transaction;
-import org.codehaus.jettison.json.JSONException;
+
 import org.codehaus.jettison.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.io.IOException;
-
 public class RetryItemProcessor implements ItemProcessor<Transaction, Transaction> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RetryItemProcessor.class);
@@ -22,7 +20,7 @@ public class RetryItemProcessor implements ItemProcessor<Transaction, Transactio
     private CloseableHttpClient closeableHttpClient;
 
     @Override
-    public Transaction process(Transaction transaction) throws IOException, JSONException {
+    public Transaction process(Transaction transaction) throws Exception {
         LOGGER.info("Attempting to process user with id={}", transaction.getUserId());
         HttpResponse response = fetchMoreUserDetails(transaction.getUserId());
 
@@ -35,7 +33,7 @@ public class RetryItemProcessor implements ItemProcessor<Transaction, Transactio
         return transaction;
     }
 
-    private HttpResponse fetchMoreUserDetails(int id) throws IOException {
+    private HttpResponse fetchMoreUserDetails(int id) throws Exception {
         final HttpGet request = new HttpGet("http://www.baeldung.com:81/user/" + id);
         return closeableHttpClient.execute(request);
     }
diff --git a/spring-batch/src/main/java/com/baeldung/batch/service/adapter/LocalDateTimeAdapter.java b/spring-batch/src/main/java/com/baeldung/batch/service/adapter/LocalDateTimeAdapter.java
index 561a7335b3..db5d6b9f61 100644
--- a/spring-batch/src/main/java/com/baeldung/batch/service/adapter/LocalDateTimeAdapter.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/service/adapter/LocalDateTimeAdapter.java
@@ -1,9 +1,10 @@
 package com.baeldung.batch.service.adapter;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+
 public class LocalDateTimeAdapter extends XmlAdapter<String, LocalDateTime> {
 
     private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
diff --git a/spring-batch/src/main/java/com/baeldung/batch/springboot/SpringBootBatchConfig.java b/spring-batch/src/main/java/com/baeldung/batch/springboot/SpringBootBatchConfig.java
index 57531ebc39..6c463de5dc 100644
--- a/spring-batch/src/main/java/com/baeldung/batch/springboot/SpringBootBatchConfig.java
+++ b/spring-batch/src/main/java/com/baeldung/batch/springboot/SpringBootBatchConfig.java
@@ -5,8 +5,9 @@ import com.baeldung.batch.service.*;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
-import org.springframework.batch.core.configuration.annotation.JobBuilderFactory;
-import org.springframework.batch.core.configuration.annotation.StepBuilderFactory;
+import org.springframework.batch.core.job.builder.JobBuilder;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
@@ -15,27 +16,21 @@ import org.springframework.batch.item.file.FlatFileItemReader;
 import org.springframework.batch.item.file.mapping.DefaultLineMapper;
 import org.springframework.batch.item.file.transform.DelimitedLineTokenizer;
 import org.springframework.batch.item.xml.StaxEventItemWriter;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.io.Resource;
+import org.springframework.core.io.WritableResource;
 import org.springframework.oxm.Marshaller;
 import org.springframework.oxm.jaxb.Jaxb2Marshaller;
-
-import java.text.ParseException;
+import org.springframework.transaction.PlatformTransactionManager;
 
 @Configuration
 @EnableBatchProcessing
 @Profile("spring-boot")
 public class SpringBootBatchConfig {
-    @Autowired
-    private JobBuilderFactory jobBuilderFactory;
-
-    @Autowired
-    private StepBuilderFactory stepBuilderFactory;
 
     @Value("input/record.csv")
     private Resource inputCsv;
@@ -44,9 +39,9 @@ public class SpringBootBatchConfig {
     private Resource invalidInputCsv;
 
     @Value("file:xml/output.xml")
-    private Resource outputXml;
+    private WritableResource outputXml;
 
-    public ItemReader<Transaction> itemReader(Resource inputData) throws UnexpectedInputException, ParseException {
+    public ItemReader<Transaction> itemReader(Resource inputData) throws UnexpectedInputException {
         FlatFileItemReader<Transaction> reader = new FlatFileItemReader<>();
         DelimitedLineTokenizer tokenizer = new DelimitedLineTokenizer();
         String[] tokens = {"username", "userid", "transactiondate", "amount"};
@@ -86,11 +81,10 @@ public class SpringBootBatchConfig {
         return marshaller3;
     }
 
-    @Bean
-    protected Step step1(@Qualifier("itemProcessor") ItemProcessor<Transaction, Transaction> processor, ItemWriter<Transaction> itemWriter3) throws ParseException {
-        return stepBuilderFactory
-                .get("step1")
-                .<Transaction, Transaction> chunk(10)
+    @Bean(name = "step1")
+    protected Step step1(JobRepository jobRepository, PlatformTransactionManager transactionManager, @Qualifier("itemProcessor") ItemProcessor<Transaction, Transaction> processor, ItemWriter<Transaction> itemWriter3) {
+        return new StepBuilder("step1", jobRepository)
+                .<Transaction, Transaction> chunk(10, transactionManager)
                 .reader(itemReader(inputCsv))
                 .processor(processor)
                 .writer(itemWriter3)
@@ -98,16 +92,15 @@ public class SpringBootBatchConfig {
     }
 
     @Bean(name = "firstBatchJob")
-    public Job job(@Qualifier("step1") Step step1) {
-        return jobBuilderFactory.get("firstBatchJob").start(step1).build();
+    public Job job(@Qualifier("step1") Step step1, JobRepository jobRepository) {
+        return new JobBuilder("firstBatchJob", jobRepository).start(step1).build();
     }
 
     @Bean
-    public Step skippingStep(@Qualifier("skippingItemProcessor") ItemProcessor<Transaction, Transaction> processor,
-                             ItemWriter<Transaction> itemWriter3) throws ParseException {
-        return stepBuilderFactory
-                .get("skippingStep")
-                .<Transaction, Transaction>chunk(10)
+    public Step skippingStep(JobRepository jobRepository, PlatformTransactionManager transactionManager, @Qualifier("skippingItemProcessor") ItemProcessor<Transaction, Transaction> processor,
+                             ItemWriter<Transaction> itemWriter3) {
+        return new StepBuilder("skippingStep", jobRepository)
+                .<Transaction, Transaction>chunk(10, transactionManager)
                 .reader(itemReader(invalidInputCsv))
                 .processor(processor)
                 .writer(itemWriter3)
@@ -119,19 +112,17 @@ public class SpringBootBatchConfig {
     }
 
     @Bean(name = "skippingBatchJob")
-    public Job skippingJob(@Qualifier("skippingStep") Step skippingStep) {
-        return jobBuilderFactory
-                .get("skippingBatchJob")
+    public Job skippingJob(JobRepository jobRepository, @Qualifier("skippingStep") Step skippingStep) {
+        return new JobBuilder("skippingBatchJob", jobRepository)
                 .start(skippingStep)
                 .build();
     }
 
-    @Bean
-    public Step skipPolicyStep(@Qualifier("skippingItemProcessor") ItemProcessor<Transaction, Transaction> processor,
-                               ItemWriter<Transaction> itemWriter3) throws ParseException {
-        return stepBuilderFactory
-                .get("skipPolicyStep")
-                .<Transaction, Transaction>chunk(10)
+    @Bean(name = "skipPolicyStep")
+    public Step skipPolicyStep(JobRepository jobRepository, PlatformTransactionManager transactionManager, @Qualifier("skippingItemProcessor") ItemProcessor<Transaction, Transaction> processor,
+                               ItemWriter<Transaction> itemWriter3) {
+        return new StepBuilder("skipPolicyStep", jobRepository)
+                .<Transaction, Transaction>chunk(10, transactionManager)
                 .reader(itemReader(invalidInputCsv))
                 .processor(processor)
                 .writer(itemWriter3)
@@ -141,11 +132,9 @@ public class SpringBootBatchConfig {
     }
 
     @Bean(name = "skipPolicyBatchJob")
-    public Job skipPolicyBatchJob(@Qualifier("skipPolicyStep") Step skipPolicyStep) {
-        return jobBuilderFactory
-                .get("skipPolicyBatchJob")
+    public Job skipPolicyBatchJob(JobRepository jobRepository, @Qualifier("skipPolicyStep") Step skipPolicyStep) {
+        return new JobBuilder("skipPolicyBatchJob", jobRepository)
                 .start(skipPolicyStep)
                 .build();
     }
-
 }
diff --git a/spring-batch/src/main/java/com/baeldung/batchtesting/SpringBatchConfiguration.java b/spring-batch/src/main/java/com/baeldung/batchtesting/SpringBatchConfiguration.java
index 664db3fbba..547074ff84 100644
--- a/spring-batch/src/main/java/com/baeldung/batchtesting/SpringBatchConfiguration.java
+++ b/spring-batch/src/main/java/com/baeldung/batchtesting/SpringBatchConfiguration.java
@@ -1,7 +1,5 @@
 package com.baeldung.batchtesting;
 
-import java.io.IOException;
-
 import com.baeldung.batchtesting.model.Book;
 import com.baeldung.batchtesting.model.BookDetails;
 import com.baeldung.batchtesting.model.BookRecord;
@@ -12,10 +10,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
-import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
-import org.springframework.batch.core.configuration.annotation.JobBuilderFactory;
-import org.springframework.batch.core.configuration.annotation.StepBuilderFactory;
 import org.springframework.batch.core.configuration.annotation.StepScope;
+import org.springframework.batch.core.job.builder.JobBuilder;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.item.file.FlatFileItemReader;
@@ -25,27 +23,19 @@ import org.springframework.batch.item.json.JacksonJsonObjectMarshaller;
 import org.springframework.batch.item.json.JsonFileItemWriter;
 import org.springframework.batch.item.json.builder.JsonFileItemWriterBuilder;
 import org.springframework.batch.item.support.ListItemWriter;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.FileSystemResource;
-
+import org.springframework.transaction.PlatformTransactionManager;
 
 @Configuration
-@EnableBatchProcessing
 public class SpringBatchConfiguration {
 
     private static Logger LOGGER = LoggerFactory.getLogger(SpringBatchConfiguration.class);
 
     private static final String[] TOKENS = { "bookname", "bookauthor", "bookformat", "isbn", "publishyear" };
 
-    @Autowired
-    private JobBuilderFactory jobBuilderFactory;
-
-    @Autowired
-    private StepBuilderFactory stepBuilderFactory;
-
     @Bean
     @StepScope
     public FlatFileItemReader<BookRecord> csvItemReader(@Value("#{jobParameters['file.input']}") String input) {
@@ -65,7 +55,7 @@ public class SpringBatchConfiguration {
 
     @Bean
     @StepScope
-    public JsonFileItemWriter<Book> jsonItemWriter(@Value("#{jobParameters['file.output']}") String output) throws IOException {
+    public JsonFileItemWriter<Book> jsonItemWriter(@Value("#{jobParameters['file.output']}") String output) {
         JsonFileItemWriterBuilder<Book> builder = new JsonFileItemWriterBuilder<>();
         JacksonJsonObjectMarshaller<Book> marshaller = new JacksonJsonObjectMarshaller<>();
         LOGGER.info("Configuring writer to output {}", output);
@@ -81,7 +71,7 @@ public class SpringBatchConfiguration {
     @Bean
     @StepScope
     public ListItemWriter<BookDetails> listItemWriter() {
-        return new ListItemWriter<BookDetails>();
+        return new ListItemWriter<>();
     }
 
     @Bean
@@ -96,12 +86,11 @@ public class SpringBatchConfiguration {
         return new BookDetailsItemProcessor();
     }
 
-    @Bean
-    public Step step1(ItemReader<BookRecord> csvItemReader, ItemWriter<Book> jsonItemWriter) throws IOException {
+    @Bean(name = "step1")
+    public Step step1(JobRepository jobRepository, PlatformTransactionManager transactionManager, ItemReader<BookRecord> csvItemReader, ItemWriter<Book> jsonItemWriter) {
         // @formatter:off
-        return stepBuilderFactory
-          .get("step1")
-          .<BookRecord, Book> chunk(3)
+        return new StepBuilder("step1", jobRepository)
+          .<BookRecord, Book> chunk(3, transactionManager)
           .reader(csvItemReader)
           .processor(bookItemProcessor())
           .writer(jsonItemWriter)
@@ -109,12 +98,11 @@ public class SpringBatchConfiguration {
         // @formatter:on
     }
 
-    @Bean
-    public Step step2(ItemReader<BookRecord> csvItemReader, ItemWriter<BookDetails> listItemWriter) {
+    @Bean(name = "step2")
+    public Step step2(JobRepository jobRepository, PlatformTransactionManager transactionManager, ItemReader<BookRecord> csvItemReader, ItemWriter<BookDetails> listItemWriter) {
         // @formatter:off
-        return stepBuilderFactory
-          .get("step2")
-          .<BookRecord, BookDetails> chunk(3)
+        return new StepBuilder("step2", jobRepository)
+          .<BookRecord, BookDetails> chunk(3, transactionManager)
           .reader(csvItemReader)
           .processor(bookDetailsItemProcessor())
           .writer(listItemWriter)
@@ -123,15 +111,13 @@ public class SpringBatchConfiguration {
     }
 
     @Bean(name = "transformBooksRecords")
-    public Job transformBookRecords(Step step1, Step step2) throws IOException {
+    public Job transformBookRecords(JobRepository jobRepository, Step step1, Step step2) {
         // @formatter:off
-        return jobBuilderFactory
-          .get("transformBooksRecords")
+        return new JobBuilder("transformBooksRecords", jobRepository)
           .flow(step1)
           .next(step2)
           .end()
           .build();
         // @formatter:on
     }
-
 }
diff --git a/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookDetailsItemProcessor.java b/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookDetailsItemProcessor.java
index 514a383108..4e4d1e9075 100644
--- a/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookDetailsItemProcessor.java
+++ b/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookDetailsItemProcessor.java
@@ -11,7 +11,7 @@ public class BookDetailsItemProcessor implements ItemProcessor<BookRecord, BookD
     private static Logger LOGGER = LoggerFactory.getLogger(BookDetailsItemProcessor.class);
 
     @Override
-    public BookDetails process(BookRecord item) throws Exception {
+    public BookDetails process(BookRecord item) {
         BookDetails bookDetails = new BookDetails();
         bookDetails.setBookFormat(item.getBookFormat());
         bookDetails.setBookISBN(item.getBookISBN());
diff --git a/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookItemProcessor.java b/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookItemProcessor.java
index 84e850fe71..01b27c9e0c 100644
--- a/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookItemProcessor.java
+++ b/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookItemProcessor.java
@@ -11,7 +11,7 @@ public class BookItemProcessor implements ItemProcessor<BookRecord, Book> {
     private static Logger LOGGER = LoggerFactory.getLogger(BookItemProcessor.class);
 
     @Override
-    public Book process(BookRecord item) throws Exception {
+    public Book process(BookRecord item) {
         Book book = new Book();
         book.setAuthor(item.getBookAuthor());
         book.setName(item.getBookName());
diff --git a/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookRecordFieldSetMapper.java b/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookRecordFieldSetMapper.java
index d9e8ee1158..e4760da20f 100644
--- a/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookRecordFieldSetMapper.java
+++ b/spring-batch/src/main/java/com/baeldung/batchtesting/service/BookRecordFieldSetMapper.java
@@ -9,7 +9,7 @@ import org.springframework.validation.BindException;
 public class BookRecordFieldSetMapper implements FieldSetMapper<BookRecord> {
 
     @Override
-    public BookRecord mapFieldSet(FieldSet fieldSet) throws BindException {
+    public BookRecord mapFieldSet(FieldSet fieldSet) {
         BookRecord bookRecord = new BookRecord();
         bookRecord.setBookName(fieldSet.readString("bookname"));
         bookRecord.setBookAuthor(fieldSet.readString("bookauthor"));
diff --git a/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LineReader.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LineReader.java
index 6ffa730c19..d8ba2c9728 100644
--- a/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LineReader.java
+++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LineReader.java
@@ -21,9 +21,9 @@ public class LineReader implements ItemReader<Line>, StepExecutionListener {
     }
 
     @Override
-    public Line read() throws Exception {
+    public Line read() {
         Line line = fu.readLine();
-        if (line != null) logger.debug("Read line: " + line.toString());
+        if (line != null) logger.debug("Read line: " + line);
         return line;
     }
 
diff --git a/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LinesWriter.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LinesWriter.java
index 9f292b24b9..bcf648820c 100644
--- a/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LinesWriter.java
+++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/chunks/LinesWriter.java
@@ -7,10 +7,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.StepExecutionListener;
+import org.springframework.batch.item.Chunk;
 import org.springframework.batch.item.ItemWriter;
 
-import java.util.List;
-
 public class LinesWriter implements ItemWriter<Line>, StepExecutionListener {
 
     private final Logger logger = LoggerFactory.getLogger(LinesWriter.class);
@@ -30,7 +29,7 @@ public class LinesWriter implements ItemWriter<Line>, StepExecutionListener {
     }
 
     @Override
-    public void write(List<? extends Line> lines) throws Exception {
+    public void write(Chunk<? extends Line> lines) {
         for (Line line : lines) {
             fu.writeLine(line);
             logger.debug("Wrote line " + line.toString());
diff --git a/spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/ChunksConfig.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/ChunksConfig.java
index c8b05848f9..16c6b1191f 100644
--- a/spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/ChunksConfig.java
+++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/ChunksConfig.java
@@ -6,67 +6,19 @@ import com.baeldung.taskletsvschunks.chunks.LinesWriter;
 import com.baeldung.taskletsvschunks.model.Line;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
-import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
-import org.springframework.batch.core.configuration.annotation.JobBuilderFactory;
-import org.springframework.batch.core.configuration.annotation.StepBuilderFactory;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.batch.core.launch.support.SimpleJobLauncher;
+import org.springframework.batch.core.job.builder.JobBuilder;
 import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
+import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
-import org.springframework.batch.test.JobLauncherTestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.transaction.PlatformTransactionManager;
 
-import javax.sql.DataSource;
-
 @Configuration
-@EnableBatchProcessing
 public class ChunksConfig {
 
-    @Autowired private JobBuilderFactory jobs;
-
-    @Autowired private StepBuilderFactory steps;
-
-    @Bean
-    public JobLauncherTestUtils jobLauncherTestUtils() {
-        return new JobLauncherTestUtils();
-    }
-
-    @Bean
-    public JobRepository jobRepository() throws Exception {
-        JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean();
-        factory.setDataSource(dataSource());
-        factory.setTransactionManager(transactionManager());
-        return factory.getObject();
-    }
-
-    @Bean
-    public DataSource dataSource() {
-        DriverManagerDataSource dataSource = new DriverManagerDataSource();
-        dataSource.setDriverClassName("org.sqlite.JDBC");
-        dataSource.setUrl("jdbc:sqlite:repository.sqlite");
-        return dataSource;
-    }
-
-    @Bean
-    public PlatformTransactionManager transactionManager() {
-        return new ResourcelessTransactionManager();
-    }
-
-    @Bean
-    public JobLauncher jobLauncher() throws Exception {
-        SimpleJobLauncher jobLauncher = new SimpleJobLauncher();
-        jobLauncher.setJobRepository(jobRepository());
-        return jobLauncher;
-    }
-
     @Bean
     public ItemReader<Line> itemReader() {
         return new LineReader();
@@ -82,20 +34,19 @@ public class ChunksConfig {
         return new LinesWriter();
     }
 
-    @Bean
-    protected Step processLines(ItemReader<Line> reader, ItemProcessor<Line, Line> processor, ItemWriter<Line> writer) {
-        return steps.get("processLines").<Line, Line> chunk(2)
+    @Bean(name = "processLines")
+    protected Step processLines(JobRepository jobRepository, PlatformTransactionManager transactionManager, ItemReader<Line> reader, ItemProcessor<Line, Line> processor, ItemWriter<Line> writer) {
+        return new StepBuilder("processLines", jobRepository).<Line, Line> chunk(2, transactionManager)
           .reader(reader)
           .processor(processor)
           .writer(writer)
           .build();
     }
 
-    @Bean
-    public Job job() {
-        return jobs
-          .get("chunksJob")
-          .start(processLines(itemReader(), itemProcessor(), itemWriter()))
+    @Bean(name = "chunksJob")
+    public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
+        return new JobBuilder("chunksJob", jobRepository)
+          .start(processLines(jobRepository, transactionManager, itemReader(), itemProcessor(), itemWriter()))
           .build();
     }
 
diff --git a/spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/TaskletsConfig.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/TaskletsConfig.java
index 5f2f49928c..ab9d506229 100644
--- a/spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/TaskletsConfig.java
+++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/config/TaskletsConfig.java
@@ -5,64 +5,16 @@ import com.baeldung.taskletsvschunks.tasklets.LinesReader;
 import com.baeldung.taskletsvschunks.tasklets.LinesWriter;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
-import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
-import org.springframework.batch.core.configuration.annotation.JobBuilderFactory;
-import org.springframework.batch.core.configuration.annotation.StepBuilderFactory;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.batch.core.launch.support.SimpleJobLauncher;
+import org.springframework.batch.core.job.builder.JobBuilder;
 import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
-import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
-import org.springframework.batch.test.JobLauncherTestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.transaction.PlatformTransactionManager;
 
-import javax.sql.DataSource;
-
 @Configuration
-@EnableBatchProcessing
 public class TaskletsConfig {
 
-    @Autowired private JobBuilderFactory jobs;
-
-    @Autowired private StepBuilderFactory steps;
-
-    @Bean
-    public JobLauncherTestUtils jobLauncherTestUtils() {
-        return new JobLauncherTestUtils();
-    }
-
-    @Bean
-    public JobRepository jobRepository() throws Exception {
-        JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean();
-        factory.setDataSource(dataSource());
-        factory.setTransactionManager(transactionManager());
-        return factory.getObject();
-    }
-
-    @Bean
-    public DataSource dataSource() {
-        DriverManagerDataSource dataSource = new DriverManagerDataSource();
-        dataSource.setDriverClassName("org.sqlite.JDBC");
-        dataSource.setUrl("jdbc:sqlite:repository.sqlite");
-        return dataSource;
-    }
-
-    @Bean
-    public PlatformTransactionManager transactionManager() {
-        return new ResourcelessTransactionManager();
-    }
-
-    @Bean
-    public JobLauncher jobLauncher() throws Exception {
-        SimpleJobLauncher jobLauncher = new SimpleJobLauncher();
-        jobLauncher.setJobRepository(jobRepository());
-        return jobLauncher;
-    }
-
     @Bean
     public LinesReader linesReader() {
         return new LinesReader();
@@ -79,36 +31,32 @@ public class TaskletsConfig {
     }
 
     @Bean
-    protected Step readLines() {
-        return steps
-          .get("readLines")
-          .tasklet(linesReader())
+    protected Step readLines(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
+        return new StepBuilder("readLines", jobRepository)
+          .tasklet(linesReader(), transactionManager)
           .build();
     }
 
     @Bean
-    protected Step processLines() {
-        return steps
-          .get("processLines")
-          .tasklet(linesProcessor())
+    protected Step processLines(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
+        return new StepBuilder("processLines", jobRepository)
+          .tasklet(linesProcessor(), transactionManager)
           .build();
     }
 
     @Bean
-    protected Step writeLines() {
-        return steps
-          .get("writeLines")
-          .tasklet(linesWriter())
+    protected Step writeLines(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
+        return new StepBuilder("writeLines", jobRepository)
+          .tasklet(linesWriter(), transactionManager)
           .build();
     }
 
     @Bean
-    public Job job() {
-        return jobs
-          .get("taskletsJob")
-          .start(readLines())
-          .next(processLines())
-          .next(writeLines())
+    public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
+        return new JobBuilder("taskletsJob", jobRepository)
+          .start(readLines(jobRepository, transactionManager))
+          .next(processLines(jobRepository, transactionManager))
+          .next(writeLines(jobRepository, transactionManager))
           .build();
     }
 
diff --git a/spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesReader.java b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesReader.java
index b1f58be4a4..70f1a1b05d 100644
--- a/spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesReader.java
+++ b/spring-batch/src/main/java/com/baeldung/taskletsvschunks/tasklets/LinesReader.java
@@ -24,7 +24,7 @@ public class LinesReader implements Tasklet, StepExecutionListener {
 
     @Override
     public void beforeStep(StepExecution stepExecution) {
-        lines = new ArrayList<Line>();
+        lines = new ArrayList<>();
         fu = new FileUtils("taskletsvschunks/input/tasklets-vs-chunks.csv");
         logger.debug("Lines Reader initialized.");
     }
diff --git a/spring-batch/src/main/java/org/baeldung/conditionalflow/ConditionalFlowApplication.java b/spring-batch/src/main/java/org/baeldung/conditionalflow/ConditionalFlowApplication.java
index c977d6ecab..8a8f62ae31 100644
--- a/spring-batch/src/main/java/org/baeldung/conditionalflow/ConditionalFlowApplication.java
+++ b/spring-batch/src/main/java/org/baeldung/conditionalflow/ConditionalFlowApplication.java
@@ -15,7 +15,7 @@ public class ConditionalFlowApplication implements CommandLineRunner {
     }
 
     @Override
-    public void run(String... args) throws Exception {
+    public void run(String... args) {
         logger.info("Running conditional flow application...");
     }
 }
diff --git a/spring-batch/src/main/java/org/baeldung/conditionalflow/config/NumberInfoConfig.java b/spring-batch/src/main/java/org/baeldung/conditionalflow/config/NumberInfoConfig.java
index 906a6e1d28..4954d9ffcd 100644
--- a/spring-batch/src/main/java/org/baeldung/conditionalflow/config/NumberInfoConfig.java
+++ b/spring-batch/src/main/java/org/baeldung/conditionalflow/config/NumberInfoConfig.java
@@ -6,39 +6,49 @@ import org.baeldung.conditionalflow.step.*;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
-import org.springframework.batch.core.configuration.annotation.JobBuilderFactory;
-import org.springframework.batch.core.configuration.annotation.StepBuilderFactory;
+import org.springframework.batch.core.job.builder.JobBuilder;
+import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.launch.support.TaskExecutorJobLauncher;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
+import org.springframework.batch.core.step.builder.StepBuilder;
+import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+import org.springframework.transaction.PlatformTransactionManager;
 
 import static org.baeldung.conditionalflow.NumberInfoDecider.NOTIFY;
 
+import javax.sql.DataSource;
+
 @Configuration
 @EnableBatchProcessing
 public class NumberInfoConfig {
 
     @Bean
     @Qualifier("NotificationStep")
-    public Step notificationStep(StepBuilderFactory sbf) {
-        return sbf.get("Notify step")
-            .tasklet(new NotifierTasklet())
+    public Step notificationStep(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
+        return new StepBuilder("Notify step", jobRepository)
+            .tasklet(new NotifierTasklet(), transactionManager)
             .build();
     }
 
-    public Step numberGeneratorStep(StepBuilderFactory sbf, int[] values, String prepend) {
-        return sbf.get("Number generator")
-            .<NumberInfo, Integer> chunk(1)
+    public Step numberGeneratorStep(JobRepository jobRepositories, PlatformTransactionManager transactionManager, int[] values, String prepend) {
+        return new StepBuilder("Number generator", jobRepositories)
+            .<NumberInfo, Integer> chunk(1, transactionManager)
             .reader(new NumberInfoGenerator(values))
             .processor(new NumberInfoClassifier())
             .writer(new PrependingStdoutWriter<>(prepend))
             .build();
     }
 
-    public Step numberGeneratorStepDecider(StepBuilderFactory sbf, int[] values, String prepend) {
-        return sbf.get("Number generator decider")
-            .<NumberInfo, Integer> chunk(1)
+    public Step numberGeneratorStepDecider(JobRepository jobRepositories, PlatformTransactionManager transactionManager, int[] values, String prepend) {
+        return new StepBuilder("Number generator decider", jobRepositories)
+            .<NumberInfo, Integer> chunk(1, transactionManager)
             .reader(new NumberInfoGenerator(values))
             .processor(new NumberInfoClassifierWithDecider())
             .writer(new PrependingStdoutWriter<>(prepend))
@@ -47,10 +57,10 @@ public class NumberInfoConfig {
 
     @Bean
     @Qualifier("first_job")
-    public Job numberGeneratorNonNotifierJob(JobBuilderFactory jobBuilderFactory, StepBuilderFactory stepBuilderFactory, @Qualifier("NotificationStep") Step notificationStep) {
+    public Job numberGeneratorNonNotifierJob(JobRepository jobRepository, PlatformTransactionManager transactionManager, @Qualifier("NotificationStep") Step notificationStep) {
         int[] nonNotifierData = { -1, -2, -3 };
-        Step step = numberGeneratorStep(stepBuilderFactory, nonNotifierData, "First Dataset Processor");
-        return jobBuilderFactory.get("Number generator - first dataset")
+        Step step = numberGeneratorStep(jobRepository, transactionManager, nonNotifierData, "First Dataset Processor");
+        return new JobBuilder("Number generator - first dataset", jobRepository)
             .start(step)
             .on(NOTIFY)
             .to(notificationStep)
@@ -63,10 +73,10 @@ public class NumberInfoConfig {
 
     @Bean
     @Qualifier("second_job")
-    public Job numberGeneratorNotifierJob(JobBuilderFactory jobBuilderFactory, StepBuilderFactory stepBuilderFactory, @Qualifier("NotificationStep") Step notificationStep) {
+    public Job numberGeneratorNotifierJob(JobRepository jobRepository, PlatformTransactionManager transactionManager, @Qualifier("NotificationStep") Step notificationStep) {
         int[] billableData = { 11, -2, -3 };
-        Step dataProviderStep = numberGeneratorStep(stepBuilderFactory, billableData, "Second Dataset Processor");
-        return jobBuilderFactory.get("Number generator - second dataset")
+        Step dataProviderStep = numberGeneratorStep(jobRepository, transactionManager, billableData, "Second Dataset Processor");
+        return new JobBuilder("Number generator - second dataset", jobRepository)
             .start(dataProviderStep)
             .on(NOTIFY)
             .to(notificationStep)
@@ -77,10 +87,10 @@ public class NumberInfoConfig {
     @Bean
     @Qualifier("third_job")
     @Primary
-    public Job numberGeneratorNotifierJobWithDecider(JobBuilderFactory jobBuilderFactory, StepBuilderFactory stepBuilderFactory, @Qualifier("NotificationStep") Step notificationStep) {
+    public Job numberGeneratorNotifierJobWithDecider(JobRepository jobRepository, PlatformTransactionManager transactionManager, @Qualifier("NotificationStep") Step notificationStep) {
         int[] billableData = { 11, -2, -3 };
-        Step dataProviderStep = numberGeneratorStepDecider(stepBuilderFactory, billableData, "Third Dataset Processor");
-        return jobBuilderFactory.get("Number generator - third dataset")
+        Step dataProviderStep = numberGeneratorStepDecider(jobRepository, transactionManager, billableData, "Third Dataset Processor");
+        return new JobBuilder("Number generator - third dataset", jobRepository)
             .start(dataProviderStep)
             .next(new NumberInfoDecider())
             .on(NOTIFY)
@@ -88,4 +98,39 @@ public class NumberInfoConfig {
             .end()
             .build();
     }
+
+    @Bean(name = "jobRepository")
+    public JobRepository getJobRepository() throws Exception {
+        JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean();
+        factory.setDataSource(dataSource());
+        factory.setTransactionManager(getTransactionManager());
+        // JobRepositoryFactoryBean's methods Throws Generic Exception,
+        // it would have been better to have a specific one
+        factory.afterPropertiesSet();
+        return factory.getObject();
+    }
+
+    @Bean(name = "dataSource")
+    public DataSource dataSource() {
+        EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
+        return builder.setType(EmbeddedDatabaseType.H2)
+                .addScript("classpath:org/springframework/batch/core/schema-drop-h2.sql")
+                .addScript("classpath:org/springframework/batch/core/schema-h2.sql")
+                .build();
+    }
+
+    @Bean(name = "transactionManager")
+    public PlatformTransactionManager getTransactionManager() {
+        return new ResourcelessTransactionManager();
+    }
+
+    @Bean(name = "jobLauncher")
+    public JobLauncher getJobLauncher() throws Exception {
+        TaskExecutorJobLauncher jobLauncher = new TaskExecutorJobLauncher();
+        // SimpleJobLauncher's methods Throws Generic Exception,
+        // it would have been better to have a specific one
+        jobLauncher.setJobRepository(getJobRepository());
+        jobLauncher.afterPropertiesSet();
+        return jobLauncher;
+    }
 }
diff --git a/spring-batch/src/main/java/org/baeldung/conditionalflow/step/NotifierTasklet.java b/spring-batch/src/main/java/org/baeldung/conditionalflow/step/NotifierTasklet.java
index 0d1db66fe9..99ec151cba 100644
--- a/spring-batch/src/main/java/org/baeldung/conditionalflow/step/NotifierTasklet.java
+++ b/spring-batch/src/main/java/org/baeldung/conditionalflow/step/NotifierTasklet.java
@@ -7,9 +7,8 @@ import org.springframework.batch.repeat.RepeatStatus;
 
 public class NotifierTasklet implements Tasklet {
     @Override
-    public RepeatStatus execute(StepContribution stepContribution, ChunkContext chunkContext) throws Exception {
-        System.err.println("[" + chunkContext.getStepContext()
-            .getJobName() + "] contains interesting data!!");
+    public RepeatStatus execute(StepContribution stepContribution, ChunkContext chunkContext) {
+        System.err.println("[" + chunkContext.getStepContext().getJobName() + "] contains interesting data!!");
         return RepeatStatus.FINISHED;
     }
 }
diff --git a/spring-batch/src/main/java/org/baeldung/conditionalflow/step/NumberInfoClassifier.java b/spring-batch/src/main/java/org/baeldung/conditionalflow/step/NumberInfoClassifier.java
index fdb28263e7..71d88e3f0a 100644
--- a/spring-batch/src/main/java/org/baeldung/conditionalflow/step/NumberInfoClassifier.java
+++ b/spring-batch/src/main/java/org/baeldung/conditionalflow/step/NumberInfoClassifier.java
@@ -29,7 +29,7 @@ public class NumberInfoClassifier extends ItemListenerSupport<NumberInfo, Intege
     }
 
     @Override
-    public Integer process(NumberInfo numberInfo) throws Exception {
-        return Integer.valueOf(numberInfo.getNumber());
+    public Integer process(NumberInfo numberInfo) {
+        return numberInfo.getNumber();
     }
 }
diff --git a/spring-batch/src/main/java/org/baeldung/conditionalflow/step/NumberInfoClassifierWithDecider.java b/spring-batch/src/main/java/org/baeldung/conditionalflow/step/NumberInfoClassifierWithDecider.java
index 4a8b7f1963..26a225d715 100644
--- a/spring-batch/src/main/java/org/baeldung/conditionalflow/step/NumberInfoClassifierWithDecider.java
+++ b/spring-batch/src/main/java/org/baeldung/conditionalflow/step/NumberInfoClassifierWithDecider.java
@@ -7,7 +7,7 @@ import org.springframework.batch.item.ItemProcessor;
 public class NumberInfoClassifierWithDecider extends ItemListenerSupport<NumberInfo, Integer> implements ItemProcessor<NumberInfo, Integer> {
 
     @Override
-    public Integer process(NumberInfo numberInfo) throws Exception {
+    public Integer process(NumberInfo numberInfo) {
         return Integer.valueOf(numberInfo.getNumber());
     }
 }
diff --git a/spring-batch/src/main/java/org/baeldung/conditionalflow/step/PrependingStdoutWriter.java b/spring-batch/src/main/java/org/baeldung/conditionalflow/step/PrependingStdoutWriter.java
index 9ffea1e798..abadb78e93 100644
--- a/spring-batch/src/main/java/org/baeldung/conditionalflow/step/PrependingStdoutWriter.java
+++ b/spring-batch/src/main/java/org/baeldung/conditionalflow/step/PrependingStdoutWriter.java
@@ -1,7 +1,6 @@
 package org.baeldung.conditionalflow.step;
 
-import java.util.List;
-
+import org.springframework.batch.item.Chunk;
 import org.springframework.batch.item.ItemWriter;
 
 public class PrependingStdoutWriter<T> implements ItemWriter<T> {
@@ -12,8 +11,8 @@ public class PrependingStdoutWriter<T> implements ItemWriter<T> {
     }
 
     @Override
-    public void write(List<? extends T> list) {
-        for (T listItem : list) {
+    public void write(Chunk<? extends T> chunk) {
+        for (T listItem : chunk) {
             System.out.println(prependText + " " + listItem.toString());
         }
     }
diff --git a/spring-batch/src/main/resources/output/output1.xml b/spring-batch/src/main/resources/output/output1.xml
index 838d04882a..78bc7349e8 100644
--- a/spring-batch/src/main/resources/output/output1.xml
+++ b/spring-batch/src/main/resources/output/output1.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <transactionRecord>
-	<transactionRecord>
-		<amount>10000.0</amount>
-		<transactionDate>2015-10-31 00:00:00</transactionDate>
-		<userId>1234</userId>
-		<username>devendra</username>
-	</transactionRecord>
-	<transactionRecord>
-		<amount>12321.0</amount>
-		<transactionDate>2015-12-03 00:00:00</transactionDate>
-		<userId>2134</userId>
-		<username>john</username>
-	</transactionRecord>
-	<transactionRecord>
-		<amount>23411.0</amount>
-		<transactionDate>2015-02-02 00:00:00</transactionDate>
-		<userId>2134</userId>
-		<username>robin</username>
-	</transactionRecord>
+    <transactionRecord>
+        <amount>10000.0</amount>
+        <transactionDate>2015-10-31 00:00:00</transactionDate>
+        <userId>1234</userId>
+        <username>devendra</username>
+    </transactionRecord>
+    <transactionRecord>
+        <amount>12321.0</amount>
+        <transactionDate>2015-12-03 00:00:00</transactionDate>
+        <userId>2134</userId>
+        <username>john</username>
+    </transactionRecord>
+    <transactionRecord>
+        <amount>23411.0</amount>
+        <transactionDate>2015-02-02 00:00:00</transactionDate>
+        <userId>2134</userId>
+        <username>robin</username>
+    </transactionRecord>
 </transactionRecord>
\ No newline at end of file
diff --git a/spring-batch/src/main/resources/output/output2.xml b/spring-batch/src/main/resources/output/output2.xml
index 838d04882a..78bc7349e8 100644
--- a/spring-batch/src/main/resources/output/output2.xml
+++ b/spring-batch/src/main/resources/output/output2.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <transactionRecord>
-	<transactionRecord>
-		<amount>10000.0</amount>
-		<transactionDate>2015-10-31 00:00:00</transactionDate>
-		<userId>1234</userId>
-		<username>devendra</username>
-	</transactionRecord>
-	<transactionRecord>
-		<amount>12321.0</amount>
-		<transactionDate>2015-12-03 00:00:00</transactionDate>
-		<userId>2134</userId>
-		<username>john</username>
-	</transactionRecord>
-	<transactionRecord>
-		<amount>23411.0</amount>
-		<transactionDate>2015-02-02 00:00:00</transactionDate>
-		<userId>2134</userId>
-		<username>robin</username>
-	</transactionRecord>
+    <transactionRecord>
+        <amount>10000.0</amount>
+        <transactionDate>2015-10-31 00:00:00</transactionDate>
+        <userId>1234</userId>
+        <username>devendra</username>
+    </transactionRecord>
+    <transactionRecord>
+        <amount>12321.0</amount>
+        <transactionDate>2015-12-03 00:00:00</transactionDate>
+        <userId>2134</userId>
+        <username>john</username>
+    </transactionRecord>
+    <transactionRecord>
+        <amount>23411.0</amount>
+        <transactionDate>2015-02-02 00:00:00</transactionDate>
+        <userId>2134</userId>
+        <username>robin</username>
+    </transactionRecord>
 </transactionRecord>
\ No newline at end of file
diff --git a/spring-batch/src/main/resources/output/output3.xml b/spring-batch/src/main/resources/output/output3.xml
index 838d04882a..78bc7349e8 100644
--- a/spring-batch/src/main/resources/output/output3.xml
+++ b/spring-batch/src/main/resources/output/output3.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <transactionRecord>
-	<transactionRecord>
-		<amount>10000.0</amount>
-		<transactionDate>2015-10-31 00:00:00</transactionDate>
-		<userId>1234</userId>
-		<username>devendra</username>
-	</transactionRecord>
-	<transactionRecord>
-		<amount>12321.0</amount>
-		<transactionDate>2015-12-03 00:00:00</transactionDate>
-		<userId>2134</userId>
-		<username>john</username>
-	</transactionRecord>
-	<transactionRecord>
-		<amount>23411.0</amount>
-		<transactionDate>2015-02-02 00:00:00</transactionDate>
-		<userId>2134</userId>
-		<username>robin</username>
-	</transactionRecord>
+    <transactionRecord>
+        <amount>10000.0</amount>
+        <transactionDate>2015-10-31 00:00:00</transactionDate>
+        <userId>1234</userId>
+        <username>devendra</username>
+    </transactionRecord>
+    <transactionRecord>
+        <amount>12321.0</amount>
+        <transactionDate>2015-12-03 00:00:00</transactionDate>
+        <userId>2134</userId>
+        <username>john</username>
+    </transactionRecord>
+    <transactionRecord>
+        <amount>23411.0</amount>
+        <transactionDate>2015-02-02 00:00:00</transactionDate>
+        <userId>2134</userId>
+        <username>robin</username>
+    </transactionRecord>
 </transactionRecord>
\ No newline at end of file
diff --git a/spring-batch/src/main/resources/output/output4.xml b/spring-batch/src/main/resources/output/output4.xml
index 838d04882a..78bc7349e8 100644
--- a/spring-batch/src/main/resources/output/output4.xml
+++ b/spring-batch/src/main/resources/output/output4.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <transactionRecord>
-	<transactionRecord>
-		<amount>10000.0</amount>
-		<transactionDate>2015-10-31 00:00:00</transactionDate>
-		<userId>1234</userId>
-		<username>devendra</username>
-	</transactionRecord>
-	<transactionRecord>
-		<amount>12321.0</amount>
-		<transactionDate>2015-12-03 00:00:00</transactionDate>
-		<userId>2134</userId>
-		<username>john</username>
-	</transactionRecord>
-	<transactionRecord>
-		<amount>23411.0</amount>
-		<transactionDate>2015-02-02 00:00:00</transactionDate>
-		<userId>2134</userId>
-		<username>robin</username>
-	</transactionRecord>
+    <transactionRecord>
+        <amount>10000.0</amount>
+        <transactionDate>2015-10-31 00:00:00</transactionDate>
+        <userId>1234</userId>
+        <username>devendra</username>
+    </transactionRecord>
+    <transactionRecord>
+        <amount>12321.0</amount>
+        <transactionDate>2015-12-03 00:00:00</transactionDate>
+        <userId>2134</userId>
+        <username>john</username>
+    </transactionRecord>
+    <transactionRecord>
+        <amount>23411.0</amount>
+        <transactionDate>2015-02-02 00:00:00</transactionDate>
+        <userId>2134</userId>
+        <username>robin</username>
+    </transactionRecord>
 </transactionRecord>
\ No newline at end of file
diff --git a/spring-batch/src/main/resources/output/output5.xml b/spring-batch/src/main/resources/output/output5.xml
index 838d04882a..78bc7349e8 100644
--- a/spring-batch/src/main/resources/output/output5.xml
+++ b/spring-batch/src/main/resources/output/output5.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <transactionRecord>
-	<transactionRecord>
-		<amount>10000.0</amount>
-		<transactionDate>2015-10-31 00:00:00</transactionDate>
-		<userId>1234</userId>
-		<username>devendra</username>
-	</transactionRecord>
-	<transactionRecord>
-		<amount>12321.0</amount>
-		<transactionDate>2015-12-03 00:00:00</transactionDate>
-		<userId>2134</userId>
-		<username>john</username>
-	</transactionRecord>
-	<transactionRecord>
-		<amount>23411.0</amount>
-		<transactionDate>2015-02-02 00:00:00</transactionDate>
-		<userId>2134</userId>
-		<username>robin</username>
-	</transactionRecord>
+    <transactionRecord>
+        <amount>10000.0</amount>
+        <transactionDate>2015-10-31 00:00:00</transactionDate>
+        <userId>1234</userId>
+        <username>devendra</username>
+    </transactionRecord>
+    <transactionRecord>
+        <amount>12321.0</amount>
+        <transactionDate>2015-12-03 00:00:00</transactionDate>
+        <userId>2134</userId>
+        <username>john</username>
+    </transactionRecord>
+    <transactionRecord>
+        <amount>23411.0</amount>
+        <transactionDate>2015-02-02 00:00:00</transactionDate>
+        <userId>2134</userId>
+        <username>robin</username>
+    </transactionRecord>
 </transactionRecord>
\ No newline at end of file
diff --git a/spring-batch/src/main/resources/spring-batch-intro.xml b/spring-batch/src/main/resources/spring-batch-intro.xml
index 2a7c1e7c4a..bb11ea0efd 100644
--- a/spring-batch/src/main/resources/spring-batch-intro.xml
+++ b/spring-batch/src/main/resources/spring-batch-intro.xml
@@ -17,7 +17,7 @@
                     <bean
                         class="org.springframework.batch.item.file.transform.DelimitedLineTokenizer">
                         <property name="names"
-                            value="username,userid,transaction_date,transaction_amount" />
+                            value="username,userid,transactiondate,amount" />
                     </bean>
                 </property>
                 <property name="fieldSetMapper">
@@ -33,11 +33,11 @@
 
     <bean id="itemWriter" class="org.springframework.batch.item.xml.StaxEventItemWriter">
         <property name="resource" value="file:xml/output.xml" />
-        <property name="marshaller" ref="recordMarshaller" />
+        <property name="marshaller" ref="marshaller" />
         <property name="rootTagName" value="transactionRecord" />
     </bean>
 
-    <bean id="recordMarshaller" class="org.springframework.oxm.jaxb.Jaxb2Marshaller">
+    <bean id="marshaller" class="org.springframework.oxm.jaxb.Jaxb2Marshaller">
         <property name="classesToBeBound">
             <list>
                 <value>com.baeldung.batch.model.Transaction</value>
diff --git a/spring-batch/src/main/resources/spring.xml b/spring-batch/src/main/resources/spring.xml
index dea261c5e6..fc7e867941 100644
--- a/spring-batch/src/main/resources/spring.xml
+++ b/spring-batch/src/main/resources/spring.xml
@@ -9,8 +9,8 @@
     <!-- connect to SQLite database -->
     <bean id="dataSource"
         class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-        <property name="driverClassName" value="org.sqlite.JDBC" />
-        <property name="url" value="jdbc:sqlite:repository.sqlite" />
+        <property name="driverClassName" value="org.h2.Driver" />
+        <property name="url" value="jdbc:h2:repository.sqlite" />
         <property name="username" value="" />
         <property name="password" value="" />
     </bean>
@@ -18,8 +18,8 @@
     <!-- create job-meta tables automatically -->
     <jdbc:initialize-database data-source="dataSource">
         <jdbc:script
-            location="org/springframework/batch/core/schema-drop-sqlite.sql" />
-        <jdbc:script location="org/springframework/batch/core/schema-sqlite.sql" />
+            location="org/springframework/batch/core/schema-drop-h2.sql" />
+        <jdbc:script location="org/springframework/batch/core/schema-h2.sql" />
     </jdbc:initialize-database>
 
     <!-- stored job-meta in memory -->
@@ -31,7 +31,6 @@
         class="org.springframework.batch.core.repository.support.JobRepositoryFactoryBean">
         <property name="dataSource" ref="dataSource" />
         <property name="transactionManager" ref="transactionManager" />
-        <property name="databaseType" value="sqlite" />
     </bean>
 
     <bean id="transactionManager"
diff --git a/spring-batch/src/test/java/com/baeldung/batch/SpringBatchRetryIntegrationTest.java b/spring-batch/src/test/java/com/baeldung/batch/SpringBatchRetryIntegrationTest.java
index df9154a765..a9422d59fc 100644
--- a/spring-batch/src/test/java/com/baeldung/batch/SpringBatchRetryIntegrationTest.java
+++ b/spring-batch/src/test/java/com/baeldung/batch/SpringBatchRetryIntegrationTest.java
@@ -1,19 +1,16 @@
 package com.baeldung.batch;
 
-import com.baeldung.batch.SpringBatchRetryConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobInstance;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.test.AssertFile;
 import org.springframework.batch.test.JobLauncherTestUtils;
 import org.springframework.batch.test.context.SpringBatchTest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,15 +18,15 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
+import static org.springframework.batch.test.AssertFile.assertFileEquals;
+
 
-@RunWith(SpringRunner.class)
 @SpringBatchTest
 @EnableAutoConfiguration
 @ContextConfiguration(classes = { SpringBatchRetryConfig.class })
@@ -56,8 +53,8 @@ public class SpringBatchRetryIntegrationTest {
         JobInstance actualJobInstance = jobExecution.getJobInstance();
         ExitStatus actualJobExitStatus = jobExecution.getExitStatus();
 
-        assertThat(actualJobInstance.getJobName(), is("retryBatchJob"));
-        assertThat(actualJobExitStatus.getExitCode(), is("FAILED"));
+        assertEquals("retryBatchJob", actualJobInstance.getJobName());
+        assertEquals("FAILED", actualJobExitStatus.getExitCode());
         assertThat(actualJobExitStatus.getExitDescription(), containsString("org.apache.http.conn.ConnectTimeoutException"));
     }
 
@@ -78,11 +75,11 @@ public class SpringBatchRetryIntegrationTest {
         JobInstance actualJobInstance = jobExecution.getJobInstance();
         ExitStatus actualJobExitStatus = jobExecution.getExitStatus();
 
-        assertThat(actualJobInstance.getJobName(), is("retryBatchJob"));
-        assertThat(actualJobExitStatus.getExitCode(), is("COMPLETED"));
-        AssertFile.assertFileEquals(expectedResult, actualResult);
+        assertEquals("retryBatchJob", actualJobInstance.getJobName());
+        assertEquals("COMPLETED", actualJobExitStatus.getExitCode());
+        assertFileEquals(expectedResult, actualResult);
     }
-    
+
     private JobParameters defaultJobParameters() {
         JobParametersBuilder paramsBuilder = new JobParametersBuilder();
         paramsBuilder.addString("jobID", String.valueOf(System.currentTimeMillis()));
diff --git a/spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchIntegrationTest.java b/spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchIntegrationTest.java
index 333c69684e..318bab1fb5 100644
--- a/spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchIntegrationTest.java
+++ b/spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchIntegrationTest.java
@@ -1,14 +1,11 @@
 package com.baeldung.batchtesting;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Collection;
 
-import com.baeldung.batchtesting.SpringBatchConfiguration;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobInstance;
@@ -22,20 +19,11 @@ import org.springframework.batch.test.context.SpringBatchTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.core.io.FileSystemResource;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestExecutionListeners;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
-import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
 
-@RunWith(SpringRunner.class)
 @SpringBatchTest
 @EnableAutoConfiguration
 @ContextConfiguration(classes = { SpringBatchConfiguration.class })
-@TestExecutionListeners({ DependencyInjectionTestExecutionListener.class, DirtiesContextTestExecutionListener.class })
-@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
 public class SpringBatchIntegrationTest {
 
     private static final String TEST_OUTPUT = "src/test/resources/output/actual-output.json";
@@ -50,7 +38,7 @@ public class SpringBatchIntegrationTest {
     @Autowired
     private JobRepositoryTestUtils jobRepositoryTestUtils;
 
-    @After
+    @AfterEach
     public void cleanUp() {
         jobRepositoryTestUtils.removeJobExecutions();
     }
@@ -74,8 +62,8 @@ public class SpringBatchIntegrationTest {
         ExitStatus actualJobExitStatus = jobExecution.getExitStatus();
 
         // then
-        assertThat(actualJobInstance.getJobName(), is("transformBooksRecords"));
-        assertThat(actualJobExitStatus.getExitCode(), is("COMPLETED"));
+        assertEquals("transformBooksRecords", actualJobInstance.getJobName());
+        assertEquals("COMPLETED", actualJobExitStatus.getExitCode());
         AssertFile.assertFileEquals(expectedResult, actualResult);
     }
 
@@ -92,8 +80,8 @@ public class SpringBatchIntegrationTest {
         ExitStatus actualJobExitStatus = jobExecution.getExitStatus();
 
         // then
-        assertThat(actualStepExecutions.size(), is(1));
-        assertThat(actualJobExitStatus.getExitCode(), is("COMPLETED"));
+        assertEquals(1, actualStepExecutions.size());
+        assertEquals("COMPLETED", actualJobExitStatus.getExitCode());
         AssertFile.assertFileEquals(expectedResult, actualResult);
     }
 
@@ -106,10 +94,10 @@ public class SpringBatchIntegrationTest {
         ExitStatus actualExitStatus = jobExecution.getExitStatus();
 
         // then
-        assertThat(actualStepExecutions.size(), is(1));
-        assertThat(actualExitStatus.getExitCode(), is("COMPLETED"));
+        assertEquals(1, actualStepExecutions.size());
+        assertEquals("COMPLETED", actualExitStatus.getExitCode());
         actualStepExecutions.forEach(stepExecution -> {
-            assertThat(stepExecution.getWriteCount(), is(8));
+            assertEquals(8L, stepExecution.getWriteCount());
         });
     }
 
diff --git a/spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java b/spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java
index 4655117b85..311bd828cb 100644
--- a/spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java
+++ b/spring-batch/src/test/java/com/baeldung/batchtesting/SpringBatchStepScopeIntegrationTest.java
@@ -1,22 +1,21 @@
 package com.baeldung.batchtesting;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.springframework.batch.test.AssertFile.assertFileEquals;
 
-import java.util.Arrays;
+import java.util.List;
 
-import com.baeldung.batchtesting.SpringBatchConfiguration;
 import com.baeldung.batchtesting.model.Book;
 import com.baeldung.batchtesting.model.BookRecord;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.JobParametersBuilder;
 import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.item.Chunk;
 import org.springframework.batch.item.file.FlatFileItemReader;
 import org.springframework.batch.item.json.JsonFileItemWriter;
-import org.springframework.batch.test.AssertFile;
 import org.springframework.batch.test.JobRepositoryTestUtils;
 import org.springframework.batch.test.MetaDataInstanceFactory;
 import org.springframework.batch.test.StepScopeTestUtils;
@@ -24,21 +23,12 @@ import org.springframework.batch.test.context.SpringBatchTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.core.io.FileSystemResource;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestExecutionListeners;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
-import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
 
 
-@RunWith(SpringRunner.class)
 @SpringBatchTest
 @EnableAutoConfiguration
 @ContextConfiguration(classes = { SpringBatchConfiguration.class })
-@TestExecutionListeners({ DependencyInjectionTestExecutionListener.class, DirtiesContextTestExecutionListener.class })
-@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
 public class SpringBatchStepScopeIntegrationTest {
 
     private static final String TEST_OUTPUT = "src/test/resources/output/actual-output.json";
@@ -62,7 +52,7 @@ public class SpringBatchStepScopeIntegrationTest {
         return paramsBuilder.toJobParameters();
     }
 
-    @After
+    @AfterEach
     public void cleanUp() {
         jobRepositoryTestUtils.removeJobExecutions();
     }
@@ -80,11 +70,11 @@ public class SpringBatchStepScopeIntegrationTest {
             while ((bookRecord = itemReader.read()) != null) {
 
                 // then
-                assertThat(bookRecord.getBookName(), is("Foundation"));
-                assertThat(bookRecord.getBookAuthor(), is("Asimov I."));
-                assertThat(bookRecord.getBookISBN(), is("ISBN 12839"));
-                assertThat(bookRecord.getBookFormat(), is("hardcover"));
-                assertThat(bookRecord.getPublishingYear(), is("2018"));
+                assertEquals("Foundation", bookRecord.getBookName());
+                assertEquals("Asimov I.", bookRecord.getBookAuthor());
+                assertEquals("ISBN 12839", bookRecord.getBookISBN());
+                assertEquals("hardcover", bookRecord.getBookFormat());
+                assertEquals("2018", bookRecord.getPublishingYear());
             }
             itemReader.close();
             return null;
@@ -106,12 +96,12 @@ public class SpringBatchStepScopeIntegrationTest {
         StepScopeTestUtils.doInStepScope(stepExecution, () -> {
 
             jsonItemWriter.open(stepExecution.getExecutionContext());
-            jsonItemWriter.write(Arrays.asList(demoBook));
+            jsonItemWriter.write(new Chunk<>(List.of(demoBook)));
             jsonItemWriter.close();
             return null;
         });
 
         // then
-        AssertFile.assertFileEquals(expectedResult, actualResult);
+        assertFileEquals(expectedResult, actualResult);
     }
 }
diff --git a/spring-batch/src/test/java/com/baeldung/taskletsvschunks/chunks/ChunksIntegrationTest.java b/spring-batch/src/test/java/com/baeldung/taskletsvschunks/chunks/ChunksIntegrationTest.java
index 1132e4d5e2..109342076b 100644
--- a/spring-batch/src/test/java/com/baeldung/taskletsvschunks/chunks/ChunksIntegrationTest.java
+++ b/spring-batch/src/test/java/com/baeldung/taskletsvschunks/chunks/ChunksIntegrationTest.java
@@ -1,25 +1,29 @@
 package com.baeldung.taskletsvschunks.chunks;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import com.baeldung.taskletsvschunks.config.ChunksConfig;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+import org.junit.jupiter.api.Test;
 import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.context.SpringBatchTest;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes  = ChunksConfig.class)
+@SpringBatchTest
+@EnableAutoConfiguration
+@ContextConfiguration(classes = ChunksConfig.class)
 public class ChunksIntegrationTest {
 
-    @Autowired private JobLauncherTestUtils jobLauncherTestUtils;
+    @Autowired
+    private JobLauncherTestUtils jobLauncherTestUtils;
 
     @Test
     public void givenChunksJob_WhenJobEnds_ThenStatusCompleted() throws Exception {
         JobExecution jobExecution = jobLauncherTestUtils.launchJob();
-        Assert.assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
+        assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
     }
 }
\ No newline at end of file
diff --git a/spring-batch/src/test/java/com/baeldung/taskletsvschunks/tasklets/TaskletsIntegrationTest.java b/spring-batch/src/test/java/com/baeldung/taskletsvschunks/tasklets/TaskletsIntegrationTest.java
index 2e1ad031aa..103b1a2096 100644
--- a/spring-batch/src/test/java/com/baeldung/taskletsvschunks/tasklets/TaskletsIntegrationTest.java
+++ b/spring-batch/src/test/java/com/baeldung/taskletsvschunks/tasklets/TaskletsIntegrationTest.java
@@ -1,25 +1,29 @@
 package com.baeldung.taskletsvschunks.tasklets;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import com.baeldung.taskletsvschunks.config.TaskletsConfig;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+import org.junit.jupiter.api.Test;
 import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.test.JobLauncherTestUtils;
+import org.springframework.batch.test.context.SpringBatchTest;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBatchTest
+@EnableAutoConfiguration
 @ContextConfiguration(classes = TaskletsConfig.class)
 public class TaskletsIntegrationTest {
 
-    @Autowired private JobLauncherTestUtils jobLauncherTestUtils;
+    @Autowired
+    private JobLauncherTestUtils jobLauncherTestUtils;
 
     @Test
     public void givenTaskletsJob_WhenJobEnds_ThenStatusCompleted() throws Exception {
         JobExecution jobExecution = jobLauncherTestUtils.launchJob();
-        Assert.assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
+        assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
     }
 }
\ No newline at end of file
diff --git a/spring-batch/src/test/java/org/baeldung/conditionalflow/DeciderJobIntegrationTest.java b/spring-batch/src/test/java/org/baeldung/conditionalflow/DeciderJobIntegrationTest.java
index e73cb17494..a50ad0455c 100644
--- a/spring-batch/src/test/java/org/baeldung/conditionalflow/DeciderJobIntegrationTest.java
+++ b/spring-batch/src/test/java/org/baeldung/conditionalflow/DeciderJobIntegrationTest.java
@@ -1,8 +1,10 @@
 package org.baeldung.conditionalflow;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.baeldung.conditionalflow.config.NumberInfoConfig;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.StepExecution;
@@ -10,26 +12,16 @@ import org.springframework.batch.test.JobLauncherTestUtils;
 import org.springframework.batch.test.context.SpringBatchTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestExecutionListeners;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
-import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
 
 import java.util.Collection;
 import java.util.Iterator;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-@RunWith(SpringRunner.class)
 @SpringBatchTest
 @EnableAutoConfiguration
 @ContextConfiguration(classes = { NumberInfoConfig.class })
-@TestExecutionListeners({ DependencyInjectionTestExecutionListener.class, DirtiesContextTestExecutionListener.class })
-@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 public class DeciderJobIntegrationTest {
+
     @Autowired
     private JobLauncherTestUtils jobLauncherTestUtils;
 
@@ -39,8 +31,7 @@ public class DeciderJobIntegrationTest {
         Collection<StepExecution> actualStepExecutions = jobExecution.getStepExecutions();
         ExitStatus actualJobExitStatus = jobExecution.getExitStatus();
 
-        assertEquals("COMPLETED", actualJobExitStatus.getExitCode()
-            .toString());
+        assertEquals("COMPLETED", actualJobExitStatus.getExitCode());
         assertEquals(2, actualStepExecutions.size());
         boolean notifyStepDidRun = false;
         Iterator<StepExecution> iterator = actualStepExecutions.iterator();
diff --git a/spring-batch/src/test/java/org/baeldung/conditionalflow/model/NumberInfoUnitTest.java b/spring-batch/src/test/java/org/baeldung/conditionalflow/model/NumberInfoUnitTest.java
index dc396b38da..bdecee5621 100644
--- a/spring-batch/src/test/java/org/baeldung/conditionalflow/model/NumberInfoUnitTest.java
+++ b/spring-batch/src/test/java/org/baeldung/conditionalflow/model/NumberInfoUnitTest.java
@@ -5,10 +5,10 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 class NumberInfoUnitTest {
 
     @Test
diff --git a/spring-batch/src/test/resources/output/actual-output.json b/spring-batch/src/test/resources/output/actual-output.json
index 1fd6cfcf37..32ad8b7ead 100644
--- a/spring-batch/src/test/resources/output/actual-output.json
+++ b/spring-batch/src/test/resources/output/actual-output.json
@@ -1,3 +1,10 @@
 [
- {"author":"Grisham J.","name":"The Firm"}
+ {"author":"Asimov I.","name":"Foundation"},
+ {"author":"Strugatski A.","name":"Roadside Picnic"},
+ {"author":"Murakami H.","name":"Norwegian Wood"},
+ {"author":"Brown D.","name":"Davinci Code"},
+ {"author":"Dick K. P.","name":"Ubik"},
+ {"author":"King S.","name":"JFK"},
+ {"author":"Sagan C.","name":"Contact"},
+ {"author":"Huxley A.","name":"Brave New World"}
 ]
diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index 3ed9eea431..2fe146e065 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -63,10 +63,6 @@
         <module>spring-boot-nashorn</module>
         <module>spring-boot-parent</module>
         <module>spring-boot-performance</module>
-        <module>spring-boot-properties</module>
-        <module>spring-boot-properties-2</module>
-        <module>spring-boot-properties-3</module>
-        <module>spring-boot-properties-migrator-demo</module>
         <module>spring-boot-property-exp</module>
         <module>spring-boot-request-params</module>
         <module>spring-boot-runtime</module>
@@ -84,6 +80,20 @@
         <module>spring-boot-data-2</module>
         <module>spring-boot-validation</module>
         <module>spring-boot-data-3</module>
+		<module>spring-caching</module>
+        <module>spring-caching-2</module>
+        <module>spring-boot-redis</module>
+        <module>spring-boot-cassandre</module>
+        <module>spring-boot-react</module>
+        <!-- <module>spring-boot-3</module> --> <!-- JAVA-20931 -->
+        <module>spring-boot-3-native</module>
+        <module>spring-boot-3-observation</module>
+        <module>spring-boot-3-test-pitfalls</module>
+        <module>spring-boot-resilience4j</module>
+        <module>spring-boot-properties</module>
+        <module>spring-boot-properties-2</module>
+        <module>spring-boot-properties-3</module>
+        <module>spring-boot-properties-migrator-demo</module>
     </modules>
 
     <dependencyManagement>
@@ -105,4 +115,8 @@
         </dependencies>
     </dependencyManagement>
 
-</project>
\ No newline at end of file
+    <properties>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
+    </properties>
+
+</project>
diff --git a/spring-boot-modules/spring-boot-3-native/pom.xml b/spring-boot-modules/spring-boot-3-native/pom.xml
index 5382b8413c..1e93c3d8ed 100644
--- a/spring-boot-modules/spring-boot-3-native/pom.xml
+++ b/spring-boot-modules/spring-boot-3-native/pom.xml
@@ -56,10 +56,15 @@
                          <configuration>
                              <jvmArguments> -agentlib:native-image-agent=config-output-dir=target/native-image
                              </jvmArguments>
-                             <systemPropertyVariables>
-                                 <springAot>true</springAot>
-                             </systemPropertyVariables>
                          </configuration>
+						 <executions>
+							 <execution>
+								 <id>process-aot</id>
+								 <goals>
+									 <goal>process-aot</goal>
+								 </goals>
+							 </execution>
+						 </executions>
                      </plugin>  -->
                  </plugins>
              </pluginManagement>
diff --git a/spring-boot-modules/spring-boot-3-observation/pom.xml b/spring-boot-modules/spring-boot-3-observation/pom.xml
index ed613ee98e..ddd81e3ca4 100644
--- a/spring-boot-modules/spring-boot-3-observation/pom.xml
+++ b/spring-boot-modules/spring-boot-3-observation/pom.xml
@@ -54,6 +54,25 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+        <!-- get latest version from https://github.com/gavlyukovskiy/spring-boot-data-source-decorator/releases-->
+        <dependency>
+            <groupId>com.github.gavlyukovskiy</groupId>
+            <artifactId>p6spy-spring-boot-starter</artifactId>
+            <version>1.9.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
@@ -63,4 +82,8 @@
 
     </dependencies>
 
+    <properties>
+        <start-class>com.baeldung.samples.SimpleObservationApplication</start-class>
+    </properties>
+
 </project>
diff --git a/spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/p6spy/SampleP6SpyApplication.java b/spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/p6spy/SampleP6SpyApplication.java
new file mode 100644
index 0000000000..000ffea9c9
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/p6spy/SampleP6SpyApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.p6spy;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SampleP6SpyApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SampleP6SpyApplication.class, args);
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/p6spy/controllers/JDBCController.java b/spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/p6spy/controllers/JDBCController.java
new file mode 100644
index 0000000000..d09e839165
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/p6spy/controllers/JDBCController.java
@@ -0,0 +1,54 @@
+package com.baeldung.p6spy.controllers;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("jdbc")
+public class JDBCController {
+
+    @Autowired
+    private DataSource dataSource;
+
+    @RequestMapping("/commit")
+    public List<Map<String, String>> select() {
+        List<Map<String, String>> results = new ArrayList<>();
+        try {
+            Connection connection = dataSource.getConnection();
+            Statement statement = connection.createStatement();
+            statement.executeQuery("SELECT * FROM student");
+            connection.commit();
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+        return results;
+    }
+
+    @RequestMapping("/rollback")
+    public List<Map<String, String>> rollback() {
+        List<Map<String, String>> results = new ArrayList<>();
+        try (Connection connection = dataSource.getConnection()) {
+            connection.rollback();
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+        return results;
+    }
+
+    @RequestMapping("/query-error")
+    public void error() {
+        try (Connection connection = dataSource.getConnection();
+             Statement statement = connection.createStatement()) {
+            statement.execute("SELECT UNDEFINED()");
+        } catch (Exception ignored) {
+        }
+    }
+}
diff --git a/spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/p6spy/controllers/StudentController.java b/spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/p6spy/controllers/StudentController.java
new file mode 100644
index 0000000000..d60fd8b52e
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/p6spy/controllers/StudentController.java
@@ -0,0 +1,29 @@
+package com.baeldung.p6spy.controllers;
+
+import com.baeldung.p6spy.repository.Student;
+import com.baeldung.p6spy.repository.StudentRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("student")
+public class StudentController {
+
+    @Autowired
+    private StudentRepository repository;
+
+    @RequestMapping("/save")
+    public Long save() {
+        return repository.save(new Student("Pablo", "Picasso")).getId();
+    }
+
+    @RequestMapping("/find/{name}")
+    public List<Student> getAll(@PathVariable String name) {
+        return repository.findAllByFirstName(name);
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/p6spy/repository/Student.java b/spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/p6spy/repository/Student.java
new file mode 100644
index 0000000000..881f9409b8
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/p6spy/repository/Student.java
@@ -0,0 +1,53 @@
+package com.baeldung.p6spy.repository;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+
+@Entity
+public class Student {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    private String firstName;
+    private String lastName;
+
+    public Student() {
+    }
+
+    public Student(String firstName, String lastName) {
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    @Override
+    public String toString() {
+        return "Student{" + "id=" + id + ", firstName='" + firstName + '\'' + ", lastName='" + lastName + '\'' + '}';
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/p6spy/repository/StudentRepository.java b/spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/p6spy/repository/StudentRepository.java
new file mode 100644
index 0000000000..90d2c22877
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/p6spy/repository/StudentRepository.java
@@ -0,0 +1,11 @@
+package com.baeldung.p6spy.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface StudentRepository extends JpaRepository<Student, Long> {
+    List<Student> findAllByFirstName(String firstName);
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3-observation/src/main/resources/spy.properties b/spring-boot-modules/spring-boot-3-observation/src/main/resources/spy.properties
new file mode 100644
index 0000000000..c14d381836
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-observation/src/main/resources/spy.properties
@@ -0,0 +1,36 @@
+# specifies the appender to use for logging
+# Please note: reload means forgetting all the previously set
+# settings (even those set during runtime - via JMX)
+# and starting with the clean table
+# (only the properties read from the configuration file)
+# (default is com.p6spy.engine.spy.appender.FileLogger)
+#appender=com.p6spy.engine.spy.appender.Slf4JLogger
+#appender=com.p6spy.engine.spy.appender.StdoutLogger
+appender=com.p6spy.engine.spy.appender.FileLogger
+
+# name of logfile to use, note Windows users should make sure to use forward slashes in their pathname (e:/test/spy.log)
+# (used for com.p6spy.engine.spy.appender.FileLogger only)
+# (default is spy.log)
+logfile=database.log
+
+# append to the p6spy log file. if this is set to false the
+# log file is truncated every time. (file logger only)
+# (default is true)
+append=true
+
+# class to use for formatting log messages (default is: com.p6spy.engine.spy.appender.SingleLineFormat)
+logMessageFormat=com.p6spy.engine.spy.appender.CustomLineFormat
+
+# Custom log message format used ONLY IF logMessageFormat is set to com.p6spy.engine.spy.appender.CustomLineFormat
+# default is %(currentTime)|%(executionTime)|%(category)|connection%(connectionId)|%(sqlSingleLine)
+# Available placeholders are:
+#   %(connectionId)            the id of the connection
+#   %(currentTime)             the current time expressing in milliseconds
+#   %(executionTime)           the time in milliseconds that the operation took to complete
+#   %(category)                the category of the operation
+#   %(effectiveSql)            the SQL statement as submitted to the driver
+#   %(effectiveSqlSingleLine)  the SQL statement as submitted to the driver, with all new lines removed
+#   %(sql)                     the SQL statement with all bind variables replaced with actual values
+#   %(sqlSingleLine)           the SQL statement with all bind variables replaced with actual values, with all new lines removed
+customLogMessageFormat=%(currentTime)|%(executionTime)|%(category)|%(sqlSingleLine)
+
diff --git a/spring-boot-modules/spring-boot-3-observation/src/test/java/com/baeldung/p6spy/JDBCControllerIntegrationTest.java b/spring-boot-modules/spring-boot-3-observation/src/test/java/com/baeldung/p6spy/JDBCControllerIntegrationTest.java
new file mode 100644
index 0000000000..433641fcb0
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-observation/src/test/java/com/baeldung/p6spy/JDBCControllerIntegrationTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.baeldung.p6spy;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.web.client.RestTemplate;
+
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
+class JDBCControllerIntegrationTest {
+
+    private final RestTemplate restTemplate = new RestTemplate();
+    @Value("http://localhost:${local.server.port}/jdbc")
+    private String localhost;
+
+    @Test
+    void testJdbcCommitRESTMethod_isSuccessful() {
+        Assertions.assertTrue(restTemplate.getForEntity(localhost + "/commit", String.class)
+                .getStatusCode().is2xxSuccessful());
+    }
+
+    @Test
+    void jdbcRollbackRESTMethod_isSuccessful() {
+        Assertions.assertTrue(restTemplate.getForEntity(localhost + "/rollback", String.class)
+                .getStatusCode().is2xxSuccessful());
+    }
+
+    @Test
+    void jdbcQueryErrorRESTMethod_isSuccessful() {
+        Assertions.assertTrue(restTemplate.getForEntity(localhost + "/query-error", String.class)
+                .getStatusCode().is2xxSuccessful());
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3-observation/src/test/java/com/baeldung/p6spy/SampleP6SpyApplicationIntegrationTest.java b/spring-boot-modules/spring-boot-3-observation/src/test/java/com/baeldung/p6spy/SampleP6SpyApplicationIntegrationTest.java
new file mode 100644
index 0000000000..ba6dd43195
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-observation/src/test/java/com/baeldung/p6spy/SampleP6SpyApplicationIntegrationTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.baeldung.p6spy;
+
+import com.github.gavlyukovskiy.boot.jdbc.decorator.DecoratedDataSource;
+import com.github.gavlyukovskiy.boot.jdbc.decorator.p6spy.P6SpyDataSourceDecorator;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import javax.sql.DataSource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@ExtendWith(SpringExtension.class)
+@SpringBootTest
+class SampleP6SpyApplicationIntegrationTest {
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Test
+    void whenP6SpyEnabled_datasourceIsDecorated() {
+        assertThat(dataSource).isInstanceOf(DecoratedDataSource.class);
+    }
+
+    @Test
+    void whenP6SpyEnabled_decoratingChainContainsP6Spy() {
+        DecoratedDataSource decoratedDataSource = (DecoratedDataSource) dataSource;
+        assertThat(decoratedDataSource.getDecoratingChain().get(0).getDataSourceDecorator()).isInstanceOf(P6SpyDataSourceDecorator.class);
+    }
+
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3-observation/src/test/resources/spy.properties b/spring-boot-modules/spring-boot-3-observation/src/test/resources/spy.properties
new file mode 100644
index 0000000000..ea4525df98
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-observation/src/test/resources/spy.properties
@@ -0,0 +1,3 @@
+# specifies the appender to use for logging.
+# used to avoid the creation of logging file with tests.
+appender=com.p6spy.engine.spy.appender.StdoutLogger
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3-test-pitfalls/README.md b/spring-boot-modules/spring-boot-3-test-pitfalls/README.md
new file mode 100644
index 0000000000..1290cbfcc7
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-test-pitfalls/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Pitfalls on Testing with Spring Boot](https://www.baeldung.com/spring-boot-testing-pitfalls)
diff --git a/spring-boot-modules/spring-boot-3-url-matching/README.md b/spring-boot-modules/spring-boot-3-url-matching/README.md
new file mode 100644
index 0000000000..577849c0e1
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-url-matching/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [URL Matching in Spring Boot 3](https://www.baeldung.com/spring-boot-3-url-matching)
diff --git a/spring-boot-modules/spring-boot-3-url-matching/pom.xml b/spring-boot-modules/spring-boot-3-url-matching/pom.xml
new file mode 100644
index 0000000000..ca8213e1cf
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-url-matching/pom.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>spring-boot-3</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-boot-3</name>
+    <description>URL Matching in Spring Boot</description>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-3</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-3</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-hateoas</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>6.0.6</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-core</artifactId>
+            <version>3.5.4</version>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <version>3.5.4</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+
+                </plugin>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3-url-matching/src/main/java/com/baeldung/sample/URLMatchingApplication.java b/spring-boot-modules/spring-boot-3-url-matching/src/main/java/com/baeldung/sample/URLMatchingApplication.java
new file mode 100644
index 0000000000..914f2e1e53
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-url-matching/src/main/java/com/baeldung/sample/URLMatchingApplication.java
@@ -0,0 +1,12 @@
+package com.baeldung.sample;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+public class URLMatchingApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(URLMatchingApplication.class, args);
+    }
+}
diff --git a/spring-boot-modules/spring-boot-3-url-matching/src/main/java/com/baeldung/sample/config/WebConfig.java b/spring-boot-modules/spring-boot-3-url-matching/src/main/java/com/baeldung/sample/config/WebConfig.java
new file mode 100644
index 0000000000..d4b70c63fa
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-url-matching/src/main/java/com/baeldung/sample/config/WebConfig.java
@@ -0,0 +1,31 @@
+package com.baeldung.sample.config;
+
+import com.baeldung.sample.filters.TrailingSlashRedirectFilterReactive;
+import jakarta.servlet.Filter;
+import org.springframework.web.server.WebFilter;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.baeldung.sample.filters.TrailingSlashRedirectFilter;
+
+
+
+@Configuration
+public class WebConfig {
+    @Bean
+    public WebFilter trailingSlashRedirectReactiveFilter() {
+        return new TrailingSlashRedirectFilterReactive();
+    }
+    @Bean
+    public Filter trailingSlashRedirectFilter() {
+        return new TrailingSlashRedirectFilter();
+    }
+    @Bean
+    public FilterRegistrationBean<Filter> trailingSlashFilter() {
+        FilterRegistrationBean<Filter> registrationBean = new FilterRegistrationBean<>();
+        registrationBean.setFilter(trailingSlashRedirectFilter());
+        registrationBean.addUrlPatterns("/*");
+        return registrationBean;
+    }
+}
diff --git a/spring-boot-modules/spring-boot-3-url-matching/src/main/java/com/baeldung/sample/filters/TrailingSlashRedirectFilter.java b/spring-boot-modules/spring-boot-3-url-matching/src/main/java/com/baeldung/sample/filters/TrailingSlashRedirectFilter.java
new file mode 100644
index 0000000000..6db83b73f2
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-url-matching/src/main/java/com/baeldung/sample/filters/TrailingSlashRedirectFilter.java
@@ -0,0 +1,52 @@
+package com.baeldung.sample.filters;
+
+import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import org.springframework.stereotype.Component;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
+@Component
+public class TrailingSlashRedirectFilter implements Filter {
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException {
+        HttpServletRequest httpRequest = (HttpServletRequest) request;
+        String path = httpRequest.getRequestURI();
+
+        if (path.endsWith("/")) {
+            String newPath = path.substring(0, path.length() - 1);
+            HttpServletRequest newRequest = new CustomHttpServletRequestWrapper(httpRequest, newPath);
+            chain.doFilter(newRequest, response);
+        } else {
+            chain.doFilter(request, response);
+        }
+    }
+
+    private static class CustomHttpServletRequestWrapper extends HttpServletRequestWrapper {
+
+        private final String newPath;
+
+        public CustomHttpServletRequestWrapper(HttpServletRequest request, String newPath) {
+            super(request);
+            this.newPath = newPath;
+        }
+
+        @Override
+        public String getRequestURI() {
+            return newPath;
+        }
+
+        @Override
+        public StringBuffer getRequestURL() {
+            StringBuffer url = new StringBuffer();
+            url.append(getScheme()).append("://").append(getServerName()).append(":").append(getServerPort())
+                    .append(newPath);
+            return url;
+        }
+    }
+}
diff --git a/spring-boot-modules/spring-boot-3-url-matching/src/main/java/com/baeldung/sample/filters/TrailingSlashRedirectFilterReactive.java b/spring-boot-modules/spring-boot-3-url-matching/src/main/java/com/baeldung/sample/filters/TrailingSlashRedirectFilterReactive.java
new file mode 100644
index 0000000000..f983d81441
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-url-matching/src/main/java/com/baeldung/sample/filters/TrailingSlashRedirectFilterReactive.java
@@ -0,0 +1,27 @@
+package com.baeldung.sample.filters;
+
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.stereotype.Component;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebFilter;
+import org.springframework.web.server.WebFilterChain;
+
+import reactor.core.publisher.Mono;
+
+@Component
+public class TrailingSlashRedirectFilterReactive implements WebFilter {
+
+    @Override
+    public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
+        ServerHttpRequest request = exchange.getRequest();
+        String path = request.getPath().value();
+
+        if (path.endsWith("/")) {
+            String newPath = path.substring(0, path.length() - 1);
+            ServerHttpRequest newRequest = request.mutate().path(newPath).build();
+            return chain.filter(exchange.mutate().request(newRequest).build());
+        }
+
+        return chain.filter(exchange);
+    }
+}
diff --git a/spring-boot-modules/spring-boot-3-url-matching/src/main/java/com/baeldung/sample/resources/GreetingsController.java b/spring-boot-modules/spring-boot-3-url-matching/src/main/java/com/baeldung/sample/resources/GreetingsController.java
new file mode 100644
index 0000000000..5c98ed764e
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-url-matching/src/main/java/com/baeldung/sample/resources/GreetingsController.java
@@ -0,0 +1,19 @@
+package com.baeldung.sample.resources;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class GreetingsController {
+
+	@GetMapping("/some/greeting")
+    public String greeting() {
+		return "Hello";
+	}
+
+	@GetMapping("/some/greeting/")
+    public String greetingTrailingSlash() {
+		return "Hello with slash";
+	}
+
+}
diff --git a/spring-boot-modules/spring-boot-3-url-matching/src/main/java/com/baeldung/sample/resources/GreetingsControllerReactive.java b/spring-boot-modules/spring-boot-3-url-matching/src/main/java/com/baeldung/sample/resources/GreetingsControllerReactive.java
new file mode 100644
index 0000000000..fde353ac43
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-url-matching/src/main/java/com/baeldung/sample/resources/GreetingsControllerReactive.java
@@ -0,0 +1,20 @@
+package com.baeldung.sample.resources;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import reactor.core.publisher.Mono;
+
+@RestController
+public class GreetingsControllerReactive {
+
+    @GetMapping("/some/reactive/greeting")
+    public Mono<String> greeting() {
+        return Mono.just("Hello reactive");
+    }
+
+    @GetMapping("/some/reactive/greeting/")
+    public Mono<String> greetingTrailingSlash() {
+        return Mono.just("Hello with slash reactive");
+    }
+}
diff --git a/spring-boot-modules/spring-boot-3-url-matching/src/main/resources/application.yml b/spring-boot-modules/spring-boot-3-url-matching/src/main/resources/application.yml
new file mode 100644
index 0000000000..8d047336f6
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-url-matching/src/main/resources/application.yml
@@ -0,0 +1,7 @@
+spring:
+  mvc:
+    throw-exception-if-no-handler-found: true
+  jackson:
+    deserialization:
+      FAIL_ON_UNKNOWN_PROPERTIES: true
+    property-naming-strategy: SNAKE_CASE
diff --git a/spring-boot-modules/spring-boot-3-url-matching/src/test/java/com/baeldung/sample/resources/GreetingsControllerApiIntegrationTest.java b/spring-boot-modules/spring-boot-3-url-matching/src/test/java/com/baeldung/sample/resources/GreetingsControllerApiIntegrationTest.java
new file mode 100644
index 0000000000..754ef4aafe
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-url-matching/src/test/java/com/baeldung/sample/resources/GreetingsControllerApiIntegrationTest.java
@@ -0,0 +1,45 @@
+package com.baeldung.sample.resources;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+
+@WebMvcTest(controllers = GreetingsController.class)
+class GreetingsControllerApiIntegrationTest {
+
+    private static final String BASEURL = "/some";
+    private static final String DEFAULT_MEDIA_TYPE = MediaType.APPLICATION_JSON_VALUE;
+
+    @Autowired
+    MockMvc mvc;
+
+    @Test
+    public void testGreeting() throws Exception {
+        mvc.perform(get(BASEURL + "/greeting").accept(DEFAULT_MEDIA_TYPE))
+          .andExpect(status().isOk())
+          .andExpect(content().string("Hello"));
+    }
+
+    @Test
+    @Disabled("Disabled while TrailingSlashRedirectFilter is in use.")
+    public void testGreetingTrailingSlash() throws Exception {
+        mvc.perform(get(BASEURL + "/greeting/").accept(DEFAULT_MEDIA_TYPE))
+          .andExpect(status().isOk())
+          .andExpect(content().string("Hello with slash"));
+    }
+
+    @Test
+    public void testGreetingTrailingSlashWithFilter() throws Exception {
+        mvc.perform(get(BASEURL + "/greeting/").accept(DEFAULT_MEDIA_TYPE))
+          .andExpect(status().isOk())
+          .andExpect(content().string("Hello"));
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-3-url-matching/src/test/java/com/baeldung/sample/resources/GreetingsControllerReactiveApiIntegrationTest.java b/spring-boot-modules/spring-boot-3-url-matching/src/test/java/com/baeldung/sample/resources/GreetingsControllerReactiveApiIntegrationTest.java
new file mode 100644
index 0000000000..9d5e439a74
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3-url-matching/src/test/java/com/baeldung/sample/resources/GreetingsControllerReactiveApiIntegrationTest.java
@@ -0,0 +1,46 @@
+package com.baeldung.sample.resources;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@WebFluxTest
+public class GreetingsControllerReactiveApiIntegrationTest {
+    private static final String BASEURL = "/some/reactive";
+    @Autowired
+    private WebTestClient webClient;
+    @Test
+    public void testGreeting() {
+        webClient.get().uri( BASEURL + "/greeting")
+                .exchange()
+                .expectStatus().isOk()
+                .expectBody().consumeWith(result -> {
+                    String responseBody = new String(result.getResponseBody());
+                    assertTrue(responseBody.contains("Hello reactive"));
+                });
+    }
+    @Test
+    @Disabled("Disabled while TrailingSlashRedirectFilter is in use.")
+    public void testGreetingTrailingSlash() {
+        webClient.get().uri(BASEURL + "/greeting/")
+                .exchange()
+                .expectStatus().isOk()
+                .expectBody().consumeWith(result -> {
+                    String responseBody = new String(result.getResponseBody());
+                    assertTrue(responseBody.contains("Hello with slash reactive"));
+                });
+    }
+    @Test
+    public void testGreetingTrailingSlashWithFilter() {
+        webClient.get().uri(BASEURL +  "/greeting/")
+                .exchange()
+                .expectStatus().isOk()
+                .expectBody().consumeWith(result -> {
+                    String responseBody = new String(result.getResponseBody());
+                    assertTrue(responseBody.contains("Hello reactive"));
+                });
+    }
+}
diff --git a/spring-boot-modules/spring-boot-3/README.md b/spring-boot-modules/spring-boot-3/README.md
index 0d79f006e1..e99eb79127 100644
--- a/spring-boot-modules/spring-boot-3/README.md
+++ b/spring-boot-modules/spring-boot-3/README.md
@@ -3,3 +3,7 @@
 
 - [Spring Boot 3 and Spring Framework 6.0 – What’s New](https://www.baeldung.com/spring-boot-3-spring-6-new)
 - [Singleton Design Pattern vs Singleton Beans in Spring Boot](https://www.baeldung.com/spring-boot-singleton-vs-beans)
+- [Migrate Application From Spring Boot 2 to Spring Boot 3](https://www.baeldung.com/spring-boot-3-migration)
+- [Using Java Records with JPA](https://www.baeldung.com/spring-jpa-java-records)
+- [HTTP Interface in Spring 6](https://www.baeldung.com/spring-6-http-interface)
+- [Working with Virtual Threads in Spring 6](https://www.baeldung.com/spring-6-virtual-threads)
diff --git a/spring-boot-modules/spring-boot-3/pom.xml b/spring-boot-modules/spring-boot-3/pom.xml
index cc8e7e1426..8fe995ca91 100644
--- a/spring-boot-modules/spring-boot-3/pom.xml
+++ b/spring-boot-modules/spring-boot-3/pom.xml
@@ -32,6 +32,20 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mock-server</groupId>
+            <artifactId>mockserver-netty</artifactId>
+            <version>${mockserver.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mock-server</groupId>
+            <artifactId>mockserver-client-java</artifactId>
+            <version>${mockserver.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -102,6 +116,7 @@
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-maven-plugin</artifactId>
                     <configuration>
+                        <mainClass>com.baeldung.virtualthreads.VirtualThreadsApp</mainClass>
                         <excludes>
                             <exclude>
                                 <groupId>org.projectlombok</groupId>
@@ -117,13 +132,23 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgs>--enable-preview</compilerArgs>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
     <properties>
+        <java.version>19</java.version>
         <mapstruct.version>1.5.2.Final</mapstruct.version>
         <springdoc.version>2.0.0</springdoc.version>
         <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
+        <start-class>com.baeldung.sample.TodoApplication</start-class>
+        <mockserver.version>5.14.0</mockserver.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-core-6/src/main/java/com/baeldung/httpinterface/Book.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/httpinterface/Book.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/httpinterface/Book.java
rename to spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/httpinterface/Book.java
diff --git a/spring-core-6/src/main/java/com/baeldung/httpinterface/BooksClient.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/httpinterface/BooksClient.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/httpinterface/BooksClient.java
rename to spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/httpinterface/BooksClient.java
diff --git a/spring-core-6/src/main/java/com/baeldung/httpinterface/BooksService.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/httpinterface/BooksService.java
similarity index 85%
rename from spring-core-6/src/main/java/com/baeldung/httpinterface/BooksService.java
rename to spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/httpinterface/BooksService.java
index a9cf6ec58a..a70d412dd2 100644
--- a/spring-core-6/src/main/java/com/baeldung/httpinterface/BooksService.java
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/httpinterface/BooksService.java
@@ -15,12 +15,12 @@ interface BooksService {
     List<Book> getBooks();
 
     @GetExchange("/books/{id}")
-    Book getBook(@PathVariable long id);
+    Book getBook(@PathVariable("id") long id);
 
     @PostExchange("/books")
     Book saveBook(@RequestBody Book book);
 
     @DeleteExchange("/books/{id}")
-    ResponseEntity<Void> deleteBook(@PathVariable long id);
+    ResponseEntity<Void> deleteBook(@PathVariable("id") long id);
 
 }
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/QueryService.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/QueryService.java
new file mode 100644
index 0000000000..4c1e73e530
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/QueryService.java
@@ -0,0 +1,42 @@
+package com.baeldung.recordswithjpa;
+
+import com.baeldung.recordswithjpa.entity.Book;
+import com.baeldung.recordswithjpa.records.BookRecord;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class QueryService {
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    public List<BookRecord> findAllBooks() {
+        CriteriaBuilder cb = entityManager.getCriteriaBuilder();
+        CriteriaQuery<BookRecord> query = cb.createQuery(BookRecord.class);
+        Root<Book> root = query.from(Book.class);
+        query.select(cb
+          .construct(BookRecord.class, root.get("id"), root.get("title"), root.get("author"), root.get("isbn")));
+        return entityManager.createQuery(query).getResultList();
+    }
+
+    public BookRecord findBookById(Long id) {
+        TypedQuery<BookRecord> query = entityManager
+          .createQuery("SELECT new com.baeldung.recordswithjpa.records.BookRecord(b.id, b.title, b.author, b.isbn) " +
+                  "FROM Book b WHERE b.id = :id", BookRecord.class);
+        query.setParameter("id", id);
+        return query.getSingleResult();
+    }
+
+    public List<BookRecord> findAllBooksUsingMapping() {
+        Query query = entityManager.createNativeQuery("SELECT * FROM book", "BookRecordMapping");
+        return query.getResultList();
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/RecordsAsJpaApplication.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/RecordsAsJpaApplication.java
new file mode 100644
index 0000000000..d6eb1edec1
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/RecordsAsJpaApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.recordswithjpa;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class RecordsAsJpaApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(RecordsAsJpaApplication.class, args);
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/entity/Book.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/entity/Book.java
new file mode 100644
index 0000000000..9ea982e323
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/entity/Book.java
@@ -0,0 +1,70 @@
+package com.baeldung.recordswithjpa.entity;
+
+import com.baeldung.recordswithjpa.records.BookRecord;
+import jakarta.persistence.*;
+
+@SqlResultSetMapping(
+        name = "BookRecordMapping",
+        classes = @ConstructorResult(
+                targetClass = BookRecord.class,
+                columns = {
+                        @ColumnResult(name = "id", type = Long.class),
+                        @ColumnResult(name = "title", type = String.class),
+                        @ColumnResult(name = "author", type = String.class),
+                        @ColumnResult(name = "isbn", type = String.class)
+                }
+        )
+)
+@Entity
+@Table(name = "book")
+public class Book {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    private String title;
+    private String author;
+    private String isbn;
+
+    public Book() {
+    }
+
+    public Book(Long id, String title, String author, String isbn) {
+        this.id = id;
+        this.title = title;
+        this.author = author;
+        this.isbn = isbn;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public String getIsbn() {
+        return isbn;
+    }
+
+    public void setIsbn(String isbn) {
+        this.isbn = isbn;
+    }
+
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/records/BookRecord.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/records/BookRecord.java
new file mode 100644
index 0000000000..96968575d9
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/records/BookRecord.java
@@ -0,0 +1,4 @@
+package com.baeldung.recordswithjpa.records;
+
+public record BookRecord(Long id, String title, String author, String isbn) {
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/records/CustomBookRecord.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/records/CustomBookRecord.java
new file mode 100644
index 0000000000..35e9be9513
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/records/CustomBookRecord.java
@@ -0,0 +1,4 @@
+package com.baeldung.recordswithjpa.records;
+
+public record CustomBookRecord(Long id, String title) {
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/repository/BookRepository.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/repository/BookRepository.java
new file mode 100644
index 0000000000..4ef5f17296
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/repository/BookRepository.java
@@ -0,0 +1,17 @@
+package com.baeldung.recordswithjpa.repository;
+
+import com.baeldung.recordswithjpa.entity.Book;
+import com.baeldung.recordswithjpa.records.BookRecord;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface BookRepository extends CrudRepository<Book, Long> {
+    List<BookRecord> findBookByAuthor(String author);
+
+    @Query("SELECT new com.baeldung.recordswithjpa.records.BookRecord(b.id, b.title, b.author, b.isbn) " +
+            "FROM Book b WHERE b.id = :id")
+    BookRecord findBookById(@Param("id") Long id);
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/repository/CustomBookRepository.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/repository/CustomBookRepository.java
new file mode 100644
index 0000000000..bb8002d70d
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/repository/CustomBookRepository.java
@@ -0,0 +1,9 @@
+package com.baeldung.recordswithjpa.repository;
+
+import com.baeldung.recordswithjpa.records.CustomBookRecord;
+
+import java.util.List;
+
+public interface CustomBookRepository {
+    List<CustomBookRecord> findAllBooks();
+}
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/repository/CustomBookRepositoryImpl.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/repository/CustomBookRepositoryImpl.java
new file mode 100644
index 0000000000..8d420a9874
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/recordswithjpa/repository/CustomBookRepositoryImpl.java
@@ -0,0 +1,20 @@
+package com.baeldung.recordswithjpa.repository;
+
+import com.baeldung.recordswithjpa.records.CustomBookRecord;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public class CustomBookRepositoryImpl implements CustomBookRepository {
+    private final JdbcTemplate jdbcTemplate;
+
+    public CustomBookRepositoryImpl(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    public List<CustomBookRecord> findAllBooks() {
+        return jdbcTemplate.query("SELECT id, title FROM book", (rs, rowNum) -> new CustomBookRecord(rs.getLong("id"), rs.getString("title")));
+    }
+}
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/sample/boundary/ServerConfiguration.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/sample/boundary/ServerConfiguration.java
new file mode 100644
index 0000000000..5533fe1b7d
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/sample/boundary/ServerConfiguration.java
@@ -0,0 +1,21 @@
+package com.baeldung.sample.boundary;
+
+import org.apache.catalina.connector.Connector;
+import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
+import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class ServerConfiguration implements WebServerFactoryCustomizer<TomcatServletWebServerFactory> {
+
+    @Override
+    public void customize(TomcatServletWebServerFactory factory) {
+        factory.addConnectorCustomizers(new TomcatConnectorCustomizer() {
+            @Override
+            public void customize(Connector connector) {
+                connector.setProperty("maxHttpResponseHeaderSize", "100000");
+            }
+        });
+    }
+}
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/sample/boundary/TodosController.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/sample/boundary/TodosController.java
index 7efa7dfee3..cf21303659 100644
--- a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/sample/boundary/TodosController.java
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/sample/boundary/TodosController.java
@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.net.URI;
 import java.util.Collection;
+import java.util.List;
 import java.util.stream.Collectors;
 
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
@@ -35,6 +36,13 @@ public class TodosController {
     // Mapping zwischen den Schichten
     private final TodoDtoMapper mapper;
 
+
+    @GetMapping(value = {"/name"},produces = DEFAULT_MEDIA_TYPE)
+    public List<String> findAllName(){
+        return List.of("Hello", "World");
+    }
+
+
     @GetMapping(produces = DEFAULT_MEDIA_TYPE)
     public Collection<TodoResponseDto> findAll() {
         return service.findAll().stream()
@@ -80,4 +88,4 @@ public class TodosController {
         service.delete(id);
     }
 
-}
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/sample/boundary/WebConfiguration.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/sample/boundary/WebConfiguration.java
new file mode 100644
index 0000000000..24bbc223ae
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/sample/boundary/WebConfiguration.java
@@ -0,0 +1,13 @@
+package com.baeldung.sample.boundary;
+
+import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+public class WebConfiguration implements WebMvcConfigurer {
+
+    @Override
+    public void configurePathMatch(PathMatchConfigurer configurer) {
+        configurer.setUseTrailingSlashMatch(true);
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/virtualthreads/VirtualThreadsApp.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/virtualthreads/VirtualThreadsApp.java
new file mode 100644
index 0000000000..159fa1c243
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/virtualthreads/VirtualThreadsApp.java
@@ -0,0 +1,13 @@
+package com.baeldung.virtualthreads;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class VirtualThreadsApp {
+
+    public static void main(String[] args) {
+        SpringApplication.run(VirtualThreadsApp.class, args);
+    }
+
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/virtualthreads/config/ThreadConfig.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/virtualthreads/config/ThreadConfig.java
new file mode 100644
index 0000000000..7231ec0b94
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/virtualthreads/config/ThreadConfig.java
@@ -0,0 +1,33 @@
+package com.baeldung.virtualthreads.config;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.web.embedded.tomcat.TomcatProtocolHandlerCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.task.AsyncTaskExecutor;
+import org.springframework.core.task.support.TaskExecutorAdapter;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+import java.util.concurrent.Executors;
+
+@EnableAsync
+@Configuration
+@ConditionalOnProperty(
+        value = "spring.thread-executor",
+        havingValue = "virtual"
+)
+public class ThreadConfig {
+
+    @Bean
+    public AsyncTaskExecutor applicationTaskExecutor() {
+        return new TaskExecutorAdapter(Executors.newVirtualThreadPerTaskExecutor());
+    }
+
+    @Bean
+    public TomcatProtocolHandlerCustomizer<?> protocolHandlerVirtualThreadExecutorCustomizer() {
+        return protocolHandler -> {
+            protocolHandler.setExecutor(Executors.newVirtualThreadPerTaskExecutor());
+        };
+    }
+
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/virtualthreads/controller/LoadTestController.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/virtualthreads/controller/LoadTestController.java
new file mode 100644
index 0000000000..d99d3824a0
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/virtualthreads/controller/LoadTestController.java
@@ -0,0 +1,23 @@
+package com.baeldung.virtualthreads.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+
+@RestController
+@RequestMapping("/load")
+public class LoadTestController {
+
+    private static final Logger LOG = LoggerFactory.getLogger(LoadTestController.class);
+
+    @GetMapping
+    public void doSomething() throws InterruptedException {
+        LOG.info("hey, I'm doing something");
+        Thread.sleep(1000);
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/virtualthreads/controller/ThreadController.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/virtualthreads/controller/ThreadController.java
new file mode 100644
index 0000000000..73b28ce9f0
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/virtualthreads/controller/ThreadController.java
@@ -0,0 +1,16 @@
+package com.baeldung.virtualthreads.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/thread")
+public class ThreadController {
+
+    @GetMapping("/name")
+    public String getThreadName() {
+        return Thread.currentThread().toString();
+    }
+
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3/src/main/resources/application.yml b/spring-boot-modules/spring-boot-3/src/main/resources/application.yml
index 9a966a5bbd..5f9031bc9e 100644
--- a/spring-boot-modules/spring-boot-3/src/main/resources/application.yml
+++ b/spring-boot-modules/spring-boot-3/src/main/resources/application.yml
@@ -14,8 +14,10 @@ spring:
     properties:
       hibernate:
         dialect: org.hibernate.dialect.H2Dialect
+  thread-executor: standard
+
 # Custom Properties
 cors:
   allow:
     origins: ${CORS_ALLOWED_ORIGINS:*}
-    credentials: ${CORS_ALLOW_CREDENTIALS:false}
+    credentials: ${CORS_ALLOW_CREDENTIALS:false}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3/src/test/HTTP Load Request .jmx b/spring-boot-modules/spring-boot-3/src/test/HTTP Load Request .jmx
new file mode 100644
index 0000000000..bbd02cecbe
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/test/HTTP Load Request .jmx	
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jmeterTestPlan version="1.2" properties="5.0" jmeter="5.5">
+  <hashTree>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
+      <stringProp name="TestPlan.comments"></stringProp>
+      <boolProp name="TestPlan.functional_mode">false</boolProp>
+      <boolProp name="TestPlan.tearDown_on_shutdown">true</boolProp>
+      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+        <collectionProp name="Arguments.arguments"/>
+      </elementProp>
+      <stringProp name="TestPlan.user_define_classpath"></stringProp>
+    </TestPlan>
+    <hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
+        <stringProp name="ThreadGroup.on_sample_error">stoptest</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+          <intProp name="LoopController.loops">-1</intProp>
+        </elementProp>
+        <stringProp name="ThreadGroup.num_threads">1000</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">10</stringProp>
+        <boolProp name="ThreadGroup.scheduler">true</boolProp>
+        <stringProp name="ThreadGroup.duration">100</stringProp>
+        <stringProp name="ThreadGroup.delay"></stringProp>
+        <boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp>
+      </ThreadGroup>
+      <hashTree>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP Load Request " enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.domain">localhost</stringProp>
+          <stringProp name="HTTPSampler.port">8080</stringProp>
+          <stringProp name="HTTPSampler.protocol"></stringProp>
+          <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+          <stringProp name="HTTPSampler.path">/load</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+          <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+          <stringProp name="HTTPSampler.response_timeout"></stringProp>
+        </HTTPSamplerProxy>
+        <hashTree/>
+      </hashTree>
+      <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
+        <boolProp name="ResultCollector.error_logging">false</boolProp>
+        <objProp>
+          <name>saveConfig</name>
+          <value class="SampleSaveConfiguration">
+            <time>true</time>
+            <latency>true</latency>
+            <timestamp>true</timestamp>
+            <success>true</success>
+            <label>true</label>
+            <code>true</code>
+            <message>true</message>
+            <threadName>true</threadName>
+            <dataType>true</dataType>
+            <encoding>false</encoding>
+            <assertions>true</assertions>
+            <subresults>true</subresults>
+            <responseData>false</responseData>
+            <samplerData>false</samplerData>
+            <xml>false</xml>
+            <fieldNames>true</fieldNames>
+            <responseHeaders>false</responseHeaders>
+            <requestHeaders>false</requestHeaders>
+            <responseDataOnError>false</responseDataOnError>
+            <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+            <assertionsResultsToSave>0</assertionsResultsToSave>
+            <bytes>true</bytes>
+            <sentBytes>true</sentBytes>
+            <url>true</url>
+            <threadCounts>true</threadCounts>
+            <idleTime>true</idleTime>
+            <connectTime>true</connectTime>
+          </value>
+        </objProp>
+        <stringProp name="filename"></stringProp>
+      </ResultCollector>
+      <hashTree/>
+      <ResultCollector guiclass="RespTimeGraphVisualizer" testclass="ResultCollector" testname="Response Time Graph" enabled="true">
+        <boolProp name="ResultCollector.error_logging">false</boolProp>
+        <objProp>
+          <name>saveConfig</name>
+          <value class="SampleSaveConfiguration">
+            <time>true</time>
+            <latency>true</latency>
+            <timestamp>true</timestamp>
+            <success>true</success>
+            <label>true</label>
+            <code>true</code>
+            <message>true</message>
+            <threadName>true</threadName>
+            <dataType>true</dataType>
+            <encoding>false</encoding>
+            <assertions>true</assertions>
+            <subresults>true</subresults>
+            <responseData>false</responseData>
+            <samplerData>false</samplerData>
+            <xml>false</xml>
+            <fieldNames>true</fieldNames>
+            <responseHeaders>false</responseHeaders>
+            <requestHeaders>false</requestHeaders>
+            <responseDataOnError>false</responseDataOnError>
+            <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+            <assertionsResultsToSave>0</assertionsResultsToSave>
+            <bytes>true</bytes>
+            <sentBytes>true</sentBytes>
+            <url>true</url>
+            <threadCounts>true</threadCounts>
+            <idleTime>true</idleTime>
+            <connectTime>true</connectTime>
+          </value>
+        </objProp>
+        <stringProp name="filename"></stringProp>
+      </ResultCollector>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+</jmeterTestPlan>
diff --git a/core-java-modules/core-java/src/test/resources/newFile1.txt b/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/httpinterface/BooksServiceMockServerUnitTest.java
similarity index 100%
rename from core-java-modules/core-java/src/test/resources/newFile1.txt
rename to spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/httpinterface/BooksServiceMockServerUnitTest.java
diff --git a/core-java-modules/core-java/src/test/resources/newFile2.txt b/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/httpinterface/BooksServiceMockitoUnitTest.java
similarity index 100%
rename from core-java-modules/core-java/src/test/resources/newFile2.txt
rename to spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/httpinterface/BooksServiceMockitoUnitTest.java
diff --git a/spring-core-6/src/test/java/com/baeldung/httpinterface/MyServiceException.java b/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/httpinterface/MyServiceException.java
similarity index 100%
rename from spring-core-6/src/test/java/com/baeldung/httpinterface/MyServiceException.java
rename to spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/httpinterface/MyServiceException.java
diff --git a/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/recordswithjpa/QueryServiceIntegrationTest.java b/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/recordswithjpa/QueryServiceIntegrationTest.java
new file mode 100644
index 0000000000..011895e7fa
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/recordswithjpa/QueryServiceIntegrationTest.java
@@ -0,0 +1,39 @@
+package com.baeldung.recordswithjpa;
+
+import com.baeldung.recordswithjpa.entity.Book;
+import com.baeldung.recordswithjpa.records.BookRecord;
+import com.baeldung.recordswithjpa.repository.BookRepository;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class QueryServiceIntegrationTest extends RecordsAsJpaIntegrationTest {
+
+    @Autowired
+    private QueryService queryService;
+
+
+    @Test
+    void findAllBooks() {
+        List<BookRecord> allBooks = queryService.findAllBooks();
+        assertEquals(3, allBooks.size());
+    }
+
+    @Test
+    void findBookById() {
+        BookRecord bookById = queryService.findBookById(1L);
+        assertEquals("The Lord of the Rings", bookById.title());
+    }
+
+    @Test
+    void findAllBooksUsingMapping() {
+        List<BookRecord> allBooksUsingMapping = queryService.findAllBooksUsingMapping();
+        assertEquals(3, allBooksUsingMapping.size());
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/recordswithjpa/RecordsAsJpaIntegrationTest.java b/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/recordswithjpa/RecordsAsJpaIntegrationTest.java
new file mode 100644
index 0000000000..f0869dad48
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/recordswithjpa/RecordsAsJpaIntegrationTest.java
@@ -0,0 +1,30 @@
+package com.baeldung.recordswithjpa;
+
+import com.baeldung.recordswithjpa.entity.Book;
+import com.baeldung.recordswithjpa.repository.BookRepository;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+public class RecordsAsJpaIntegrationTest {
+    @Autowired
+    protected BookRepository bookRepository;
+
+    @BeforeEach
+    void setUp() {
+        Book book = new Book(1L,"The Lord of the Rings", "J.R.R. Tolkien", "978-0544003415");
+        Book book2 = new Book(2L,"The Hobbit", "J.R.R. Tolkien", "978-0547928227");
+        Book book3 = new Book(3L,"Harry Potter and the Philosopher's Stone", "J.K. Rowling", "978-0747532699");
+
+        bookRepository.save(book);
+        bookRepository.save(book2);
+        bookRepository.save(book3);
+    }
+
+    @AfterEach
+    void tearDown() {
+        bookRepository.deleteAll();
+    }
+}
diff --git a/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/recordswithjpa/repository/BookRepositoryIntegrationTest.java b/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/recordswithjpa/repository/BookRepositoryIntegrationTest.java
new file mode 100644
index 0000000000..9173fea269
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/recordswithjpa/repository/BookRepositoryIntegrationTest.java
@@ -0,0 +1,19 @@
+package com.baeldung.recordswithjpa.repository;
+
+import com.baeldung.recordswithjpa.RecordsAsJpaIntegrationTest;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class BookRepositoryIntegrationTest extends RecordsAsJpaIntegrationTest {
+
+    @Test
+    void findBookByAuthor() {
+       assertEquals(2, bookRepository.findBookByAuthor("J.R.R. Tolkien").size());
+    }
+
+    @Test
+    void findBookById() {
+        assertEquals("The Lord of the Rings", bookRepository.findBookById(1L).title());
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/recordswithjpa/repository/CustomBookRepositoryIntegrationTest.java b/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/recordswithjpa/repository/CustomBookRepositoryIntegrationTest.java
new file mode 100644
index 0000000000..866645429a
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/recordswithjpa/repository/CustomBookRepositoryIntegrationTest.java
@@ -0,0 +1,23 @@
+package com.baeldung.recordswithjpa.repository;
+
+import com.baeldung.recordswithjpa.RecordsAsJpaIntegrationTest;
+import com.baeldung.recordswithjpa.records.CustomBookRecord;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class CustomBookRepositoryIntegrationTest extends RecordsAsJpaIntegrationTest {
+
+    @Autowired
+    private CustomBookRepository customBookRepository;
+
+    @Test
+    void findAllBooks() {
+        List<CustomBookRecord> allBooks = customBookRepository.findAllBooks();
+        assertEquals(3, allBooks.size());
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/sample/boundary/TodosControllerApiIntegrationTest.java b/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/sample/boundary/TodosControllerApiIntegrationTest.java
index 680b6c85bb..3a80bc8a6c 100644
--- a/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/sample/boundary/TodosControllerApiIntegrationTest.java
+++ b/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/sample/boundary/TodosControllerApiIntegrationTest.java
@@ -215,4 +215,18 @@ class TodosControllerApiIntegrationTest {
           .andExpect(status().isNotFound());
     }
 
+    @Test
+    void whenThereIsNoSlashMatching_ThenHttpStatusIs404() throws Exception {
+        mvc
+          .perform(get(BASEURL + "/name/").contentType(DEFAULT_MEDIA_TYPE))
+          .andExpect(status().isNotFound());
+    }
+
+    @Test
+    void whenThereIsNoSlashMatching_ThenHttpStatusIs200() throws Exception {
+        mvc
+          .perform(get(BASEURL + "/name").contentType(DEFAULT_MEDIA_TYPE))
+          .andExpect(status().isOk());
+    }
+
 }
diff --git a/spring-boot-modules/spring-boot-annotations-2/README.md b/spring-boot-modules/spring-boot-annotations-2/README.md
index ec72620b37..541fa2fd73 100644
--- a/spring-boot-modules/spring-boot-annotations-2/README.md
+++ b/spring-boot-modules/spring-boot-annotations-2/README.md
@@ -6,4 +6,9 @@ This module contains articles about Spring Boot annotations
 
 - [Spring Conditional Annotations](https://www.baeldung.com/spring-conditional-annotations)
 - [Guide to @SpringBootConfiguration in Spring Boot](https://www.baeldung.com/springbootconfiguration-annotation)
+- [Spring @Primary Annotation](http://www.baeldung.com/spring-primary)
+- [Spring Bean Names](https://www.baeldung.com/spring-bean-names)
+- [AliasFor Annotation in Spring](https://www.baeldung.com/spring-aliasfor-annotation)
+- [A Quick Guide to the Spring @Lazy Annotation](https://www.baeldung.com/spring-lazy-annotation)
+- [Instantiating Multiple Beans of the Same Class with Spring Annotations](https://www.baeldung.com/spring-same-class-multiple-beans)
 - More articles: [[<-- prev]](/spring-boot-modules/spring-boot-annotations)
diff --git a/spring-boot-modules/spring-boot-annotations-2/pom.xml b/spring-boot-modules/spring-boot-annotations-2/pom.xml
index 99d1c4587b..71fc7ff388 100644
--- a/spring-boot-modules/spring-boot-annotations-2/pom.xml
+++ b/spring-boot-modules/spring-boot-annotations-2/pom.xml
@@ -28,6 +28,11 @@
             <artifactId>mockito-inline</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/spring-core-5/src/main/java/com/baeldung/aliasfor/MyMapping.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/aliasfor/MyMapping.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/aliasfor/MyMapping.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/aliasfor/MyMapping.java
diff --git a/spring-core-5/src/main/java/com/baeldung/aliasfor/MyMappingController.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/aliasfor/MyMappingController.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/aliasfor/MyMappingController.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/aliasfor/MyMappingController.java
diff --git a/spring-core-5/src/main/java/com/baeldung/lazy/AppConfig.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/lazy/AppConfig.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/lazy/AppConfig.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/lazy/AppConfig.java
diff --git a/spring-core-5/src/main/java/com/baeldung/lazy/City.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/lazy/City.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/lazy/City.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/lazy/City.java
diff --git a/spring-core-5/src/main/java/com/baeldung/lazy/Country.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/lazy/Country.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/lazy/Country.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/lazy/Country.java
diff --git a/spring-core-5/src/main/java/com/baeldung/lazy/Region.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/lazy/Region.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/lazy/Region.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/lazy/Region.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution1/Person.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution1/Person.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution1/Person.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution1/Person.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution1/PersonConfig.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution1/PersonConfig.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution1/PersonConfig.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution1/PersonConfig.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution1/SpringApp1.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution1/SpringApp1.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution1/SpringApp1.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution1/SpringApp1.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/Person.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/Person.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/Person.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/Person.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonConfig.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonConfig.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonConfig.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonConfig.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonOne.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonOne.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonOne.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonOne.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonTwo.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonTwo.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonTwo.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/PersonTwo.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/SpringApp2.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/SpringApp2.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution2/SpringApp2.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution2/SpringApp2.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/Human.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/Human.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/Human.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/Human.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/MultiBeanFactory.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/MultiBeanFactory.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/MultiBeanFactory.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/MultiBeanFactory.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/Person.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/Person.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/Person.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/Person.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/PersonConfig.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/PersonConfig.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/PersonConfig.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/PersonConfig.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/PersonFactoryPostProcessor.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/PersonFactoryPostProcessor.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/PersonFactoryPostProcessor.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/PersonFactoryPostProcessor.java
diff --git a/spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/SpringApp3.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/SpringApp3.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/multibeaninstantiation/solution3/SpringApp3.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/multibeaninstantiation/solution3/SpringApp3.java
diff --git a/spring-core-2/src/main/java/com/baeldung/primary/Config.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/primary/Config.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/primary/Config.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/primary/Config.java
diff --git a/spring-core-2/src/main/java/com/baeldung/primary/DepartmentManager.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/primary/DepartmentManager.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/primary/DepartmentManager.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/primary/DepartmentManager.java
diff --git a/spring-core-2/src/main/java/com/baeldung/primary/Employee.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/primary/Employee.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/primary/Employee.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/primary/Employee.java
diff --git a/spring-core-2/src/main/java/com/baeldung/primary/GeneralManager.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/primary/GeneralManager.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/primary/GeneralManager.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/primary/GeneralManager.java
diff --git a/spring-core-2/src/main/java/com/baeldung/primary/Manager.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/primary/Manager.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/primary/Manager.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/primary/Manager.java
diff --git a/spring-core-2/src/main/java/com/baeldung/primary/ManagerService.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/primary/ManagerService.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/primary/ManagerService.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/primary/ManagerService.java
diff --git a/spring-core-2/src/main/java/com/baeldung/primary/PrimaryApplication.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/primary/PrimaryApplication.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/primary/PrimaryApplication.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/primary/PrimaryApplication.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/component/Animal.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/component/Animal.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/component/Animal.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/component/Animal.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/component/Cat.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/component/Cat.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/component/Cat.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/component/Cat.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/component/CustomComponent.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/component/CustomComponent.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/component/CustomComponent.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/component/CustomComponent.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/component/Dog.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/component/Dog.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/component/Dog.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/component/Dog.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/configuration/AuditConfiguration.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/configuration/AuditConfiguration.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/configuration/AuditConfiguration.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/configuration/AuditConfiguration.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/configuration/MyConfiguration.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/configuration/MyConfiguration.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/configuration/MyConfiguration.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/configuration/MyConfiguration.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/controller/MessagingController.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/controller/MessagingController.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/controller/MessagingController.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/controller/MessagingController.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/service/AuditService.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/AuditService.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/service/AuditService.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/AuditService.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/service/LoggingService.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/LoggingService.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/service/LoggingService.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/LoggingService.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/service/MessagingService.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/MessagingService.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/service/MessagingService.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/MessagingService.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/service/MessagingServiceImpl.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/MessagingServiceImpl.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/service/MessagingServiceImpl.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/MessagingServiceImpl.java
diff --git a/spring-core-5/src/main/java/com/baeldung/springbean/naming/service/PetShow.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/PetShow.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/springbean/naming/service/PetShow.java
rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/springbean/naming/service/PetShow.java
diff --git a/spring-core-5/src/test/java/com/baeldung/aliasfor/AliasForUnitTest.java b/spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/aliasfor/AliasForUnitTest.java
similarity index 100%
rename from spring-core-5/src/test/java/com/baeldung/aliasfor/AliasForUnitTest.java
rename to spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/aliasfor/AliasForUnitTest.java
diff --git a/spring-core-5/src/test/java/com/baeldung/lazy/LazyAnnotationUnitTest.java b/spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/lazy/LazyAnnotationUnitTest.java
similarity index 100%
rename from spring-core-5/src/test/java/com/baeldung/lazy/LazyAnnotationUnitTest.java
rename to spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/lazy/LazyAnnotationUnitTest.java
diff --git a/spring-core-5/src/test/java/com/baeldung/springbean/naming/SpringBeanNamingUnitTest.java b/spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/springbean/naming/SpringBeanNamingUnitTest.java
similarity index 100%
rename from spring-core-5/src/test/java/com/baeldung/springbean/naming/SpringBeanNamingUnitTest.java
rename to spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/springbean/naming/SpringBeanNamingUnitTest.java
diff --git a/spring-boot-modules/spring-boot-aws/README.md b/spring-boot-modules/spring-boot-aws/README.md
new file mode 100644
index 0000000000..06725c209d
--- /dev/null
+++ b/spring-boot-modules/spring-boot-aws/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [Run a Spring Boot Application in AWS Lambda](https://www.baeldung.com/spring-boot-aws-lambda)
diff --git a/spring-boot-modules/spring-boot-aws/pom.xml b/spring-boot-modules/spring-boot-aws/pom.xml
new file mode 100644
index 0000000000..bdb23f9fe2
--- /dev/null
+++ b/spring-boot-modules/spring-boot-aws/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>
+    <groupId>com.baeldung</groupId>
+    <artifactId>spring-boot-aws</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-boot-data-3</name>
+    <description>spring-boot-boot</description>
+
+    <parent>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <properties>
+        <springboot2.aws.version>1.9.1</springboot2.aws.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws.serverless</groupId>
+            <artifactId>aws-serverless-java-container-springboot2</artifactId>
+            <version>${springboot2.aws.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <excludes>
+                                    <exclude>org.apache.tomcat.embed:*</exclude>
+                                </excludes>
+                            </artifactSet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-aws/src/main/java/com/baeldung/aws/Application.java b/spring-boot-modules/spring-boot-aws/src/main/java/com/baeldung/aws/Application.java
new file mode 100644
index 0000000000..da3fe275b5
--- /dev/null
+++ b/spring-boot-modules/spring-boot-aws/src/main/java/com/baeldung/aws/Application.java
@@ -0,0 +1,12 @@
+package com.baeldung.aws;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+}
diff --git a/spring-boot-modules/spring-boot-aws/src/main/java/com/baeldung/aws/controller/ProfileController.java b/spring-boot-modules/spring-boot-aws/src/main/java/com/baeldung/aws/controller/ProfileController.java
new file mode 100644
index 0000000000..674c4827ba
--- /dev/null
+++ b/spring-boot-modules/spring-boot-aws/src/main/java/com/baeldung/aws/controller/ProfileController.java
@@ -0,0 +1,21 @@
+package com.baeldung.aws.controller;
+
+import java.util.List;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baeldung.aws.data.User;
+
+@RestController
+@RequestMapping("/api/v1/")
+public class ProfileController {
+
+    @GetMapping(value = "users", produces = MediaType.APPLICATION_JSON_VALUE)
+    public List<User> getUser() {
+        return List.of(new User("John", "Doe", "john.doe@baeldung.com"), new User("John", "Doe", "john.doe-2@baeldung.com"));
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-aws/src/main/java/com/baeldung/aws/data/User.java b/spring-boot-modules/spring-boot-aws/src/main/java/com/baeldung/aws/data/User.java
new file mode 100644
index 0000000000..c5ebd1251f
--- /dev/null
+++ b/spring-boot-modules/spring-boot-aws/src/main/java/com/baeldung/aws/data/User.java
@@ -0,0 +1,38 @@
+package com.baeldung.aws.data;
+
+public class User {
+
+    private String name;
+    private String surname;
+    private String emailAddress;
+
+    public User(String name, String surname, String emailAddress) {
+        this.name = name;
+        this.surname = surname;
+        this.emailAddress = emailAddress;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSurname() {
+        return surname;
+    }
+
+    public void setSurname(String surname) {
+        this.surname = surname;
+    }
+
+    public String getEmailAddress() {
+        return emailAddress;
+    }
+
+    public void setEmailAddress(String emailAddress) {
+        this.emailAddress = emailAddress;
+    }
+}
diff --git a/spring-boot-modules/spring-boot-aws/src/main/java/com/baeldung/aws/handler/AsynchronousLambdaHandler.java b/spring-boot-modules/spring-boot-aws/src/main/java/com/baeldung/aws/handler/AsynchronousLambdaHandler.java
new file mode 100644
index 0000000000..30ffd2b17f
--- /dev/null
+++ b/spring-boot-modules/spring-boot-aws/src/main/java/com/baeldung/aws/handler/AsynchronousLambdaHandler.java
@@ -0,0 +1,25 @@
+package com.baeldung.aws.handler;
+
+import com.amazonaws.serverless.exceptions.ContainerInitializationException;
+import com.amazonaws.serverless.proxy.model.AwsProxyRequest;
+import com.amazonaws.serverless.proxy.model.AwsProxyResponse;
+import com.amazonaws.serverless.proxy.spring.SpringBootLambdaContainerHandler;
+import com.amazonaws.serverless.proxy.spring.SpringBootProxyHandlerBuilder;
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import com.baeldung.aws.Application;
+
+public class AsynchronousLambdaHandler implements RequestHandler<AwsProxyRequest, AwsProxyResponse> {
+    private SpringBootLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> handler;
+
+    public AsynchronousLambdaHandler() throws ContainerInitializationException {
+        handler = (SpringBootLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse>) new SpringBootProxyHandlerBuilder().springBootApplication(Application.class)
+          .asyncInit()
+          .buildAndInitialize();
+    }
+
+    @Override
+    public AwsProxyResponse handleRequest(AwsProxyRequest input, Context context) {
+        return handler.proxy(input, context);
+    }
+}
diff --git a/spring-boot-modules/spring-boot-aws/src/main/java/com/baeldung/aws/handler/HttpV2LambdaHandler.java b/spring-boot-modules/spring-boot-aws/src/main/java/com/baeldung/aws/handler/HttpV2LambdaHandler.java
new file mode 100644
index 0000000000..a6fbe29695
--- /dev/null
+++ b/spring-boot-modules/spring-boot-aws/src/main/java/com/baeldung/aws/handler/HttpV2LambdaHandler.java
@@ -0,0 +1,26 @@
+package com.baeldung.aws.handler;
+
+import com.amazonaws.serverless.exceptions.ContainerInitializationException;
+import com.amazonaws.serverless.proxy.model.AwsProxyResponse;
+import com.amazonaws.serverless.proxy.model.HttpApiV2ProxyRequest;
+import com.amazonaws.serverless.proxy.spring.SpringBootLambdaContainerHandler;
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import com.baeldung.aws.Application;
+
+public class HttpV2LambdaHandler implements RequestHandler<HttpApiV2ProxyRequest, AwsProxyResponse> {
+    private static SpringBootLambdaContainerHandler<HttpApiV2ProxyRequest, AwsProxyResponse> handler;
+
+    static {
+        try {
+            handler = SpringBootLambdaContainerHandler.getHttpApiV2ProxyHandler(Application.class);
+        } catch (ContainerInitializationException ex) {
+            throw new RuntimeException("Unable to load spring boot application", ex);
+        }
+    }
+
+    @Override
+    public AwsProxyResponse handleRequest(HttpApiV2ProxyRequest input, Context context) {
+        return handler.proxy(input, context);
+    }
+}
diff --git a/spring-boot-modules/spring-boot-aws/src/main/java/com/baeldung/aws/handler/LambdaHandler.java b/spring-boot-modules/spring-boot-aws/src/main/java/com/baeldung/aws/handler/LambdaHandler.java
new file mode 100644
index 0000000000..887cbd3a26
--- /dev/null
+++ b/spring-boot-modules/spring-boot-aws/src/main/java/com/baeldung/aws/handler/LambdaHandler.java
@@ -0,0 +1,26 @@
+package com.baeldung.aws.handler;
+
+import com.amazonaws.serverless.exceptions.ContainerInitializationException;
+import com.amazonaws.serverless.proxy.model.AwsProxyRequest;
+import com.amazonaws.serverless.proxy.model.AwsProxyResponse;
+import com.amazonaws.serverless.proxy.spring.SpringBootLambdaContainerHandler;
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import com.baeldung.aws.Application;
+
+public class LambdaHandler implements RequestHandler<AwsProxyRequest, AwsProxyResponse> {
+    private static SpringBootLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> handler;
+
+    static {
+        try {
+            handler = SpringBootLambdaContainerHandler.getAwsProxyHandler(Application.class);
+        } catch (ContainerInitializationException ex) {
+            throw new RuntimeException("Unable to load spring boot application", ex);
+        }
+    }
+
+    @Override
+    public AwsProxyResponse handleRequest(AwsProxyRequest input, Context context) {
+        return handler.proxy(input, context);
+    }
+}
diff --git a/spring-boot-modules/spring-boot-aws/src/main/resources/application.properties b/spring-boot-modules/spring-boot-aws/src/main/resources/application.properties
new file mode 100644
index 0000000000..b7e7157b35
--- /dev/null
+++ b/spring-boot-modules/spring-boot-aws/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+spring.datasource.url=jdbc:mysql://localhost:3306/mydatabase
+spring.datasource.username=myusername
+spring.datasource.password=mypassword
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-aws/src/test/java/com/baeldung/ProfileIntegrationTest.java b/spring-boot-modules/spring-boot-aws/src/test/java/com/baeldung/ProfileIntegrationTest.java
new file mode 100644
index 0000000000..adab61e916
--- /dev/null
+++ b/spring-boot-modules/spring-boot-aws/src/test/java/com/baeldung/ProfileIntegrationTest.java
@@ -0,0 +1,36 @@
+package com.baeldung;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import com.amazonaws.serverless.proxy.internal.testutils.AwsProxyRequestBuilder;
+import com.amazonaws.serverless.proxy.internal.testutils.MockLambdaContext;
+import com.amazonaws.serverless.proxy.model.AwsProxyRequest;
+import com.amazonaws.serverless.proxy.model.AwsProxyResponse;
+import com.baeldung.aws.handler.LambdaHandler;
+
+@SpringBootApplication
+public class ProfileIntegrationTest {
+
+    MockLambdaContext lambdaContext = new MockLambdaContext();
+
+    @Test
+    void whenTheUsersPathIsInvokedViaLambda_thenShouldReturnAList() throws IOException {
+        LambdaHandler lambdaHandler = new LambdaHandler();
+        AwsProxyRequest req = new AwsProxyRequestBuilder("/api/v1/users", "GET").build();
+        AwsProxyResponse resp = lambdaHandler.handleRequest(req, lambdaContext);
+        Assertions.assertNotNull(resp.getBody());
+        Assertions.assertEquals(200, resp.getStatusCode());
+    }
+
+    @Test
+    void whenWrongPathPathIsInvokedViaLambda_thenShouldNotFound() throws IOException {
+        LambdaHandler lambdaHandler = new LambdaHandler();
+        AwsProxyRequest req = new AwsProxyRequestBuilder("/api/v1/users/plus-one-level", "GET").build();
+        AwsProxyResponse resp = lambdaHandler.handleRequest(req, lambdaContext);
+        Assertions.assertEquals(404, resp.getStatusCode());
+    }
+}
diff --git a/spring-boot-modules/spring-boot-aws/template.yaml b/spring-boot-modules/spring-boot-aws/template.yaml
new file mode 100644
index 0000000000..09880594c8
--- /dev/null
+++ b/spring-boot-modules/spring-boot-aws/template.yaml
@@ -0,0 +1,32 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+
+Globals:
+  Function:
+    Timeout: 30
+
+Resources:
+  ProfileApiFunction:
+    Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+    Properties:
+      CodeUri: .
+      Handler: com.baeldung.aws.handler.LambdaHandler::handleRequest
+      Runtime: java11
+      AutoPublishAlias: production
+      SnapStart:
+        ApplyOn: PublishedVersions
+      Architectures:
+        - x86_64
+      MemorySize: 2048
+      Environment: # More info about Env Vars: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object
+        Variables:
+          JAVA_TOOL_OPTIONS: -XX:+TieredCompilation -XX:TieredStopAtLevel=1 # More info about tiered compilation https://aws.amazon.com/blogs/compute/optimizing-aws-lambda-function-performance-for-java/
+      Policies:
+        - AWSSecretsManagerGetSecretValuePolicy:
+            SecretArn: !Sub arn:aws:secretsmanager:${AWS::Region}:${AWS::AccountId}:secret:${DatabaseSecretName}
+      Events:
+        HelloWorld:
+          Type: Api # More info about API Event Source: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+          Properties:
+            Path: /{proxy+}
+            Method: ANY
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-cli/README.md b/spring-boot-modules/spring-boot-cli/README.md
index 79e259c855..4ed50d3f56 100644
--- a/spring-boot-modules/spring-boot-cli/README.md
+++ b/spring-boot-modules/spring-boot-cli/README.md
@@ -4,3 +4,4 @@ This module contains articles about Spring Boot CLI
 
 ### Relevant Articles: 
 - [Introduction to Spring Boot CLI](https://www.baeldung.com/spring-boot-cli)
+- [Encode Passwords With Spring Boot CLI](https://www.baeldung.com/spring-boot-cli-encode-passwords)
diff --git a/spring-boot-modules/spring-boot-cli/pom.xml b/spring-boot-modules/spring-boot-cli/pom.xml
new file mode 100644
index 0000000000..d2c50590ab
--- /dev/null
+++ b/spring-boot-modules/spring-boot-cli/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>spring-boot-cli</artifactId>
+    <name>spring-boot-cli</name>
+    <packaging>jar</packaging>
+    <description></description>
+
+    <parent>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-cli/src/main/java/com/baeldung/Application.java b/spring-boot-modules/spring-boot-cli/src/main/java/com/baeldung/Application.java
new file mode 100644
index 0000000000..c0490d50c6
--- /dev/null
+++ b/spring-boot-modules/spring-boot-cli/src/main/java/com/baeldung/Application.java
@@ -0,0 +1,12 @@
+package com.baeldung;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+}
diff --git a/spring-boot-modules/spring-boot-cli/src/main/java/com/baeldung/controller/LoginController.java b/spring-boot-modules/spring-boot-cli/src/main/java/com/baeldung/controller/LoginController.java
new file mode 100644
index 0000000000..b678f63623
--- /dev/null
+++ b/spring-boot-modules/spring-boot-cli/src/main/java/com/baeldung/controller/LoginController.java
@@ -0,0 +1,13 @@
+package com.baeldung.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class LoginController {
+
+    @GetMapping("/")
+    public String hello() {
+        return "Hello World!";
+    }
+}
diff --git a/spring-boot-modules/spring-boot-cli/src/main/resources/application.properties b/spring-boot-modules/spring-boot-cli/src/main/resources/application.properties
new file mode 100644
index 0000000000..4b341094a1
--- /dev/null
+++ b/spring-boot-modules/spring-boot-cli/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+spring.security.user.name=baeldung
+# Encoded password with SpringBoot CLI, the decoded password is baeldungPassword
+spring.security.user.password={bcrypt}$2y$10$R8VIwFiQ7aUST17YqMaWJuxjkCYqk3jjPlSxyDLLzqCTOwFuJNq2a
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-cli/src/test/java/com/baeldung/encoding/PasswordEncodingUnitTest.java b/spring-boot-modules/spring-boot-cli/src/test/java/com/baeldung/encoding/PasswordEncodingUnitTest.java
new file mode 100644
index 0000000000..8939029f71
--- /dev/null
+++ b/spring-boot-modules/spring-boot-cli/src/test/java/com/baeldung/encoding/PasswordEncodingUnitTest.java
@@ -0,0 +1,51 @@
+package com.baeldung.encoding;
+
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic;
+import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@AutoConfigureMockMvc
+public class PasswordEncodingUnitTest {
+    private final static String userName = "baeldung";
+    private final static String passwordDecoded = "baeldungPassword";
+
+    private MockMvc mvc;
+
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+
+    @Before
+    public void setup() {
+        mvc = MockMvcBuilders.webAppContextSetup(webApplicationContext)
+          .apply(springSecurity())
+          .build();
+    }
+
+    @Test
+    public void givenRequestWithWrongPassword_shouldFailWith401() throws Exception {
+        mvc.perform(get("/").with(httpBasic(userName, "wrongPassword")))
+          .andExpect(status().isUnauthorized());
+
+    }
+
+    @Test
+    public void givenRequestWithCorrectDecodedPassword_houldSucceedWith200() throws Exception {
+        mvc.perform(get("/").with(httpBasic(userName, passwordDecoded)))
+          .andExpect(status().isOk());
+
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-data-3/README.md b/spring-boot-modules/spring-boot-data-3/README.md
index 3959894853..7130d25118 100644
--- a/spring-boot-modules/spring-boot-data-3/README.md
+++ b/spring-boot-modules/spring-boot-data-3/README.md
@@ -1,2 +1,4 @@
 ### Relevant Articles:
 - [Spring Data JPA – Run an App Without a Database](https://www.baeldung.com/spring-data-jpa-run-app-without-db)
+- [Integrate AWS Secrets Manager in Spring Boot](https://www.baeldung.com/spring-boot-integrate-aws-secrets-manager)
+- [Fix Spring Data JPA Exception: No Property Found for Type](https://www.baeldung.com/spring-data-jpa-exception-no-property-found-for-type)
diff --git a/spring-boot-modules/spring-boot-data-3/pom.xml b/spring-boot-modules/spring-boot-data-3/pom.xml
index cf53c25697..4903d2ea26 100644
--- a/spring-boot-modules/spring-boot-data-3/pom.xml
+++ b/spring-boot-modules/spring-boot-data-3/pom.xml
@@ -25,15 +25,29 @@
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
+            <groupId>com.amazonaws.secretsmanager</groupId>
+            <artifactId>aws-secretsmanager-jdbc</artifactId>
+            <version>${aws.secrets.manager.jdbc}</version>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.awspring.cloud</groupId>
+            <artifactId>spring-cloud-starter-aws-secrets-manager-config</artifactId>
+            <version>${aws.secrets.manager.config}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -45,4 +59,9 @@
         </plugins>
     </build>
 
+    <properties>
+        <aws.secrets.manager.config>2.4.4</aws.secrets.manager.config>
+        <aws.secrets.manager.jdbc>1.0.11</aws.secrets.manager.jdbc>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/nopropertyfound/NoPropertyFoundApplication.java b/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/nopropertyfound/NoPropertyFoundApplication.java
new file mode 100644
index 0000000000..276df9535b
--- /dev/null
+++ b/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/nopropertyfound/NoPropertyFoundApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.nopropertyfound;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class NoPropertyFoundApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(NoPropertyFoundApplication.class, args);
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/nopropertyfound/config/DbConfig.java b/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/nopropertyfound/config/DbConfig.java
new file mode 100644
index 0000000000..9a589e55a3
--- /dev/null
+++ b/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/nopropertyfound/config/DbConfig.java
@@ -0,0 +1,20 @@
+package com.baeldung.nopropertyfound.config;
+
+import javax.sql.DataSource;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class DbConfig {
+
+    @Bean
+    @ConfigurationProperties(prefix = "h2.datasource")
+    public DataSource dataSource() {
+        return DataSourceBuilder.create()
+            .build();
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/nopropertyfound/model/Person.java b/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/nopropertyfound/model/Person.java
new file mode 100644
index 0000000000..3392d3ec67
--- /dev/null
+++ b/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/nopropertyfound/model/Person.java
@@ -0,0 +1,41 @@
+package com.baeldung.nopropertyfound.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Person {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private int id;
+    private String firstName;
+    private String lastName;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/nopropertyfound/repository/PersonRepository.java b/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/nopropertyfound/repository/PersonRepository.java
new file mode 100644
index 0000000000..900c391c93
--- /dev/null
+++ b/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/nopropertyfound/repository/PersonRepository.java
@@ -0,0 +1,15 @@
+package com.baeldung.nopropertyfound.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.baeldung.nopropertyfound.model.Person;
+
+@Repository
+public interface PersonRepository extends JpaRepository<Person, Integer> {
+
+    // findByFirsttName will cause Spring Data to throw PropertyReferenceException
+    // Person findByFirsttName(String firstName);
+    Person findByFirstName(String firstName);
+
+}
diff --git a/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/startdbwithawssecretsmanager/StartWithAWSSecretsManagerApplication.java b/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/startdbwithawssecretsmanager/StartWithAWSSecretsManagerApplication.java
new file mode 100644
index 0000000000..0bcbef7729
--- /dev/null
+++ b/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/startdbwithawssecretsmanager/StartWithAWSSecretsManagerApplication.java
@@ -0,0 +1,29 @@
+package com.baeldung.startdbwithawssecretsmanager;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Profile;
+
+import javax.annotation.PostConstruct;
+
+@SpringBootApplication
+@Profile("aws")
+public class StartWithAWSSecretsManagerApplication {
+    @Value("${api-key1}")
+    private String apiKeyValue1;
+
+    @Value("${api-key2}")
+    private String apiKeyValue2;
+
+    @PostConstruct
+    private void postConstruct() {
+        System.out.println(apiKeyValue1);
+        System.out.println(apiKeyValue2);
+    }
+
+    public static void main(String[] args) {
+        SpringApplication.run(StartWithAWSSecretsManagerApplication.class, args);
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/startdbwithawssecretsmanager/controller/UserController.java b/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/startdbwithawssecretsmanager/controller/UserController.java
new file mode 100644
index 0000000000..08745db3f0
--- /dev/null
+++ b/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/startdbwithawssecretsmanager/controller/UserController.java
@@ -0,0 +1,38 @@
+package com.baeldung.startdbwithawssecretsmanager.controller;
+
+import com.baeldung.startdbwithawssecretsmanager.model.UserEntity;
+import com.baeldung.startdbwithawssecretsmanager.repository.UserRepository;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("users")
+public class UserController {
+
+    private final UserRepository userRepository;
+
+    public UserController(UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+
+    @GetMapping(value = "/{id}", produces = "application/json")
+    public @ResponseBody UserEntity getUser(@PathVariable Long id) {
+        return userRepository.findById(id).get();
+    }
+
+    @PostMapping
+    public UserEntity createUser(@RequestBody UserEntity userEntity) {
+        return userRepository.save(userEntity);
+    }
+
+    @DeleteMapping(value = "/{id}")
+    public void removeUser(@PathVariable Long id) {
+        userRepository.deleteById(id);
+    }
+}
diff --git a/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/startdbwithawssecretsmanager/model/UserEntity.java b/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/startdbwithawssecretsmanager/model/UserEntity.java
new file mode 100644
index 0000000000..285e7094dd
--- /dev/null
+++ b/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/startdbwithawssecretsmanager/model/UserEntity.java
@@ -0,0 +1,40 @@
+package com.baeldung.startdbwithawssecretsmanager.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class UserEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    private String name;
+
+    public UserEntity() {
+    }
+
+    public UserEntity(Long id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/startdbwithawssecretsmanager/repository/UserRepository.java b/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/startdbwithawssecretsmanager/repository/UserRepository.java
new file mode 100644
index 0000000000..e2abfe88e6
--- /dev/null
+++ b/spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/startdbwithawssecretsmanager/repository/UserRepository.java
@@ -0,0 +1,10 @@
+package com.baeldung.startdbwithawssecretsmanager.repository;
+
+import com.baeldung.startdbwithawssecretsmanager.model.UserEntity;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UserRepository
+        extends CrudRepository<UserEntity, Long> {
+}
diff --git a/spring-boot-modules/spring-boot-data-3/src/main/resources/application-aws.properties b/spring-boot-modules/spring-boot-data-3/src/main/resources/application-aws.properties
new file mode 100644
index 0000000000..07c4b0a4d6
--- /dev/null
+++ b/spring-boot-modules/spring-boot-data-3/src/main/resources/application-aws.properties
@@ -0,0 +1,9 @@
+spring.datasource.driver-class-name=com.amazonaws.secretsmanager.sql.AWSSecretsManagerMySQLDriver
+spring.jpa.database-platform=org.hibernate.dialect.MySQL5Dialect
+spring.datasource.url=jdbc-secretsmanager:mysql://database-1.cwhqvgjbpgfw.eu-central-1.rds.amazonaws.com:3306/test
+spring.datasource.username=rds/credentials
+
+#Overwriting application.properties configuration back to default.
+spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=true
+
+spring.config.import=aws-secretsmanager:test/secret/
diff --git a/spring-boot-modules/spring-boot-data-3/src/main/resources/application.properties b/spring-boot-modules/spring-boot-data-3/src/main/resources/application.properties
index cbe044134f..71f39e0ee3 100644
--- a/spring-boot-modules/spring-boot-data-3/src/main/resources/application.properties
+++ b/spring-boot-modules/spring-boot-data-3/src/main/resources/application.properties
@@ -4,4 +4,9 @@ spring.datasource.username=root
 spring.datasource.password=root
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
 spring.jpa.hibernate.ddl-auto=none
-spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false
\ No newline at end of file
+spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false
+
+h2.datasource.url=jdbc:h2:mem:testdb
+h2.datasource.driver-class-name=org.h2.Driver
+h2.datasource.username=sa
+h2.datasource.password=
diff --git a/spring-boot-modules/spring-boot-data-3/src/main/resources/data.sql b/spring-boot-modules/spring-boot-data-3/src/main/resources/data.sql
new file mode 100644
index 0000000000..5623bbfadf
--- /dev/null
+++ b/spring-boot-modules/spring-boot-data-3/src/main/resources/data.sql
@@ -0,0 +1,3 @@
+INSERT INTO person (first_name, last_name) VALUES('Azhrioun', 'Abderrahim');
+INSERT INTO person (first_name, last_name) VALUES('Brian', 'Wheeler');
+INSERT INTO person (first_name, last_name) VALUES('Dave', 'Anderson');
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-data-3/src/main/resources/schema.sql b/spring-boot-modules/spring-boot-data-3/src/main/resources/schema.sql
new file mode 100644
index 0000000000..738ef25298
--- /dev/null
+++ b/spring-boot-modules/spring-boot-data-3/src/main/resources/schema.sql
@@ -0,0 +1,6 @@
+DROP TABLE IF EXISTS person;
+CREATE TABLE person(
+	id INT AUTO_INCREMENT PRIMARY KEY,
+	first_name VARCHAR(200),
+	last_name VARCHAR(200)
+)
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-data-3/src/test/java/com/baeldung/nopropertyfound/PersonRepositoryIntegrationTest.java b/spring-boot-modules/spring-boot-data-3/src/test/java/com/baeldung/nopropertyfound/PersonRepositoryIntegrationTest.java
new file mode 100644
index 0000000000..2a9d1a46f2
--- /dev/null
+++ b/spring-boot-modules/spring-boot-data-3/src/test/java/com/baeldung/nopropertyfound/PersonRepositoryIntegrationTest.java
@@ -0,0 +1,28 @@
+package com.baeldung.nopropertyfound;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+
+import com.baeldung.nopropertyfound.model.Person;
+import com.baeldung.nopropertyfound.repository.PersonRepository;
+
+@DataJpaTest
+class PersonRepositoryIntegrationTest {
+
+    @Autowired
+    private PersonRepository personRepository;
+
+    @Test
+    void givenQueryMethod_whenUsingValidProperty_thenCorrect() {
+
+        Person person = personRepository.findByFirstName("Azhrioun");
+
+        assertNotNull(person);
+        assertEquals("Abderrahim", person.getLastName());
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-data/pom.xml b/spring-boot-modules/spring-boot-data/pom.xml
index b69d0e093a..4bb1d28850 100644
--- a/spring-boot-modules/spring-boot-data/pom.xml
+++ b/spring-boot-modules/spring-boot-data/pom.xml
@@ -45,6 +45,16 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-controls</artifactId>
+            <version>${javafx.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-fxml</artifactId>
+            <version>${javafx.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -89,10 +99,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${source.version}</source>
-                    <target>${target.version}</target>
-                </configuration>
             </plugin>
         </plugins>
     </build>
@@ -113,10 +119,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
-                        <configuration>
-                            <source>${source.version}</source>
-                            <target>${target.version}</target>
-                        </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -148,10 +150,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
-                        <configuration>
-                            <source>${source.version}</source>
-                            <target>${target.version}</target>
-                        </configuration>
                     </plugin>
                 </plugins>
             </build>
@@ -160,8 +158,7 @@
 
     <properties>
         <git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
-        <source.version>1.8</source.version>
-        <target.version>1.8</target.version>
+        <javafx.version>19</javafx.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-environment/README.md b/spring-boot-modules/spring-boot-environment/README.md
index 687322938e..c3e1866491 100644
--- a/spring-boot-modules/spring-boot-environment/README.md
+++ b/spring-boot-modules/spring-boot-environment/README.md
@@ -7,3 +7,4 @@ This module contains articles about configuring the Spring Boot `Environment`
  - [Spring Properties File Outside jar](https://www.baeldung.com/spring-properties-file-outside-jar)
  - [Get the Running Port in Spring Boot](https://www.baeldung.com/spring-boot-running-port)
  - [Environment Variable Prefixes in Spring Boot 2.5](https://www.baeldung.com/spring-boot-env-variable-prefixes)
+ - [Spring Profiles](http://www.baeldung.com/spring-profiles)
diff --git a/spring-boot-modules/spring-boot-environment/pom.xml b/spring-boot-modules/spring-boot-environment/pom.xml
index 3ea591f561..013156fa7f 100644
--- a/spring-boot-modules/spring-boot-environment/pom.xml
+++ b/spring-boot-modules/spring-boot-environment/pom.xml
@@ -133,8 +133,23 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <spring.profiles.active>prod</spring.profiles.active>
+            </properties>
+        </profile>
     </profiles>
-
+    
     <properties>
         <jpa.version>2.2</jpa.version>
         <subethasmtp.version>3.1.7</subethasmtp.version>
diff --git a/spring-core-2/src/main/java/com/baeldung/profiles/DatasourceConfig.java b/spring-boot-modules/spring-boot-environment/src/main/java/com/baeldung/profiles/DatasourceConfig.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/profiles/DatasourceConfig.java
rename to spring-boot-modules/spring-boot-environment/src/main/java/com/baeldung/profiles/DatasourceConfig.java
diff --git a/spring-core-2/src/main/java/com/baeldung/profiles/DevDatasourceConfig.java b/spring-boot-modules/spring-boot-environment/src/main/java/com/baeldung/profiles/DevDatasourceConfig.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/profiles/DevDatasourceConfig.java
rename to spring-boot-modules/spring-boot-environment/src/main/java/com/baeldung/profiles/DevDatasourceConfig.java
diff --git a/spring-core-2/src/main/java/com/baeldung/profiles/ProductionDatasourceConfig.java b/spring-boot-modules/spring-boot-environment/src/main/java/com/baeldung/profiles/ProductionDatasourceConfig.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/profiles/ProductionDatasourceConfig.java
rename to spring-boot-modules/spring-boot-environment/src/main/java/com/baeldung/profiles/ProductionDatasourceConfig.java
diff --git a/spring-core-2/src/main/java/com/baeldung/profiles/ProfileManager.java b/spring-boot-modules/spring-boot-environment/src/main/java/com/baeldung/profiles/ProfileManager.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/profiles/ProfileManager.java
rename to spring-boot-modules/spring-boot-environment/src/main/java/com/baeldung/profiles/ProfileManager.java
diff --git a/spring-core-2/src/main/java/com/baeldung/profiles/SpringProfilesConfig.java b/spring-boot-modules/spring-boot-environment/src/main/java/com/baeldung/profiles/SpringProfilesConfig.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/profiles/SpringProfilesConfig.java
rename to spring-boot-modules/spring-boot-environment/src/main/java/com/baeldung/profiles/SpringProfilesConfig.java
diff --git a/spring-boot-modules/spring-boot-environment/src/main/resources/application.properties b/spring-boot-modules/spring-boot-environment/src/main/resources/application.properties
index 4ffb414e92..8333184f1e 100644
--- a/spring-boot-modules/spring-boot-environment/src/main/resources/application.properties
+++ b/spring-boot-modules/spring-boot-environment/src/main/resources/application.properties
@@ -4,4 +4,34 @@ management.metrics.enable.jvm=true
 management.endpoint.restart.enabled=true
 spring.datasource.tomcat.jmx-enabled=false
 management.endpoint.shutdown.enabled=true
-spring.config.import=file:./additional.properties,optional:file:/Users/home/config/jdbc.properties
\ No newline at end of file
+spring.config.import=file:./additional.properties,optional:file:/Users/home/config/jdbc.properties
+
+#---
+spring.profiles.active=@spring.profiles.active@
+
+my.prop=used-always-in-all-profiles
+
+#---
+spring.config.activate.on-profile=dev
+#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+#spring.datasource.url=jdbc:mysql://localhost:3306/db
+#spring.datasource.username=root
+#spring.datasource.password=root
+
+#---
+spring.config.activate.on-profile=production
+#spring.datasource.driver-class-name=org.h2.Driver
+#spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
+#spring.datasource.username=sa
+#spring.datasource.password=sa
+
+#---
+spring.profiles.group.production=proddb,prodquartz
+
+#---
+spring.config.activate.on-profile=proddb
+db=url_to_production_db
+
+#---
+spring.config.activate.on-profile=prodquartz
+quartz=url_to_quartz_scheduler
\ No newline at end of file
diff --git a/spring-core-2/src/main/resources/springProfiles-config.xml b/spring-boot-modules/spring-boot-environment/src/main/resources/springProfiles-config.xml
similarity index 100%
rename from spring-core-2/src/main/resources/springProfiles-config.xml
rename to spring-boot-modules/spring-boot-environment/src/main/resources/springProfiles-config.xml
diff --git a/spring-core-2/src/test/java/com/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java b/spring-boot-modules/spring-boot-environment/src/test/java/com/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java
rename to spring-boot-modules/spring-boot-environment/src/test/java/com/baeldung/profiles/DevProfileWithAnnotationIntegrationTest.java
diff --git a/spring-core-2/src/test/java/com/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java b/spring-boot-modules/spring-boot-environment/src/test/java/com/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java
rename to spring-boot-modules/spring-boot-environment/src/test/java/com/baeldung/profiles/ProductionProfileWithAnnotationIntegrationTest.java
diff --git a/spring-core-2/src/test/java/com/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java b/spring-boot-modules/spring-boot-environment/src/test/java/com/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java
rename to spring-boot-modules/spring-boot-environment/src/test/java/com/baeldung/profiles/SpringProfilesWithMavenPropertiesIntegrationTest.java
diff --git a/spring-core-2/src/test/java/com/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java b/spring-boot-modules/spring-boot-environment/src/test/java/com/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java
rename to spring-boot-modules/spring-boot-environment/src/test/java/com/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java
diff --git a/spring-boot-modules/spring-boot-keycloak-2/README.md b/spring-boot-modules/spring-boot-keycloak-2/README.md
index d372132a6a..e4f8b1904b 100644
--- a/spring-boot-modules/spring-boot-keycloak-2/README.md
+++ b/spring-boot-modules/spring-boot-keycloak-2/README.md
@@ -4,3 +4,4 @@ This module contains articles about Keycloak in Spring Boot projects.
 
 ## Relevant articles:
 - [Disabling Keycloak Security in Spring Boot](https://www.baeldung.com/spring-keycloak-security-disable)
+- [Search Users With Keycloak in Java](https://www.baeldung.com/java-keycloak-search-users)
diff --git a/spring-boot-modules/spring-boot-keycloak-2/pom.xml b/spring-boot-modules/spring-boot-keycloak-2/pom.xml
index a119a09561..572986e8c4 100644
--- a/spring-boot-modules/spring-boot-keycloak-2/pom.xml
+++ b/spring-boot-modules/spring-boot-keycloak-2/pom.xml
@@ -16,18 +16,10 @@
         <version>0.0.1-SNAPSHOT</version>
         <relativePath>../../parent-boot-2</relativePath>
     </parent>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.keycloak.bom</groupId>
-                <artifactId>keycloak-adapter-bom</artifactId>
-                <version>${keycloak-adapter-bom.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+    
+    <properties>
+    	<keycloak.version>21.0.1</keycloak.version>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -39,14 +31,53 @@
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-spring-boot-starter</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-oauth2-client</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.keycloak/keycloak-admin-client -->
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-admin-client</artifactId>
+            <version>${keycloak.version}</version>
+	    </dependency>
+	
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-core</artifactId>
+            <scope>provided</scope>
+            <version>${keycloak.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-server-spi</artifactId>
+            <version>${keycloak.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-server-spi-private</artifactId>
+            <scope>provided</scope>
+            <version>${keycloak.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-services</artifactId>
+            <scope>provided</scope>
+            <version>${keycloak.version}</version>
+        </dependency>
+
+
     </dependencies>
 
     <build>
@@ -58,8 +89,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <keycloak-adapter-bom.version>15.0.2</keycloak-adapter-bom.version>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/disablingkeycloak/KeycloakConfiguration.java b/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/disablingkeycloak/KeycloakConfiguration.java
deleted file mode 100644
index a9a2ea6a18..0000000000
--- a/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/disablingkeycloak/KeycloakConfiguration.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.baeldung.disablingkeycloak;
-
-import org.keycloak.adapters.springboot.KeycloakSpringBootConfigResolver;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class KeycloakConfiguration {
-
-    @Bean
-    public KeycloakSpringBootConfigResolver keycloakConfigResolver() {
-        return new KeycloakSpringBootConfigResolver();
-    }
-}
diff --git a/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/disablingkeycloak/KeycloakSecurityConfig.java b/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/disablingkeycloak/KeycloakSecurityConfig.java
index d48c99d8fd..b41b64077c 100644
--- a/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/disablingkeycloak/KeycloakSecurityConfig.java
+++ b/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/disablingkeycloak/KeycloakSecurityConfig.java
@@ -1,38 +1,34 @@
 package com.baeldung.disablingkeycloak;
 
-import org.keycloak.adapters.springsecurity.KeycloakConfiguration;
-import org.keycloak.adapters.springsecurity.config.KeycloakWebSecurityConfigurerAdapter;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.web.authentication.session.NullAuthenticatedSessionStrategy;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
+import org.springframework.security.core.session.SessionRegistryImpl;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.session.RegisterSessionAuthenticationStrategy;
 import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy;
 
-@KeycloakConfiguration
+@Configuration
+@EnableWebSecurity
 @ConditionalOnProperty(name = "keycloak.enabled", havingValue = "true", matchIfMissing = true)
-public class KeycloakSecurityConfig extends KeycloakWebSecurityConfigurerAdapter {
+public class KeycloakSecurityConfig {
 
-    @Autowired
-    public void configureGlobal(AuthenticationManagerBuilder auth) {
-        auth.authenticationProvider(keycloakAuthenticationProvider());
+    @Bean
+    protected SessionAuthenticationStrategy sessionAuthenticationStrategy() {
+        return new RegisterSessionAuthenticationStrategy(new SessionRegistryImpl());
     }
 
     @Bean
-    @Override
-    protected SessionAuthenticationStrategy sessionAuthenticationStrategy() {
-        return new NullAuthenticatedSessionStrategy();
-    }
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        super.configure(http);
-
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
         http.csrf()
             .disable()
-            .authorizeRequests()
-            .anyRequest()
-            .authenticated();
+            .authorizeHttpRequests(auth -> auth.anyRequest()
+                .authenticated());
+        http.oauth2Login();
+        http.oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt);
+        return http.build();
     }
 }
diff --git a/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/keycloak/adminclient/AdminClientService.java b/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/keycloak/adminclient/AdminClientService.java
new file mode 100644
index 0000000000..bacca9bdea
--- /dev/null
+++ b/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/keycloak/adminclient/AdminClientService.java
@@ -0,0 +1,90 @@
+package com.baeldung.keycloak.adminclient;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.PostConstruct;
+
+import org.keycloak.admin.client.Keycloak;
+import org.keycloak.representations.idm.UserRepresentation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AdminClientService {
+
+    private static final Logger logger = LoggerFactory.getLogger(AdminClientService.class);
+    private static final String REALM_NAME = "master";
+
+    @Autowired
+    private Keycloak keycloak;
+
+    @PostConstruct
+    public void searchUsers() {
+        logger.info("Searching users in Keycloak {}", keycloak.serverInfo()
+          .getInfo()
+          .getSystemInfo()
+          .getVersion());
+        searchByUsername("user1", true);
+        searchByUsername("user", false);
+        searchByUsername("1", false);
+        searchByEmail("user2@test.com", true);
+        searchByAttributes("DOB:2000-01-05");
+        searchByGroup("c67643fb-514e-488a-a4b4-5c0bdf2e7477");
+        searchByRole("user");
+    }
+
+    private void searchByUsername(String username, boolean exact) {
+        logger.info("Searching by username: {} (exact {})", username, exact);
+        List<UserRepresentation> users = keycloak.realm(REALM_NAME)
+          .users()
+          .searchByUsername(username, exact);
+        logger.info("Users found by username {}", users.stream()
+          .map(user -> user.getUsername())
+          .collect(Collectors.toList()));
+    }
+
+    private void searchByEmail(String email, boolean exact) {
+        logger.info("Searching by email: {} (exact {})", email, exact);
+        List<UserRepresentation> users = keycloak.realm(REALM_NAME)
+          .users()
+          .searchByEmail(email, exact);
+        logger.info("Users found by email {}", users.stream()
+          .map(user -> user.getEmail())
+          .collect(Collectors.toList()));
+    }
+
+    private void searchByAttributes(String query) {
+        logger.info("Searching by attributes: {}", query);
+        List<UserRepresentation> users = keycloak.realm(REALM_NAME)
+          .users()
+          .searchByAttributes(query);
+        logger.info("Users found by attributes {}", users.stream()
+          .map(user -> user.getUsername() + " " + user.getAttributes())
+          .collect(Collectors.toList()));
+    }
+
+    private void searchByGroup(String groupId) {
+        logger.info("Searching by group: {}", groupId);
+        List<UserRepresentation> users = keycloak.realm(REALM_NAME)
+          .groups()
+          .group(groupId)
+          .members();
+        logger.info("Users found by group {}", users.stream()
+          .map(user -> user.getUsername())
+          .collect(Collectors.toList()));
+    }
+
+    private void searchByRole(String roleName) {
+        logger.info("Searching by role: {}", roleName);
+        List<UserRepresentation> users = keycloak.realm(REALM_NAME)
+          .roles()
+          .get(roleName)
+          .getUserMembers();
+        logger.info("Users found by role {}", users.stream()
+          .map(user -> user.getUsername())
+          .collect(Collectors.toList()));
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/keycloak/adminclient/App.java b/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/keycloak/adminclient/App.java
new file mode 100644
index 0000000000..a863bde2e3
--- /dev/null
+++ b/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/keycloak/adminclient/App.java
@@ -0,0 +1,30 @@
+package com.baeldung.keycloak.adminclient;
+
+import org.keycloak.OAuth2Constants;
+import org.keycloak.admin.client.Keycloak;
+import org.keycloak.admin.client.KeycloakBuilder;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.PropertySource;
+
+@SpringBootApplication(scanBasePackages = { "com.baeldung.keycloak.adminclient" })
+@PropertySource("classpath:application-adminclient.properties")
+public class App {
+
+    public static void main(String[] args) {
+        SpringApplication.run(App.class, args);
+    }
+
+    @Bean
+    Keycloak keycloak() {
+        return KeycloakBuilder.builder()
+          .serverUrl("http://localhost:8080")
+          .realm("master")
+          .clientId("admin-cli")
+          .grantType(OAuth2Constants.PASSWORD)
+          .username("admin")
+          .password("password")
+          .build();
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/keycloak/customendpoint/KeycloakUserApiProvider.java b/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/keycloak/customendpoint/KeycloakUserApiProvider.java
new file mode 100644
index 0000000000..c34514104b
--- /dev/null
+++ b/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/keycloak/customendpoint/KeycloakUserApiProvider.java
@@ -0,0 +1,52 @@
+package com.baeldung.keycloak.customendpoint;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.GET;
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import org.keycloak.models.GroupModel;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.RealmModel;
+import org.keycloak.models.utils.ModelToRepresentation;
+import org.keycloak.representations.idm.UserRepresentation;
+import org.keycloak.services.resource.RealmResourceProvider;
+
+public class KeycloakUserApiProvider implements RealmResourceProvider {
+    private final KeycloakSession session;
+
+    public KeycloakUserApiProvider(KeycloakSession session) {
+        this.session = session;
+    }
+
+    public void close() {
+    }
+
+    public Object getResource() {
+        return this;
+    }
+
+    @GET
+    @Produces({ MediaType.APPLICATION_JSON })
+    public Stream<UserRepresentation> searchUsersByGroupAndRoleName(@QueryParam("groupName") @NotNull String groupName, @QueryParam("roleName") @NotBlank String roleName) {
+        RealmModel realm = session.getContext().getRealm();
+
+        Optional<GroupModel> groupByName = session.groups()
+          .getGroupsStream(realm)
+          .filter(group -> group.getName().equals(groupName))
+          .findAny();
+
+        GroupModel group = groupByName.orElseThrow(() -> new NotFoundException("Group not found with name " + groupName));
+
+        return session.users()
+          .getGroupMembersStream(realm, group)
+          .filter(user -> user.getRealmRoleMappingsStream().anyMatch(role -> role.getName().equals(roleName)))
+          .map(user -> ModelToRepresentation.toBriefRepresentation(user));
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/keycloak/customendpoint/KeycloakUserApiProviderFactory.java b/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/keycloak/customendpoint/KeycloakUserApiProviderFactory.java
new file mode 100644
index 0000000000..34eda94d6a
--- /dev/null
+++ b/spring-boot-modules/spring-boot-keycloak-2/src/main/java/com/baeldung/keycloak/customendpoint/KeycloakUserApiProviderFactory.java
@@ -0,0 +1,33 @@
+package com.baeldung.keycloak.customendpoint;
+
+import org.keycloak.Config.Scope;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.KeycloakSessionFactory;
+import org.keycloak.services.resource.RealmResourceProvider;
+import org.keycloak.services.resource.RealmResourceProviderFactory;
+
+public class KeycloakUserApiProviderFactory implements RealmResourceProviderFactory {
+    public static final String ID = "users-by-group-and-role-name";
+
+    @Override
+    public RealmResourceProvider create(KeycloakSession session) {
+        return new KeycloakUserApiProvider(session);
+    }
+
+    @Override
+    public void init(Scope config) {
+    }
+
+    @Override
+    public void postInit(KeycloakSessionFactory factory) {
+    }
+
+    @Override
+    public void close() {
+    }
+
+    @Override
+    public String getId() {
+        return ID;
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-keycloak-2/src/main/resources/META-INF/services/org.keycloak.services.resource.RealmResourceProviderFactory b/spring-boot-modules/spring-boot-keycloak-2/src/main/resources/META-INF/services/org.keycloak.services.resource.RealmResourceProviderFactory
new file mode 100644
index 0000000000..f11a60fd2b
--- /dev/null
+++ b/spring-boot-modules/spring-boot-keycloak-2/src/main/resources/META-INF/services/org.keycloak.services.resource.RealmResourceProviderFactory
@@ -0,0 +1 @@
+com.baeldung.keycloak.customendpoint.KeycloakUserApiProviderFactory
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-keycloak-2/src/main/resources/application-adminclient.properties b/spring-boot-modules/spring-boot-keycloak-2/src/main/resources/application-adminclient.properties
new file mode 100644
index 0000000000..bafddced85
--- /dev/null
+++ b/spring-boot-modules/spring-boot-keycloak-2/src/main/resources/application-adminclient.properties
@@ -0,0 +1 @@
+server.port=8081
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-keycloak-2/src/main/resources/application-disabling-keycloak.properties b/spring-boot-modules/spring-boot-keycloak-2/src/main/resources/application-disabling-keycloak.properties
index 21263cf725..1f08eac234 100644
--- a/spring-boot-modules/spring-boot-keycloak-2/src/main/resources/application-disabling-keycloak.properties
+++ b/spring-boot-modules/spring-boot-keycloak-2/src/main/resources/application-disabling-keycloak.properties
@@ -1,7 +1,10 @@
-# Keycloak authentication is enabled for production.
+server.port=8081
 keycloak.enabled=true
-keycloak.realm=SpringBootKeycloak
-keycloak.auth-server-url=http://localhost:8180/auth
-keycloak.resource=login-app
-keycloak.bearer-only=true
-keycloak.ssl-required=external
+
+spring.security.oauth2.client.registration.keycloak.client-id=login-app
+spring.security.oauth2.client.registration.keycloak.authorization-grant-type=authorization_code
+spring.security.oauth2.client.registration.keycloak.scope=openid
+spring.security.oauth2.client.provider.keycloak.issuer-uri=http://localhost:8080/realms/SpringBootKeycloak
+spring.security.oauth2.client.provider.keycloak.user-name-attribute=preferred_username
+
+spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:8080/realms/SpringBootKeycloak
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-keycloak/pom.xml b/spring-boot-modules/spring-boot-keycloak/pom.xml
index 34e93299ae..688b45d6d0 100644
--- a/spring-boot-modules/spring-boot-keycloak/pom.xml
+++ b/spring-boot-modules/spring-boot-keycloak/pom.xml
@@ -66,6 +66,11 @@
             <artifactId>spring-security-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${jaxb-runtime.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -77,7 +82,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxb2-maven-plugin</artifactId>
-                <version>2.3.1</version>
+                <version>${jaxb2-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>xjc</id>
@@ -99,6 +104,8 @@
     
      <properties>
         <start-class>com.baeldung.keycloak.SpringBoot</start-class>
+         <jaxb-runtime.version>4.0.0</jaxb-runtime.version>
+         <jaxb2-maven-plugin.version>2.5.0</jaxb2-maven-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-libraries-2/README.md b/spring-boot-modules/spring-boot-libraries-2/README.md
index 0da16a8204..5c6b93469d 100644
--- a/spring-boot-modules/spring-boot-libraries-2/README.md
+++ b/spring-boot-modules/spring-boot-libraries-2/README.md
@@ -9,4 +9,6 @@ This module contains articles about various Spring Boot libraries
 - [An Introduction to Kong](https://www.baeldung.com/kong)
 - [Scanning Java Annotations At Runtime](https://www.baeldung.com/java-scan-annotations-runtime)
 - [Guide to Resilience4j With Spring Boot](https://www.baeldung.com/spring-boot-resilience4j)  
-More articles: [[prev -->]](/spring-boot-modules/spring-boot-libraries)
+- [Using OpenAI ChatGPT APIs in Spring Boot](https://www.baeldung.com/spring-boot-chatgpt-api-openai)
+- [Introduction to Spring Modulith](https://www.baeldung.com/spring-modulith)
+- More articles: [[prev -->]](/spring-boot-modules/spring-boot-libraries)
diff --git a/spring-boot-modules/spring-boot-libraries-2/pom.xml b/spring-boot-modules/spring-boot-libraries-2/pom.xml
index 4409db0672..6d9401f4bc 100644
--- a/spring-boot-modules/spring-boot-libraries-2/pom.xml
+++ b/spring-boot-modules/spring-boot-libraries-2/pom.xml
@@ -11,6 +11,18 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.experimental</groupId>
+                <artifactId>spring-modulith-bom</artifactId>
+                <version>0.5.1</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -87,6 +99,15 @@
             <version>2.34.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.experimental</groupId>
+            <artifactId>spring-modulith-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.experimental</groupId>
+            <artifactId>spring-modulith-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/Application.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/Application.java
new file mode 100644
index 0000000000..a8c3e48661
--- /dev/null
+++ b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/Application.java
@@ -0,0 +1,21 @@
+package com.baeldung.modulith;
+
+import com.baeldung.modulith.product.ProductService;
+import com.baeldung.modulith.product.internal.Product;
+import org.jobrunr.autoconfigure.JobRunrAutoConfiguration;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+@EnableAsync
+@SpringBootApplication
+@EnableAutoConfiguration(exclude = { JobRunrAutoConfiguration.class})
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args)
+          .getBean(ProductService.class)
+          .create(new Product("baeldung", "course", 10));
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/NotificationDTO.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/NotificationDTO.java
new file mode 100644
index 0000000000..a8fb346daa
--- /dev/null
+++ b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/NotificationDTO.java
@@ -0,0 +1,39 @@
+package com.baeldung.modulith.notification;
+
+import java.util.Date;
+
+public class NotificationDTO {
+    private Date date;
+    private String format;
+    private String productName;
+
+    public NotificationDTO(Date date, String format, String productName) {
+        this.date = date;
+        this.format = format;
+        this.productName = productName;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public String getFormat() {
+        return format;
+    }
+
+    public void setFormat(String format) {
+        this.format = format;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+}
diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/NotificationService.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/NotificationService.java
new file mode 100644
index 0000000000..7789798bbe
--- /dev/null
+++ b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/NotificationService.java
@@ -0,0 +1,42 @@
+package com.baeldung.modulith.notification;
+
+import com.baeldung.modulith.notification.internal.Notification;
+import com.baeldung.modulith.notification.internal.NotificationType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.modulith.ApplicationModuleListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+@Service
+public class NotificationService {
+
+    private static final Logger LOG = LoggerFactory.getLogger(NotificationService.class);
+
+    public void createNotification(NotificationDTO notificationDTO) {
+        Notification notification = toEntity(notificationDTO);
+        LOG.info("Received notification by module dependency for product {} in date {} by {}.", notification.getProductName()
+          , notification.getDate(), notification.getFormat());
+    }
+
+    @Async
+    @ApplicationModuleListener
+    public void notificationEvent(NotificationDTO event) {
+        Notification notification = toEntity(event);
+        LOG.info("Received notification by event for product {} in date {} by {}.", notification.getProductName()
+          , notification.getDate(), notification.getFormat());
+    }
+
+    private Notification toEntity(NotificationDTO notificationDTO) {
+        Notification notification = new Notification();
+        notification.setDate(notificationDTO.getDate());
+        if (notificationDTO.getFormat().equals("SMS")) {
+            notification.setFormat(NotificationType.SMS);
+        }
+        if (notificationDTO.getFormat().equals("EMAIL")) {
+            notification.setFormat(NotificationType.EMAIL);
+        }
+        notification.setProductName(notificationDTO.getProductName());
+        return notification;
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/internal/Notification.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/internal/Notification.java
new file mode 100644
index 0000000000..0b1ce85d26
--- /dev/null
+++ b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/internal/Notification.java
@@ -0,0 +1,37 @@
+package com.baeldung.modulith.notification.internal;
+
+import java.util.Date;
+
+public class Notification {
+    private Date date;
+    private NotificationType format;
+    private String productName;
+
+    public Notification() {
+
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public NotificationType getFormat() {
+        return format;
+    }
+
+    public void setFormat(NotificationType format) {
+        this.format = format;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+}
diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/internal/NotificationType.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/internal/NotificationType.java
new file mode 100644
index 0000000000..45870e52b9
--- /dev/null
+++ b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/internal/NotificationType.java
@@ -0,0 +1,5 @@
+package com.baeldung.modulith.notification.internal;
+
+public enum NotificationType {
+    EMAIL, SMS
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/product/ProductService.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/product/ProductService.java
new file mode 100644
index 0000000000..46d87fc539
--- /dev/null
+++ b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/product/ProductService.java
@@ -0,0 +1,26 @@
+package com.baeldung.modulith.product;
+
+import com.baeldung.modulith.notification.NotificationDTO;
+import com.baeldung.modulith.notification.NotificationService;
+import com.baeldung.modulith.product.internal.Product;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+@Service
+public class ProductService {
+
+    private final ApplicationEventPublisher events;
+    private final NotificationService notificationService;
+
+    public ProductService(ApplicationEventPublisher events, NotificationService notificationService) {
+        this.events = events;
+        this.notificationService = notificationService;
+    }
+
+    public void create(Product product) {
+        notificationService.createNotification(new NotificationDTO(new Date(), "SMS", product.getName()));
+        events.publishEvent(new NotificationDTO(new Date(), "SMS", product.getName()));
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/product/internal/Product.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/product/internal/Product.java
new file mode 100644
index 0000000000..d989906b63
--- /dev/null
+++ b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/product/internal/Product.java
@@ -0,0 +1,38 @@
+package com.baeldung.modulith.product.internal;
+
+public class Product {
+
+    private String name;
+    private String description;
+    private int price;
+
+    public Product(String name, String description, int price) {
+        this.name = name;
+        this.description = description;
+        this.price = price;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public int getPrice() {
+        return price;
+    }
+
+    public void setPrice(int price) {
+        this.price = price;
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/openapi/config/OpenAIRestTemplateConfig.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/openapi/config/OpenAIRestTemplateConfig.java
new file mode 100644
index 0000000000..b832ee4264
--- /dev/null
+++ b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/openapi/config/OpenAIRestTemplateConfig.java
@@ -0,0 +1,25 @@
+package com.baeldung.openapi.config;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+public class OpenAIRestTemplateConfig {
+
+    @Value("${openai.api.key}")
+    private String openaiApiKey;
+
+    @Bean
+    @Qualifier("openaiRestTemplate")
+    public RestTemplate openaiRestTemplate() {
+        RestTemplate restTemplate = new RestTemplate();
+        restTemplate.getInterceptors().add((request, body, execution) -> {
+            request.getHeaders().add("Authorization", "Bearer " + openaiApiKey);
+            return execution.execute(request, body);
+        });
+        return restTemplate;
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/openapi/controller/ChatController.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/openapi/controller/ChatController.java
new file mode 100644
index 0000000000..129d233582
--- /dev/null
+++ b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/openapi/controller/ChatController.java
@@ -0,0 +1,48 @@
+package com.baeldung.openapi.controller;
+
+import com.baeldung.openapi.dto.ChatRequest;
+import com.baeldung.openapi.dto.ChatResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+
+@RestController
+public class ChatController {
+
+    @Qualifier("openaiRestTemplate")
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Value("${openai.model}")
+    private String model;
+
+    @Value("${openai.api.url}")
+    private String apiUrl;
+
+    /**
+     * Creates a chat request and sends it to the OpenAI API
+     * Returns the first message from the API response
+     *
+     * @param prompt the prompt to send to the API
+     * @return first message from the API response
+     */
+    @GetMapping("/chat")
+    public String chat(@RequestParam String prompt) {
+        ChatRequest request = new ChatRequest(model, prompt);
+
+        ChatResponse response = restTemplate.postForObject(
+                apiUrl,
+                request,
+                ChatResponse.class);
+
+        if (response == null || response.getChoices() == null || response.getChoices().isEmpty()) {
+            return "No response";
+        }
+
+        return response.getChoices().get(0).getMessage().getContent();
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/openapi/dto/ChatRequest.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/openapi/dto/ChatRequest.java
new file mode 100644
index 0000000000..1e32b937ce
--- /dev/null
+++ b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/openapi/dto/ChatRequest.java
@@ -0,0 +1,32 @@
+package com.baeldung.openapi.dto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ChatRequest {
+    private String model;
+    private List<Message> messages;
+
+    public ChatRequest(String model, String prompt) {
+        this.model = model;
+
+        this.messages = new ArrayList<>();
+        this.messages.add(new Message("user", prompt));
+    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public void setModel(String model) {
+        this.model = model;
+    }
+
+    public List<Message> getMessages() {
+        return messages;
+    }
+
+    public void setMessages(List<Message> messages) {
+        this.messages = messages;
+    }
+}
diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/openapi/dto/ChatResponse.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/openapi/dto/ChatResponse.java
new file mode 100644
index 0000000000..937e2d87db
--- /dev/null
+++ b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/openapi/dto/ChatResponse.java
@@ -0,0 +1,38 @@
+package com.baeldung.openapi.dto;
+
+import java.util.List;
+
+public class ChatResponse {
+
+    private List<Choice> choices;
+
+    public static class Choice {
+
+        private int index;
+        private Message message;
+
+        public int getIndex() {
+            return index;
+        }
+
+        public void setIndex(int index) {
+            this.index = index;
+        }
+
+        public Message getMessage() {
+            return message;
+        }
+
+        public void setMessage(Message message) {
+            this.message = message;
+        }
+    }
+
+    public List<Choice> getChoices() {
+        return choices;
+    }
+
+    public void setChoices(List<Choice> choices) {
+        this.choices = choices;
+    }
+}
diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/openapi/dto/Message.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/openapi/dto/Message.java
new file mode 100644
index 0000000000..242cf4e89f
--- /dev/null
+++ b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/openapi/dto/Message.java
@@ -0,0 +1,31 @@
+package com.baeldung.openapi.dto;
+
+public class Message {
+
+    private String role;
+    private String content;
+
+    Message(String role, String content) {
+        this.role = role;
+        this.content = content;
+    }
+
+    Message() {
+    }
+
+    public String getRole() {
+        return role;
+    }
+
+    public void setRole(String role) {
+        this.role = role;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/resources/application.properties b/spring-boot-modules/spring-boot-libraries-2/src/main/resources/application.properties
index a18eda349a..47b2973fca 100644
--- a/spring-boot-modules/spring-boot-libraries-2/src/main/resources/application.properties
+++ b/spring-boot-modules/spring-boot-libraries-2/src/main/resources/application.properties
@@ -47,4 +47,8 @@ resilience4j.ratelimiter.instances.rateLimiterApi.limit-refresh-period=60s
 resilience4j.ratelimiter.instances.rateLimiterApi.timeout-duration=0s
 resilience4j.ratelimiter.instances.rateLimiterApi.allow-health-indicator-to-fail=true
 resilience4j.ratelimiter.instances.rateLimiterApi.subscribe-for-events=true
-resilience4j.ratelimiter.instances.rateLimiterApi.event-consumer-buffer-size=50
\ No newline at end of file
+resilience4j.ratelimiter.instances.rateLimiterApi.event-consumer-buffer-size=50
+
+openai.model=gpt-3.5-turbo
+openai.api.url=https://api.openai.com/v1/chat/completions
+openai.api.key=your-api-key
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/modulith/ApplicationModularityUnitTest.java b/spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/modulith/ApplicationModularityUnitTest.java
new file mode 100644
index 0000000000..40d644b1e0
--- /dev/null
+++ b/spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/modulith/ApplicationModularityUnitTest.java
@@ -0,0 +1,27 @@
+package com.baeldung.modulith;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.modulith.core.ApplicationModules;
+import org.springframework.modulith.docs.Documenter;
+
+class ApplicationModularityUnitTest {
+
+    ApplicationModules modules = ApplicationModules.of(Application.class);
+
+    @Test
+    void verifiesModularStructure() {
+        modules.verify();
+    }
+
+    @Test
+    void createModuleDocumentation() {
+        new Documenter(modules)
+          .writeDocumentation()
+          .writeIndividualModulesAsPlantUml();
+    }
+
+    @Test
+    void createApplicationModuleModel() {
+        modules.forEach(System.out::println);
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-libraries/src/test/java/com/baeldung/scheduling/shedlock/BaeldungTaskSchedulerIntegrationTest.java b/spring-boot-modules/spring-boot-libraries/src/test/java/com/baeldung/scheduling/shedlock/BaeldungTaskSchedulerIntegrationTest.java
index 47f42c133f..82c3717ab3 100644
--- a/spring-boot-modules/spring-boot-libraries/src/test/java/com/baeldung/scheduling/shedlock/BaeldungTaskSchedulerIntegrationTest.java
+++ b/spring-boot-modules/spring-boot-libraries/src/test/java/com/baeldung/scheduling/shedlock/BaeldungTaskSchedulerIntegrationTest.java
@@ -30,7 +30,7 @@ public class BaeldungTaskSchedulerIntegrationTest {
         taskScheduler.scheduledTask();
         System.out.flush();
         String expected = "Running ShedLock task\n";
-        assertThat(consoleOutput.toString()).isEqualTo(expected);
+        assertThat(consoleOutput.toString()).hasToString(expected);
 
         //restore the old out
         System.setOut(old);
diff --git a/spring-boot-modules/spring-boot-logging-log4j2/pom.xml b/spring-boot-modules/spring-boot-logging-log4j2/pom.xml
index b2a6975964..b429339417 100644
--- a/spring-boot-modules/spring-boot-logging-log4j2/pom.xml
+++ b/spring-boot-modules/spring-boot-logging-log4j2/pom.xml
@@ -8,34 +8,13 @@
     <packaging>jar</packaging>
     <description>Demo project for Spring Boot Logging with Log4J2</description>
 
-    <!-- this needs to use the boot parent directly in order to not inherit logback dependencies -->
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.2.RELEASE</version>
-        <relativePath />
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
-    <dependencyManagement>
-        <dependencies>
-            <!-- for junit5 to successfully be able to discover junit4 tests, we need 4.12+ version of -->
-            <!-- junit:junit in the classpath. hence forcing the latest 4.13.2 available version for -->
-            <!-- junit5 compatibility -->
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>${junit.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.junit</groupId>
-                <artifactId>junit-bom</artifactId>
-                <version>${junit-jupiter.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -62,7 +41,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -96,10 +74,6 @@
         <start-class>com.baeldung.springbootlogging.SpringBootLoggingApplication</start-class>
         <spring-boot-starter-log4j.version>1.3.8.RELEASE</spring-boot-starter-log4j.version>
         <gelfj.version>1.1.16</gelfj.version>
-        <lombok.version>1.18.24</lombok.version>
-        <!-- used only in dependency management to force this version, not included as a direct dependency -->
-        <junit.version>4.13.2</junit.version>
-        <junit-jupiter.version>5.8.1</junit-jupiter.version>
         <log4j2.version>2.17.1</log4j2.version>
     </properties>
 
diff --git a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/springboot/swagger/controller/AuthorsController.java b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/springboot/swagger/controller/AuthorsController.java
new file mode 100644
index 0000000000..019bd5ad9d
--- /dev/null
+++ b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/springboot/swagger/controller/AuthorsController.java
@@ -0,0 +1,34 @@
+package com.baeldung.springboot.swagger.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baeldung.springboot.swagger.model.Author;
+import com.baeldung.springboot.swagger.service.AuthorService;
+import com.baeldung.springboot.swagger.views.Views;
+import com.fasterxml.jackson.annotation.JsonView;
+
+@RestController
+@RequestMapping("/authors")
+public class AuthorsController {
+
+    @Autowired
+    AuthorService authorService;
+
+    @JsonView(Views.Public.class)
+    @GetMapping
+    public List<Author> getAllAuthors() {
+        return authorService.getAllAuthors();
+    }
+
+    @PostMapping
+    public void addAuthor(@RequestBody @JsonView(Views.Public.class) Author author){
+        authorService.addAuthors(author);
+    }
+}
diff --git a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/springboot/swagger/model/Author.java b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/springboot/swagger/model/Author.java
new file mode 100644
index 0000000000..2e30998059
--- /dev/null
+++ b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/springboot/swagger/model/Author.java
@@ -0,0 +1,28 @@
+package com.baeldung.springboot.swagger.model;
+
+import com.baeldung.springboot.swagger.views.Views;
+import com.fasterxml.jackson.annotation.JsonView;
+
+public class Author {
+
+    @JsonView(Views.Private.class)
+    private Integer id;
+
+    @JsonView(Views.Public.class)
+    private String name;
+
+    @JsonView(Views.Public.class)
+    private String email;
+
+    public Author() {
+    }
+
+    public Author(String name, String email) {
+        this.name = name;
+        this.email = email;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+}
diff --git a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/springboot/swagger/service/AuthorService.java b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/springboot/swagger/service/AuthorService.java
new file mode 100644
index 0000000000..bf1f637889
--- /dev/null
+++ b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/springboot/swagger/service/AuthorService.java
@@ -0,0 +1,23 @@
+package com.baeldung.springboot.swagger.service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.baeldung.springboot.swagger.model.Author;
+
+@Service
+public class AuthorService {
+    private List<Author> authors = new ArrayList<>();
+
+    public List<Author> getAllAuthors(){
+        return authors;
+    }
+
+    public void addAuthors(Author author){
+        author.setId(authors.size()+1);
+        authors.add(author);
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/springboot/swagger/views/Views.java b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/springboot/swagger/views/Views.java
new file mode 100644
index 0000000000..df638a5647
--- /dev/null
+++ b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/springboot/swagger/views/Views.java
@@ -0,0 +1,9 @@
+package com.baeldung.springboot.swagger.views;
+
+public class Views {
+    public static class Public {
+    }
+
+    public static class Private {
+    }
+}
diff --git a/spring-boot-modules/spring-boot-properties-2/pom.xml b/spring-boot-modules/spring-boot-properties-2/pom.xml
index 442cb24c7a..4b1daca34d 100644
--- a/spring-boot-modules/spring-boot-properties-2/pom.xml
+++ b/spring-boot-modules/spring-boot-properties-2/pom.xml
@@ -10,9 +10,10 @@
     <description>Spring Boot Properties Module</description>
 
     <parent>
-        <groupId>com.baeldung.spring-boot-modules</groupId>
-        <artifactId>spring-boot-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-3</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
@@ -24,6 +25,15 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
     </dependencies>
 
+    <properties>
+        <start-class>com.baeldung.properties.yaml.YamlApplication</start-class>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-properties-2/src/main/java/com/baeldung/properties/value/ValuesApp.java b/spring-boot-modules/spring-boot-properties-2/src/main/java/com/baeldung/properties/value/ValuesApp.java
index 67547199a6..282ce4658e 100644
--- a/spring-boot-modules/spring-boot-properties-2/src/main/java/com/baeldung/properties/value/ValuesApp.java
+++ b/spring-boot-modules/spring-boot-properties-2/src/main/java/com/baeldung/properties/value/ValuesApp.java
@@ -7,11 +7,12 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
-import javax.annotation.PostConstruct;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import jakarta.annotation.PostConstruct;
+
 @Configuration
 @PropertySource(name = "myProperties", value = "values.properties")
 public class ValuesApp {
diff --git a/spring-boot-modules/spring-boot-properties-2/src/main/java/com/baeldung/properties/value/defaults/ValuesWithDefaultsApp.java b/spring-boot-modules/spring-boot-properties-2/src/main/java/com/baeldung/properties/value/defaults/ValuesWithDefaultsApp.java
index 2a2b535be7..f1720d2fb3 100644
--- a/spring-boot-modules/spring-boot-properties-2/src/main/java/com/baeldung/properties/value/defaults/ValuesWithDefaultsApp.java
+++ b/spring-boot-modules/spring-boot-properties-2/src/main/java/com/baeldung/properties/value/defaults/ValuesWithDefaultsApp.java
@@ -1,6 +1,6 @@
 package com.baeldung.properties.value.defaults;
 
-import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang.ArrayUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -8,10 +8,11 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.util.Assert;
 
-import javax.annotation.PostConstruct;
 import java.util.Arrays;
 import java.util.List;
 
+import jakarta.annotation.PostConstruct;
+
 /**
  * Demonstrates setting defaults for @Value annotation.  Note that there are no properties 
  * defined in the specified property source.  We also assume that the user here
@@ -60,10 +61,10 @@ public class ValuesWithDefaultsApp {
     	
     	// arrays
         List<String> stringListValues = Arrays.asList("one", "two", "three");
-    	Assert.isTrue(Arrays.asList(stringArrayWithDefaults).containsAll(stringListValues), "unexpected value for stringArrayWithDefaults");
+        Assert.isTrue(Arrays.asList(stringArrayWithDefaults).containsAll(stringListValues), "unexpected value for stringArrayWithDefaults");
 
         List<Integer> intListValues = Arrays.asList(1, 2, 3);
-    	Assert.isTrue(Arrays.asList(ArrayUtils.toObject(intArrayWithDefaults)).containsAll(intListValues), "unexpected value for intArrayWithDefaults");
+        Assert.isTrue(Arrays.asList(ArrayUtils.toObject(intArrayWithDefaults)).containsAll(intListValues), "unexpected value for intArrayWithDefaults");
 
     	// SpEL
     	Assert.isTrue(spelWithDefaultValue.equals("my default system property value"), "unexpected value for spelWithDefaultValue");
diff --git a/spring-boot-modules/spring-boot-properties-3/README.md b/spring-boot-modules/spring-boot-properties-3/README.md
index 77c6815649..4bc4a2325f 100644
--- a/spring-boot-modules/spring-boot-properties-3/README.md
+++ b/spring-boot-modules/spring-boot-properties-3/README.md
@@ -10,3 +10,6 @@
 - [Load Spring Boot Properties From a JSON File](https://www.baeldung.com/spring-boot-json-properties)
 - [IntelliJ – Cannot Resolve Spring Boot Configuration Properties Error](https://www.baeldung.com/intellij-resolve-spring-boot-configuration-properties)
 - [Log Properties in a Spring Boot Application](https://www.baeldung.com/spring-boot-log-properties)
+- [Using Environment Variables in Spring Boot’s application.properties](https://www.baeldung.com/spring-boot-properties-env-variables)
+- [Loading Multiple YAML Configuration Files in Spring Boot](https://www.baeldung.com/spring-boot-load-multiple-yaml-configuration-files)
+- More articles: [[<-- prev]](../spring-boot-properties-2)
diff --git a/spring-boot-modules/spring-boot-properties-3/pom.xml b/spring-boot-modules/spring-boot-properties-3/pom.xml
index 3de85c7175..ed6e08add0 100644
--- a/spring-boot-modules/spring-boot-properties-3/pom.xml
+++ b/spring-boot-modules/spring-boot-properties-3/pom.xml
@@ -9,9 +9,10 @@
     <description>Spring Boot Properties Module</description>
 
     <parent>
-        <groupId>com.baeldung.spring-boot-modules</groupId>
-        <artifactId>spring-boot-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-3</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
@@ -31,7 +32,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>RELEASE</version>
         </dependency>
     </dependencies>
 
@@ -44,4 +44,8 @@
         </plugins>
     </build>
 
+    <properties>
+        <start-class>com.baeldung.boot.properties.DemoApplication</start-class>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/spring-core-6/src/main/java/com/baeldung/envvariables/BaeldungProperties.java b/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/envvariables/BaeldungProperties.java
similarity index 86%
rename from spring-core-6/src/main/java/com/baeldung/envvariables/BaeldungProperties.java
rename to spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/envvariables/BaeldungProperties.java
index a41ac7a509..0e6e05a3c2 100644
--- a/spring-core-6/src/main/java/com/baeldung/envvariables/BaeldungProperties.java
+++ b/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/envvariables/BaeldungProperties.java
@@ -1,20 +1,20 @@
-package com.baeldung.envvariables.valueinjection;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Component
-@ConfigurationProperties(prefix = "baeldung")
-public class BaeldungProperties {
-
-    private String presentation;
-
-    public String getPresentation() {
-        return presentation;
-    }
-
-    public void setPresentation(String presentation) {
-        this.presentation = presentation;
-    }
-
-}
+package com.baeldung.envvariables;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "baeldung")
+public class BaeldungProperties {
+
+    private String presentation;
+
+    public String getPresentation() {
+        return presentation;
+    }
+
+    public void setPresentation(String presentation) {
+        this.presentation = presentation;
+    }
+
+}
diff --git a/spring-core-6/src/main/java/com/baeldung/envvariables/MyController.java b/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/envvariables/MyController.java
similarity index 94%
rename from spring-core-6/src/main/java/com/baeldung/envvariables/MyController.java
rename to spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/envvariables/MyController.java
index 503ee47157..6afe9f2de1 100644
--- a/spring-core-6/src/main/java/com/baeldung/envvariables/MyController.java
+++ b/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/envvariables/MyController.java
@@ -1,60 +1,60 @@
-package com.baeldung.envvariables.valueinjection;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.env.Environment;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class MyController {
-
-    @Value("${environment.name}")
-    private String environmentName;
-
-    @Value("${java.home.and.environment}")
-    private String javaHomeAndEnvironmentName;
-
-    @Value("${thispropertydoesnotexist}")
-    private String nonExistentProperty;
-
-    @Value("${baeldung.presentation}")
-    private String baeldungPresentation;
-
-    @Autowired
-    private Environment environment;
-
-    @Autowired
-    private BaeldungProperties baeldungProperties;
-
-    @GetMapping("/environment_name")
-    String getEnvironmentName_FromEnvironmentVariables() {
-        return environmentName;
-    }
-
-    @GetMapping("/java_home_and_environment")
-    String getJavaHomeAndEnvironmentName_FromEnvironmentVariables() {
-        return javaHomeAndEnvironmentName;
-    }
-
-    @GetMapping("non_existent_property")
-    String getNonexistentProperty_FromEnvironmentVariables() {
-        return nonExistentProperty;
-    }
-
-    @GetMapping("baeldung_presentation_from_value")
-    String getBaeldungPresentation_FromValue() {
-        return baeldungPresentation;
-    }
-
-    @GetMapping("baeldung_presentation_from_environment")
-    String getBaeldungPresentation_FromEnvironment() {
-        return environment.getProperty("baeldung.presentation");
-    }
-
-    @GetMapping("baeldung_configuration_properties")
-    String getBaeldungPresentation_FromConfigurationProperties() {
-        return baeldungProperties.getPresentation();
-    }
-
-}
+package com.baeldung.envvariables;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.env.Environment;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class MyController {
+
+    @Value("${environment.name}")
+    private String environmentName;
+
+    @Value("${java.home.and.environment}")
+    private String javaHomeAndEnvironmentName;
+
+    @Value("${thispropertydoesnotexist}")
+    private String nonExistentProperty;
+
+    @Value("${baeldung.presentation}")
+    private String baeldungPresentation;
+
+    @Autowired
+    private Environment environment;
+
+    @Autowired
+    private BaeldungProperties baeldungProperties;
+
+    @GetMapping("/environment_name")
+    String getEnvironmentName_FromEnvironmentVariables() {
+        return environmentName;
+    }
+
+    @GetMapping("/java_home_and_environment")
+    String getJavaHomeAndEnvironmentName_FromEnvironmentVariables() {
+        return javaHomeAndEnvironmentName;
+    }
+
+    @GetMapping("non_existent_property")
+    String getNonexistentProperty_FromEnvironmentVariables() {
+        return nonExistentProperty;
+    }
+
+    @GetMapping("baeldung_presentation_from_value")
+    String getBaeldungPresentation_FromValue() {
+        return baeldungPresentation;
+    }
+
+    @GetMapping("baeldung_presentation_from_environment")
+    String getBaeldungPresentation_FromEnvironment() {
+        return environment.getProperty("baeldung.presentation");
+    }
+
+    @GetMapping("baeldung_configuration_properties")
+    String getBaeldungPresentation_FromConfigurationProperties() {
+        return baeldungProperties.getPresentation();
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/error/KebabCasingDemoApplication.java b/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/error/KebabCasingDemoApplication.java
new file mode 100644
index 0000000000..7b97f97ffa
--- /dev/null
+++ b/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/error/KebabCasingDemoApplication.java
@@ -0,0 +1,12 @@
+package com.baeldung.error;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class KebabCasingDemoApplication {
+	public static void main(String[] args) {
+		SpringApplication.run(KebabCasingDemoApplication.class, args);
+	}
+	
+}
diff --git a/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/error/configuration/MainConfiguration.java b/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/error/configuration/MainConfiguration.java
new file mode 100644
index 0000000000..3c5fbc3006
--- /dev/null
+++ b/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/error/configuration/MainConfiguration.java
@@ -0,0 +1,18 @@
+package com.baeldung.error.configuration;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConfigurationProperties(prefix = "profile.profileProperties")
+public class MainConfiguration {
+	private String name;
+	
+	public String getName() {
+		return name;
+	}
+	
+	public void setName(final String name) {
+		this.name = name;
+	}
+}
diff --git a/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/properties/log/EnvironmentPropertiesPrinter.java b/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/properties/log/EnvironmentPropertiesPrinter.java
index 321593b31b..26f6867296 100644
--- a/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/properties/log/EnvironmentPropertiesPrinter.java
+++ b/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/properties/log/EnvironmentPropertiesPrinter.java
@@ -5,7 +5,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 @Component
 public class EnvironmentPropertiesPrinter {
diff --git a/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/properties/multipleyaml/MultipleYamlApplication.java b/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/properties/multipleyaml/MultipleYamlApplication.java
new file mode 100644
index 0000000000..9dc754b24b
--- /dev/null
+++ b/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/properties/multipleyaml/MultipleYamlApplication.java
@@ -0,0 +1,27 @@
+package com.baeldung.properties.multipleyaml;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class MultipleYamlApplication implements CommandLineRunner {
+
+    @Autowired
+    private MultipleYamlConfiguration config;
+
+    public static void main(String[] args) {
+        SpringApplication springApp = new SpringApplication(MultipleYamlApplication.class);
+
+        // Code from first example, uncomment to use multiple profiles
+        // springApp.setAdditionalProfiles("students", "teachers");
+
+        springApp.run(args);
+    }
+
+    public void run(String... args) throws Exception {
+        System.out.println("Students: " + config.getStudents());
+        System.out.println("Teachers: " + config.getTeachers());
+    }
+}
diff --git a/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/properties/multipleyaml/MultipleYamlConfiguration.java b/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/properties/multipleyaml/MultipleYamlConfiguration.java
new file mode 100644
index 0000000000..c46a321e24
--- /dev/null
+++ b/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/properties/multipleyaml/MultipleYamlConfiguration.java
@@ -0,0 +1,35 @@
+package com.baeldung.properties.multipleyaml;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.annotation.PropertySources;
+
+import java.util.List;
+
+@Configuration
+@ConfigurationProperties
+@PropertySources({
+        @PropertySource(value = "classpath:application-teachers.yml", factory = MultipleYamlPropertySourceFactory.class),
+        @PropertySource(value = "classpath:application-students.yml", factory = MultipleYamlPropertySourceFactory.class)})
+public class MultipleYamlConfiguration {
+
+    List<String> teachers;
+    List<String> students;
+
+    public void setTeachers(List<String> teachers) {
+        this.teachers = teachers;
+    }
+
+    public void setStudents(List<String> students) {
+        this.students = students;
+    }
+
+    public List<String> getTeachers() {
+        return teachers;
+    }
+
+    public List<String> getStudents() {
+        return students;
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/properties/multipleyaml/MultipleYamlPropertySourceFactory.java b/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/properties/multipleyaml/MultipleYamlPropertySourceFactory.java
new file mode 100644
index 0000000000..c09bd3c8b9
--- /dev/null
+++ b/spring-boot-modules/spring-boot-properties-3/src/main/java/com/baeldung/properties/multipleyaml/MultipleYamlPropertySourceFactory.java
@@ -0,0 +1,23 @@
+package com.baeldung.properties.multipleyaml;
+
+import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
+import org.springframework.core.env.PropertiesPropertySource;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.io.support.EncodedResource;
+import org.springframework.core.io.support.PropertySourceFactory;
+
+import java.io.IOException;
+import java.util.Properties;
+
+public class MultipleYamlPropertySourceFactory implements PropertySourceFactory {
+
+    @Override
+    public PropertySource<?> createPropertySource(String name, EncodedResource encodedResource) throws IOException {
+        YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
+        factory.setResources(encodedResource.getResource());
+
+        Properties properties = factory.getObject();
+
+        return new PropertiesPropertySource(encodedResource.getResource().getFilename(), properties);
+    }
+}
diff --git a/spring-boot-modules/spring-boot-properties-3/src/main/resources/application-students.yml b/spring-boot-modules/spring-boot-properties-3/src/main/resources/application-students.yml
new file mode 100644
index 0000000000..f4aaf8ae4d
--- /dev/null
+++ b/spring-boot-modules/spring-boot-properties-3/src/main/resources/application-students.yml
@@ -0,0 +1,3 @@
+students:
+  - Jane
+  - Michael
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-properties-3/src/main/resources/application-teachers.yml b/spring-boot-modules/spring-boot-properties-3/src/main/resources/application-teachers.yml
new file mode 100644
index 0000000000..f0d2080164
--- /dev/null
+++ b/spring-boot-modules/spring-boot-properties-3/src/main/resources/application-teachers.yml
@@ -0,0 +1,3 @@
+teachers:
+  - Margo
+  - Javier
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-properties-3/src/main/resources/application.properties b/spring-boot-modules/spring-boot-properties-3/src/main/resources/application.properties
index a079837942..e80c2ecc27 100644
--- a/spring-boot-modules/spring-boot-properties-3/src/main/resources/application.properties
+++ b/spring-boot-modules/spring-boot-properties-3/src/main/resources/application.properties
@@ -26,4 +26,18 @@ spring.config.activate.on-profile=multidocument-prod
 spring.datasource.password=password
 spring.datasource.url=jdbc:h2:prod
 spring.datasource.username=prodUser
-bael.property=prodValue
\ No newline at end of file
+bael.property=prodValue
+#---
+environment.name=${OS}
+java.home.and.environment=${JAVA_HOME}+${OS}
+not.existing.system.property=${thispropertydoesnotexist}
+baeldung.presentation=${HELLO_BAELDUNG}. Java is installed in the folder: ${JAVA_HOME}
+#---
+#camelCasing
+#profile.applicationProperties.name="Baeldung"
+#PascalCasing
+#profile.ApplicationProperties.name="Baeldung"
+#SnakingCasing
+#profile.application_properties.name="Baeldung"
+#KebabCasing
+profile.application-properties.name="Baeldung"
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-properties-3/src/main/resources/application.yml b/spring-boot-modules/spring-boot-properties-3/src/main/resources/application.yml
index 2e28da5ad3..2c44065028 100644
--- a/spring-boot-modules/spring-boot-properties-3/src/main/resources/application.yml
+++ b/spring-boot-modules/spring-boot-properties-3/src/main/resources/application.yml
@@ -2,6 +2,10 @@ bael:
   root-level-property: defaultRootLevelValue
 spring:
   profiles:
+# Multiple profiles for MultipleYamlApplication first example
+#    include:
+#      - teachers
+#      - students
     group:
       multidocument-integration: multidocument-integration-extension
 ---
diff --git a/spring-core-6/src/test/java/com/baeldung/envvariables/MyControllerIntegrationTest.java b/spring-boot-modules/spring-boot-properties-3/src/test/java/com/baeldung/envvariables/MyControllerIntegrationTest.java
similarity index 95%
rename from spring-core-6/src/test/java/com/baeldung/envvariables/MyControllerIntegrationTest.java
rename to spring-boot-modules/spring-boot-properties-3/src/test/java/com/baeldung/envvariables/MyControllerIntegrationTest.java
index b3ee2c7c46..527acd5dfc 100644
--- a/spring-core-6/src/test/java/com/baeldung/envvariables/MyControllerIntegrationTest.java
+++ b/spring-boot-modules/spring-boot-properties-3/src/test/java/com/baeldung/envvariables/MyControllerIntegrationTest.java
@@ -1,36 +1,36 @@
-package com.baeldung.envvariables.valueinjection;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.web.servlet.MockMvc;
-
-@SpringBootTest(classes = MyController.class)
-@AutoConfigureMockMvc
-public class MyControllerIntegrationTest {
-
-    @Autowired
-    private MockMvc mockMvc;
-
-    /** NB : these tests are commented out because they are environment dependent
-     * If you want to run one of them on your machine, follow the instruction above it
-     *
-     * expects the value of your system environment property 'OS' (it is already defined at least in Windows_NT)
-     @Test void givenExistingSystemProperty_whenInjected_thenHasSystemPropertyValue() throws Exception {
-     mockMvc.perform(get("/environment_name"))
-     .andExpect(content().string(equalTo("Windows_NT")));
-     }
-
-      * expects the value of the JAVA_HOME environment variable (you need to define it if you haven't yet), with a + and the 'OS' environment property in the end
-     @Test void givenCombinationOfSystemPropertyAndEnvironmentVariable_whenInjected_thenHasExpectedValue() throws Exception {
-     mockMvc.perform(get("/java_home_and_environment"))
-     .andExpect(content().string(equalTo("C:\\Program Files\\Java\\jdk-11.0.14+Windows_NT")));
-     }
-
-      * expects the content to be ${thispropertydoesnotexist} ; if you have defined an environment property called thispropertydoesnotexist, it would fail
-     @Test void givenNonExistentProperty_whenInjected_thenKeepsTheStringValue() throws Exception {
-     mockMvc.perform(get("/non_existent_property"))
-     .andExpect(content().string(equalTo("${thispropertydoesnotexist}")));
-     }
-     */
-}
+package com.baeldung.envvariables;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.web.servlet.MockMvc;
+
+@SpringBootTest(classes = MyController.class)
+@AutoConfigureMockMvc
+public class MyControllerIntegrationTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    /** NB : these tests are commented out because they are environment dependent
+     * If you want to run one of them on your machine, follow the instruction above it
+     *
+     * expects the value of your system environment property 'OS' (it is already defined at least in Windows_NT)
+     @Test void givenExistingSystemProperty_whenInjected_thenHasSystemPropertyValue() throws Exception {
+     mockMvc.perform(get("/environment_name"))
+     .andExpect(content().string(equalTo("Windows_NT")));
+     }
+    
+      * expects the value of the JAVA_HOME environment variable (you need to define it if you haven't yet), with a + and the 'OS' environment property in the end
+     @Test void givenCombinationOfSystemPropertyAndEnvironmentVariable_whenInjected_thenHasExpectedValue() throws Exception {
+     mockMvc.perform(get("/java_home_and_environment"))
+     .andExpect(content().string(equalTo("C:\\Program Files\\Java\\jdk-11.0.14+Windows_NT")));
+     }
+    
+      * expects the content to be ${thispropertydoesnotexist} ; if you have defined an environment property called thispropertydoesnotexist, it would fail
+     @Test void givenNonExistentProperty_whenInjected_thenKeepsTheStringValue() throws Exception {
+     mockMvc.perform(get("/non_existent_property"))
+     .andExpect(content().string(equalTo("${thispropertydoesnotexist}")));
+     }
+     */
+}
diff --git a/spring-boot-modules/spring-boot-properties-migrator-demo/pom.xml b/spring-boot-modules/spring-boot-properties-migrator-demo/pom.xml
index 95dc06b155..21ed0f59f4 100644
--- a/spring-boot-modules/spring-boot-properties-migrator-demo/pom.xml
+++ b/spring-boot-modules/spring-boot-properties-migrator-demo/pom.xml
@@ -7,10 +7,10 @@
     <version>1.0-SNAPSHOT</version>
 
     <parent>
-        <groupId>com.baeldung.spring-boot-modules</groupId>
-        <artifactId>spring-boot-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-3</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-3</relativePath>
     </parent>
     <!-- Used to demonstrate a particular scenario in the article -->
     <!-- <parent> -->
@@ -49,8 +49,8 @@
     </build>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-properties/pom.xml b/spring-boot-modules/spring-boot-properties/pom.xml
index 378864a1df..4ad5aeed1d 100644
--- a/spring-boot-modules/spring-boot-properties/pom.xml
+++ b/spring-boot-modules/spring-boot-properties/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    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">
+         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>spring-boot-properties</artifactId>
     <version>0.0.1-SNAPSHOT</version>
@@ -10,9 +10,10 @@
     <description>Spring Boot Properties Module</description>
 
     <parent>
-        <groupId>com.baeldung.spring-boot-modules</groupId>
-        <artifactId>spring-boot-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-3</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
@@ -74,6 +75,25 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>build-info</id>
+                        <goals>
+                            <goal>build-info</goal>
+                        </goals>
+                        <configuration>
+                            <additionalProperties>
+                                <java.version>${java.version}</java.version>
+                                <description>${project.description}</description>
+                                <custom.value>123</custom.value>
+                            </additionalProperties>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
@@ -122,7 +142,7 @@
     </profiles>
 
     <properties>
-        <spring-cloud.version>2021.0.3</spring-cloud.version>
+        <spring-cloud.version>2022.0.1</spring-cloud.version>
         <commons-configuration.version>1.10</commons-configuration.version>
         <resource.delimiter>@</resource.delimiter>
         <!-- <start-class>com.baeldung.buildproperties.Application</start-class> -->
diff --git a/spring-boot-modules/spring-boot-properties/src/main/java/com/baeldung/configurationproperties/ConfigProperties.java b/spring-boot-modules/spring-boot-properties/src/main/java/com/baeldung/configurationproperties/ConfigProperties.java
index 47df784885..faf5678398 100644
--- a/spring-boot-modules/spring-boot-properties/src/main/java/com/baeldung/configurationproperties/ConfigProperties.java
+++ b/spring-boot-modules/spring-boot-properties/src/main/java/com/baeldung/configurationproperties/ConfigProperties.java
@@ -3,10 +3,10 @@ package com.baeldung.configurationproperties;
 import java.util.List;
 import java.util.Map;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
 
 import org.hibernate.validator.constraints.Length;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/spring-boot-modules/spring-boot-properties/src/main/java/com/baeldung/configurationproperties/ImmutableCredentials.java b/spring-boot-modules/spring-boot-properties/src/main/java/com/baeldung/configurationproperties/ImmutableCredentials.java
index a58e4143e5..72c45afbb2 100644
--- a/spring-boot-modules/spring-boot-properties/src/main/java/com/baeldung/configurationproperties/ImmutableCredentials.java
+++ b/spring-boot-modules/spring-boot-properties/src/main/java/com/baeldung/configurationproperties/ImmutableCredentials.java
@@ -1,10 +1,8 @@
 package com.baeldung.configurationproperties;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.ConstructorBinding;
 
 @ConfigurationProperties(prefix = "mail.credentials")
-@ConstructorBinding
 public class ImmutableCredentials {
 
     private final String authMethod;
diff --git a/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/buildproperties/BuildInfoServiceIntegrationTest.java b/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/buildproperties/BuildInfoServiceIntegrationTest.java
index 2cb27e1844..9ed27f412c 100644
--- a/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/buildproperties/BuildInfoServiceIntegrationTest.java
+++ b/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/buildproperties/BuildInfoServiceIntegrationTest.java
@@ -4,12 +4,9 @@ import static org.junit.Assert.assertThat;
 
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
 class BuildInfoServiceIntegrationTest {
 
diff --git a/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/buildproperties/BuildPropertiesUnitTest.java b/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/buildproperties/BuildPropertiesUnitTest.java
new file mode 100644
index 0000000000..bb8ec78cc1
--- /dev/null
+++ b/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/buildproperties/BuildPropertiesUnitTest.java
@@ -0,0 +1,30 @@
+package com.baeldung.buildproperties;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.info.BuildProperties;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+@SpringBootTest
+@ExtendWith(SpringExtension.class)
+public class BuildPropertiesUnitTest {
+    @Autowired
+    private BuildProperties buildProperties;
+
+    @Test
+    void givenBuildPropertiesBean_WhenFetchDefaultBuildProperties_ThenGetValidValues() {
+        Assertions.assertEquals("spring-boot-properties", buildProperties.getArtifact());
+        Assertions.assertEquals("com.baeldung", buildProperties.getGroup());
+        Assertions.assertEquals("0.0.1-SNAPSHOT", buildProperties.getVersion());
+    }
+
+    @Test
+    void givenBuildPropertiesBean_WhenFetchCustomBuildProprties_ThenGetValidValues() {
+        Assertions.assertEquals("123", buildProperties.get("custom.value"));
+        Assertions.assertNotNull(buildProperties.get("java.version"));
+        Assertions.assertEquals("Spring Boot Properties Module", buildProperties.get("description"));
+    }
+}
diff --git a/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/PropertiesReloadManualTest.java b/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/PropertiesReloadManualTest.java
index 88e22af4ba..ecb547a0a0 100644
--- a/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/PropertiesReloadManualTest.java
+++ b/spring-boot-modules/spring-boot-properties/src/test/java/com/baeldung/properties/reloading/PropertiesReloadManualTest.java
@@ -1,28 +1,27 @@
 package com.baeldung.properties.reloading;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import com.baeldung.properties.reloading.beans.ConfigurationPropertiesRefreshConfigBean;
 import com.baeldung.properties.reloading.beans.EnvironmentConfigBean;
 import com.baeldung.properties.reloading.beans.PropertiesConfigBean;
 import com.baeldung.properties.reloading.beans.ValueRefreshConfigBean;
 import java.io.FileOutputStream;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
-@RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = SpringBootPropertiesTestApplication.class)
 public class PropertiesReloadManualTest {
 
@@ -50,7 +49,7 @@ public class PropertiesReloadManualTest {
     ValueRefreshConfigBean singletonValueRefreshConfigBean;
 
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         mvc = MockMvcBuilders
           .webAppContextSetup(webApplicationContext)
@@ -61,7 +60,7 @@ public class PropertiesReloadManualTest {
         callRefresh();
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         createConfig("extra.properties", "application.theme.color", "blue");
         createConfig("extra2.properties", "application.theme.background", "red");
@@ -69,76 +68,76 @@ public class PropertiesReloadManualTest {
 
     @Test
     public void givenEnvironmentReader_whenColorChanged_thenExpectChangeValue() throws Exception {
-        Assert.assertEquals("blue", environmentConfigBean.getColor());
+        assertEquals("blue", environmentConfigBean.getColor());
 
         createConfig("extra.properties", "application.theme.color", "red");
         Thread.sleep(refreshDelay);
 
-        Assert.assertEquals("red", environmentConfigBean.getColor());
+        assertEquals("red", environmentConfigBean.getColor());
     }
 
     @Test
     public void givenEnvironmentReader_whenBackgroundChanged_thenExpectChangeValue() throws Exception {
-        Assert.assertEquals("red", environmentConfigBean.getBackgroundColor());
+        assertEquals("red", environmentConfigBean.getBackgroundColor());
 
         createConfig("extra2.properties", "application.theme.background", "blue");
         Thread.sleep(refreshDelay);
 
-        Assert.assertEquals("blue", environmentConfigBean.getBackgroundColor());
+        assertEquals("blue", environmentConfigBean.getBackgroundColor());
     }
 
     @Test
     public void givenPropertiesReader_whenColorChanged_thenExpectChangeValue() throws Exception {
-        Assert.assertEquals("blue", propertiesConfigBean.getColor());
+        assertEquals("blue", propertiesConfigBean.getColor());
 
         createConfig("extra.properties", "application.theme.color", "red");
         Thread.sleep(refreshDelay);
 
-        Assert.assertEquals("red", propertiesConfigBean.getColor());
+        assertEquals("red", propertiesConfigBean.getColor());
     }
 
     @Test
     public void givenRefreshScopedValueReader_whenColorChangedAndRefreshCalled_thenExpectChangeValue() throws Exception {
-        Assert.assertEquals("blue", valueRefreshConfigBean.getColor());
+        assertEquals("blue", valueRefreshConfigBean.getColor());
 
         createConfig("extra.properties", "application.theme.color", "red");
         Thread.sleep(refreshDelay);
 
-        Assert.assertEquals("blue", valueRefreshConfigBean.getColor());
+        assertEquals("blue", valueRefreshConfigBean.getColor());
 
         callRefresh();
 
-        Assert.assertEquals("red", valueRefreshConfigBean.getColor());
+        assertEquals("red", valueRefreshConfigBean.getColor());
     }
 
     @Test
     public void givenSingletonRefreshScopedValueReader_whenColorChangedAndRefreshCalled_thenExpectOldValue() throws Exception {
 
-        Assert.assertEquals("blue", singletonValueRefreshConfigBean.getColor());
+        assertEquals("blue", singletonValueRefreshConfigBean.getColor());
 
         createConfig("extra.properties", "application.theme.color", "red");
         Thread.sleep(refreshDelay);
 
-        Assert.assertEquals("blue", singletonValueRefreshConfigBean.getColor());
+        assertEquals("blue", singletonValueRefreshConfigBean.getColor());
 
         callRefresh();
 
-        Assert.assertEquals("blue", singletonValueRefreshConfigBean.getColor());
+        assertEquals("blue", singletonValueRefreshConfigBean.getColor());
     }
 
     @Test
     public void givenRefreshScopedConfigurationPropertiesReader_whenColorChangedAndRefreshCalled_thenExpectChangeValue() throws Exception {
 
-        Assert.assertEquals("blue", configurationPropertiesRefreshConfigBean.getColor());
+        assertEquals("blue", configurationPropertiesRefreshConfigBean.getColor());
 
         createConfig("extra.properties", "application.theme.color", "red");
         Thread.sleep(refreshDelay);
 
-        Assert.assertEquals("blue", configurationPropertiesRefreshConfigBean.getColor());
+        assertEquals("blue", configurationPropertiesRefreshConfigBean.getColor());
 
         callRefresh();
 
-        Assert.assertEquals("red", configurationPropertiesRefreshConfigBean.getColor());
+        assertEquals("red", configurationPropertiesRefreshConfigBean.getColor());
     }
 
     public void callRefresh() throws Exception {
@@ -148,7 +147,7 @@ public class PropertiesReloadManualTest {
             .accept(MediaType.APPLICATION_JSON_VALUE))
           .andReturn();
         MockHttpServletResponse response = mvcResult.getResponse();
-        Assert.assertEquals(response.getStatus(), 200);
+        assertEquals(200, response.getStatus());
     }
 
     public void createConfig(String file, String key, String value) throws Exception {
diff --git a/spring-boot-modules/spring-boot-redis/.gitignore b/spring-boot-modules/spring-boot-redis/.gitignore
new file mode 100644
index 0000000000..a8e6c9dbce
--- /dev/null
+++ b/spring-boot-modules/spring-boot-redis/.gitignore
@@ -0,0 +1,35 @@
+HELP.md
+target/
+.mvn
+mvnw
+mvnw.cmd
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/spring-boot-modules/spring-boot-redis/README.md b/spring-boot-modules/spring-boot-redis/README.md
new file mode 100644
index 0000000000..b5585f9637
--- /dev/null
+++ b/spring-boot-modules/spring-boot-redis/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [How to configure Redis TTL with Spring Data Redis?](https://www.baeldung.com/spring-data-redis-ttl)
diff --git a/spring-boot-modules/spring-boot-redis/pom.xml b/spring-boot-modules/spring-boot-redis/pom.xml
new file mode 100644
index 0000000000..5b85ad00ca
--- /dev/null
+++ b/spring-boot-modules/spring-boot-redis/pom.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
+    <groupId>com.baelding</groupId>
+    <artifactId>spring-boot-redis</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-boot-redis</name>
+    <description>Demo project for Spring Boot with Spring Data Redis</description>
+    
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-3</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-3</relativePath>
+    </parent>
+   
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>it.ozimov</groupId>
+            <artifactId>embedded-redis</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
+            </exclusions>
+            <version>0.7.3</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webflux</artifactId>
+            <version>6.0.3</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+	<properties>
+        <java.version>15</java.version>
+    </properties>
+    
+</project>
diff --git a/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/SpringBootRedisApplication.java b/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/SpringBootRedisApplication.java
new file mode 100644
index 0000000000..43d56e29ea
--- /dev/null
+++ b/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/SpringBootRedisApplication.java
@@ -0,0 +1,13 @@
+package com.baelding.springbootredis;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpringBootRedisApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(SpringBootRedisApplication.class, args);
+	}
+
+}
diff --git a/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/config/RedisConfiguration.java b/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/config/RedisConfiguration.java
new file mode 100644
index 0000000000..2c050af8af
--- /dev/null
+++ b/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/config/RedisConfiguration.java
@@ -0,0 +1,58 @@
+package com.baelding.springbootredis.config;
+
+import com.baelding.springbootredis.model.Session;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.event.EventListener;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisKeyExpiredEvent;
+import org.springframework.data.redis.core.RedisKeyValueAdapter;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.convert.KeyspaceConfiguration;
+import org.springframework.data.redis.core.convert.MappingConfiguration;
+import org.springframework.data.redis.core.index.IndexConfiguration;
+import org.springframework.data.redis.core.mapping.RedisMappingContext;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
+import org.springframework.stereotype.Component;
+
+import java.util.Collections;
+
+@Configuration
+@EnableRedisRepositories(enableKeyspaceEvents = RedisKeyValueAdapter.EnableKeyspaceEvents.ON_STARTUP)
+@Slf4j
+public class RedisConfiguration {
+    @Bean
+    public RedisTemplate<String, Session> getRedisTemplate(RedisConnectionFactory redisConnectionFactory) {
+        RedisTemplate<String, Session> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(redisConnectionFactory);
+
+        return redisTemplate;
+    }
+
+    @Bean
+    public RedisMappingContext keyValueMappingContext() {
+        return new RedisMappingContext(new MappingConfiguration(new IndexConfiguration(), new MyKeyspaceConfiguration()));
+    }
+
+    public static class MyKeyspaceConfiguration extends KeyspaceConfiguration {
+
+        @Override
+        protected Iterable<KeyspaceSettings> initialConfiguration() {
+            KeyspaceSettings keyspaceSettings = new KeyspaceSettings(Session.class, "session");
+            keyspaceSettings.setTimeToLive(60L);
+            return Collections.singleton(keyspaceSettings);
+        }
+    }
+
+    @Component
+    public static class SessionExpiredEventListener {
+        @EventListener
+        public void handleRedisKeyExpiredEvent(RedisKeyExpiredEvent<Session> event) {
+            Session expiredSession = (Session) event.getValue();
+            assert expiredSession != null;
+            log.info("Session with key={} has expired", expiredSession.getId());
+        }
+    }
+}
diff --git a/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/controller/SessionController.java b/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/controller/SessionController.java
new file mode 100644
index 0000000000..156ca0195f
--- /dev/null
+++ b/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/controller/SessionController.java
@@ -0,0 +1,49 @@
+package com.baelding.springbootredis.controller;
+
+import com.baelding.springbootredis.dto.SessionCreateRequest;
+import com.baelding.springbootredis.model.Session;
+import com.baelding.springbootredis.service.cache.session.SessionCache;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/v1/sessions")
+public class SessionController {
+    private static final String LOCATION_HEADER_VALUE_FORMAT = "/v1/sessions/%s";
+
+    @Autowired
+    private SessionCache sessionCache;
+
+    @GetMapping
+    public List<Session> getAllSessions() {
+        return sessionCache.getAllSessions();
+    }
+
+    @GetMapping("/{id}")
+    public Session getSession(@PathVariable("id") String id) {
+        return sessionCache.getSession(id);
+    }
+
+    @PostMapping
+    public ResponseEntity<Session> createASession(@RequestBody SessionCreateRequest sessionCreateRequest) {
+        Session createdSession = sessionCache.createASession(Session.builder().expirationInSeconds(sessionCreateRequest.getExpirationInSeconds()).build());
+
+        MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
+        headers.set(HttpHeaders.LOCATION, String.format(LOCATION_HEADER_VALUE_FORMAT, createdSession.getId()));
+
+        return new ResponseEntity<>(createdSession, new HttpHeaders(headers), HttpStatus.CREATED);
+    }
+}
diff --git a/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/dto/SessionCreateRequest.java b/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/dto/SessionCreateRequest.java
new file mode 100644
index 0000000000..18fed5c034
--- /dev/null
+++ b/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/dto/SessionCreateRequest.java
@@ -0,0 +1,14 @@
+package com.baelding.springbootredis.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SessionCreateRequest {
+    private Long expirationInSeconds;
+}
diff --git a/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/exception/session/SessionNotFoundException.java b/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/exception/session/SessionNotFoundException.java
new file mode 100644
index 0000000000..ff4e0e2947
--- /dev/null
+++ b/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/exception/session/SessionNotFoundException.java
@@ -0,0 +1,12 @@
+package com.baelding.springbootredis.exception.session;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(value = HttpStatus.NOT_FOUND)
+public class SessionNotFoundException extends RuntimeException {
+    private static final String MESSAGE_FORMAT = "Session with id=%s doesn't exists!";
+    public SessionNotFoundException(String id) {
+        super(String.format(MESSAGE_FORMAT, id));
+    }
+}
diff --git a/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/model/Session.java b/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/model/Session.java
new file mode 100644
index 0000000000..5c9d26147e
--- /dev/null
+++ b/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/model/Session.java
@@ -0,0 +1,19 @@
+package com.baelding.springbootredis.model;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.redis.core.RedisHash;
+import org.springframework.data.redis.core.TimeToLive;
+
+@Data
+@Builder
+@EqualsAndHashCode
+@RedisHash(timeToLive = 60L)
+public class Session {
+    @Id
+    private String id;
+    @TimeToLive
+    private Long expirationInSeconds;
+}
diff --git a/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/repository/SessionRepository.java b/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/repository/SessionRepository.java
new file mode 100644
index 0000000000..0fbc13aa63
--- /dev/null
+++ b/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/repository/SessionRepository.java
@@ -0,0 +1,7 @@
+package com.baelding.springbootredis.repository;
+
+import com.baelding.springbootredis.model.Session;
+import org.springframework.data.repository.CrudRepository;
+
+public interface SessionRepository extends CrudRepository<Session, String> {
+}
diff --git a/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/service/cache/session/RedisSessionCache.java b/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/service/cache/session/RedisSessionCache.java
new file mode 100644
index 0000000000..bb89afaeae
--- /dev/null
+++ b/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/service/cache/session/RedisSessionCache.java
@@ -0,0 +1,34 @@
+package com.baelding.springbootredis.service.cache.session;
+
+import com.baelding.springbootredis.exception.session.SessionNotFoundException;
+import com.baelding.springbootredis.model.Session;
+import com.baelding.springbootredis.repository.SessionRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.function.UnaryOperator;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@Service
+public class RedisSessionCache implements SessionCache {
+    @Autowired
+    private SessionRepository sessionRepository;
+
+    @Override
+    public Session createASession(Session session) {
+        return sessionRepository.save(session);
+    }
+
+    @Override
+    public Session getSession(String id) {
+        return sessionRepository.findById(id).orElseThrow(() -> new SessionNotFoundException(id));
+    }
+
+    @Override
+    public List<Session> getAllSessions() {
+        return Stream.iterate(sessionRepository.findAll().iterator(), Iterator::hasNext, UnaryOperator.identity()).map(Iterator::next).collect(Collectors.toList());
+    }
+}
diff --git a/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/service/cache/session/SessionCache.java b/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/service/cache/session/SessionCache.java
new file mode 100644
index 0000000000..18fb738631
--- /dev/null
+++ b/spring-boot-modules/spring-boot-redis/src/main/java/com/baelding/springbootredis/service/cache/session/SessionCache.java
@@ -0,0 +1,12 @@
+package com.baelding.springbootredis.service.cache.session;
+
+import com.baelding.springbootredis.model.Session;
+
+import java.util.List;
+
+public interface SessionCache {
+    Session createASession(Session session);
+    Session getSession(String id);
+    List<Session> getAllSessions();
+
+}
diff --git a/spring-boot-modules/spring-boot-redis/src/main/resources/application.properties b/spring-boot-modules/spring-boot-redis/src/main/resources/application.properties
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/spring-boot-modules/spring-boot-redis/src/main/resources/application.properties
@@ -0,0 +1 @@
+
diff --git a/spring-boot-modules/spring-boot-redis/src/test/java/com/baelding/springbootredis/SpringBootRedisApplicationIntegrationTest.java b/spring-boot-modules/spring-boot-redis/src/test/java/com/baelding/springbootredis/SpringBootRedisApplicationIntegrationTest.java
new file mode 100644
index 0000000000..69c88706e4
--- /dev/null
+++ b/spring-boot-modules/spring-boot-redis/src/test/java/com/baelding/springbootredis/SpringBootRedisApplicationIntegrationTest.java
@@ -0,0 +1,146 @@
+package com.baelding.springbootredis;
+
+import com.baelding.springbootredis.config.RedisTestConfiguration;
+import com.baelding.springbootredis.dto.SessionCreateRequest;
+import com.baelding.springbootredis.model.Session;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.HttpHeaders;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = RedisTestConfiguration.class)
+class SpringBootRedisApplicationIntegrationTest {
+
+    private static final String V1_SESSIONS_ENDPOINT = "/v1/sessions";
+    private static final String V1_GET_SESSION_BY_ID_ENDPOINT_TEMPLATE = V1_SESSIONS_ENDPOINT + "/%s";
+    @Autowired
+    private WebTestClient webTestClient;
+    private static Random random;
+
+    @BeforeAll
+    public static void beforeAll() {
+        random = new Random();
+    }
+
+    @Test
+    @DisplayName("""
+      WHEN get session endpoint is called
+      THEN return a success response.
+      """)
+    void shouldBeAbleToCallGetSessionsEndpoint() {
+        webTestClient.get().uri(V1_SESSIONS_ENDPOINT).exchange().expectStatus().isOk();
+    }
+
+    @Test
+    @DisplayName("""
+      WHEN requested to create a session with certain expiration value
+      THEN successfully create a session with the desired expiration.
+      """)
+    void shouldBeAbleToCreateASessionWithCertainExpiration() {
+        Long expirationInSeconds = 10L;
+
+        SessionCreateRequest sessionCreateRequest = SessionCreateRequest.builder().expirationInSeconds(expirationInSeconds).build();
+
+        Session session = webTestClient.post().uri(V1_SESSIONS_ENDPOINT).bodyValue(sessionCreateRequest).exchange().expectStatus().isCreated().expectHeader().exists(HttpHeaders.LOCATION).expectBody(Session.class).returnResult().getResponseBody();
+
+        Assertions.assertNotNull(session);
+        Assertions.assertEquals(expirationInSeconds, session.getExpirationInSeconds());
+    }
+
+    @Test
+    @DisplayName("""
+      GIVEN one or multiple session exists
+      WHEN get sessions endpoint is called
+      THEN return the all the existing session.
+      """)
+    void shouldBeAbleToGetTheExistingSessions() {
+        // Given
+        SessionCreateRequest session = SessionCreateRequest.builder().expirationInSeconds(300L).build();
+
+        int numberOfSessionsToCreate = random.nextInt(5);
+
+        List<Session> createdSessions = IntStream.range(0, numberOfSessionsToCreate)
+          .mapToObj(i -> webTestClient.post().uri(V1_SESSIONS_ENDPOINT).bodyValue(session).exchange().expectStatus().isCreated().expectBody(Session.class).returnResult().getResponseBody())
+          .collect(Collectors.toList());
+
+        // WHEN
+        webTestClient.get().uri(V1_SESSIONS_ENDPOINT).exchange().expectStatus()
+          // THEN
+          .isOk().expectBodyList(Session.class).value(sessions -> createdSessions.forEach(createdSession -> Assertions.assertTrue(sessions.contains(createdSession))));
+    }
+
+    @Test
+    @DisplayName("""
+      GIVEN a session is created with a given identifier
+      WHEN the session with the identifier is requested
+      THEN return the session
+      """)
+    void getSessionById() {
+        // GIVEN
+        SessionCreateRequest sessionCreateRequest = SessionCreateRequest.builder().expirationInSeconds(10L).build();
+
+        Session createdSession = webTestClient.post().uri(V1_SESSIONS_ENDPOINT).bodyValue(sessionCreateRequest).exchange().expectStatus().isCreated().expectBody(Session.class).returnResult().getResponseBody();
+        Assertions.assertNotNull(createdSession);
+
+        // WHEN
+        webTestClient.get().uri(String.format(V1_GET_SESSION_BY_ID_ENDPOINT_TEMPLATE, createdSession.getId())).exchange()
+          // THEN
+          .expectStatus().isOk().expectBody(Session.class).isEqualTo(createdSession);
+    }
+
+    @Test
+    @DisplayName("""
+      GIVEN a session identifier which doesn't exists
+      WHEN the session with the identifier is requested
+      THEN return 404 not found
+      """)
+    void getSessionByIdNotFound() {
+        // GIVEN
+        String sessionId = UUID.randomUUID().toString();
+
+        // WHEN
+        webTestClient.get().uri(String.format(V1_GET_SESSION_BY_ID_ENDPOINT_TEMPLATE, sessionId)).exchange()
+          // THEN
+          .expectStatus().isNotFound();
+    }
+
+    @Test
+    @DisplayName("""
+      GIVEN a session is created with a stipulated expiration
+      WHEN the session is requested before the expiration period
+      THEN return the session
+            
+      WHEN the same session is requested after the expiration period
+      THEN return 404 not found
+      """)
+    void sessionExpiration() throws InterruptedException {
+        long expirationInSeconds = 3L;
+
+        // GIVEN
+        SessionCreateRequest sessionCreateRequest = SessionCreateRequest.builder().expirationInSeconds(expirationInSeconds).build();
+
+        Session createdSession = webTestClient.post().uri(V1_SESSIONS_ENDPOINT).bodyValue(sessionCreateRequest).exchange().expectStatus().isCreated().expectBody(Session.class).returnResult().getResponseBody();
+        Assertions.assertNotNull(createdSession);
+
+        // WHEN
+        webTestClient.get().uri(String.format(V1_GET_SESSION_BY_ID_ENDPOINT_TEMPLATE, createdSession.getId())).exchange()
+          // THEN
+          .expectStatus().isOk().expectBody(Session.class).isEqualTo(createdSession);
+
+        // WHEN
+        Thread.sleep(expirationInSeconds * 1000);
+        webTestClient.get().uri(String.format(V1_GET_SESSION_BY_ID_ENDPOINT_TEMPLATE, createdSession.getId())).exchange()
+          // THEN
+          .expectStatus().isNotFound();
+    }
+}
diff --git a/spring-boot-modules/spring-boot-redis/src/test/java/com/baelding/springbootredis/config/RedisTestConfiguration.java b/spring-boot-modules/spring-boot-redis/src/test/java/com/baelding/springbootredis/config/RedisTestConfiguration.java
new file mode 100644
index 0000000000..6fbd140981
--- /dev/null
+++ b/spring-boot-modules/spring-boot-redis/src/test/java/com/baelding/springbootredis/config/RedisTestConfiguration.java
@@ -0,0 +1,27 @@
+package com.baelding.springbootredis.config;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.boot.test.context.TestConfiguration;
+import redis.embedded.RedisServer;
+
+@TestConfiguration
+public class RedisTestConfiguration {
+
+    private final RedisServer redisServer;
+
+    public RedisTestConfiguration(RedisProperties redisProperties) {
+        this.redisServer = new RedisServer(redisProperties.getPort());
+    }
+
+    @PostConstruct
+    public void postConstruct() {
+        redisServer.start();
+    }
+
+    @PreDestroy
+    public void preDestroy() {
+        redisServer.stop();
+    }
+}
diff --git a/spring-boot-modules/spring-boot-resilience4j/README.md b/spring-boot-modules/spring-boot-resilience4j/README.md
new file mode 100644
index 0000000000..e6c73674ce
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/README.md
@@ -0,0 +1,3 @@
+### Relevant Articles:
+
+- [Resilience4j Events Endpoints](https://www.baeldung.com/resilience4j-events-endpoints)
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-resilience4j/pom.xml b/spring-boot-modules/spring-boot-resilience4j/pom.xml
new file mode 100644
index 0000000000..609bc7fc49
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>
+    <groupId>com.example</groupId>
+    <artifactId>spring-boot-resilience4j</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-boot-resilience4j</name>
+
+    <parent>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.github.resilience4j</groupId>
+            <artifactId>resilience4j-spring-boot2</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.14.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock-jre8</artifactId>
+            <version>2.35.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-resilience4j/src/main/java/com/baeldung/resilience4j/eventendpoints/ApiExceptionHandler.java b/spring-boot-modules/spring-boot-resilience4j/src/main/java/com/baeldung/resilience4j/eventendpoints/ApiExceptionHandler.java
new file mode 100644
index 0000000000..4e14d5c532
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/src/main/java/com/baeldung/resilience4j/eventendpoints/ApiExceptionHandler.java
@@ -0,0 +1,29 @@
+package com.baeldung.resilience4j.eventendpoints;
+
+import io.github.resilience4j.bulkhead.BulkheadFullException;
+import io.github.resilience4j.circuitbreaker.CallNotPermittedException;
+import io.github.resilience4j.ratelimiter.RequestNotPermitted;
+import java.util.concurrent.TimeoutException;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ControllerAdvice
+public class ApiExceptionHandler {
+  @ExceptionHandler({CallNotPermittedException.class})
+  @ResponseStatus(HttpStatus.SERVICE_UNAVAILABLE)
+  public void handleCallNotPermittedException() {}
+
+  @ExceptionHandler({TimeoutException.class})
+  @ResponseStatus(HttpStatus.REQUEST_TIMEOUT)
+  public void handleTimeoutException() {}
+
+  @ExceptionHandler({BulkheadFullException.class})
+  @ResponseStatus(HttpStatus.BANDWIDTH_LIMIT_EXCEEDED)
+  public void handleBulkheadFullException() {}
+
+  @ExceptionHandler({RequestNotPermitted.class})
+  @ResponseStatus(HttpStatus.TOO_MANY_REQUESTS)
+  public void handleRequestNotPermitted() {}
+}
diff --git a/spring-boot-modules/spring-boot-resilience4j/src/main/java/com/baeldung/resilience4j/eventendpoints/ExternalAPICaller.java b/spring-boot-modules/spring-boot-resilience4j/src/main/java/com/baeldung/resilience4j/eventendpoints/ExternalAPICaller.java
new file mode 100644
index 0000000000..a860e7e3cc
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/src/main/java/com/baeldung/resilience4j/eventendpoints/ExternalAPICaller.java
@@ -0,0 +1,28 @@
+package com.baeldung.resilience4j.eventendpoints;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+@Component
+public class ExternalAPICaller {
+  private final RestTemplate restTemplate;
+
+  @Autowired
+  public ExternalAPICaller(RestTemplate restTemplate) {
+    this.restTemplate = restTemplate;
+  }
+
+  public String callApi() {
+    return restTemplate.getForObject("/api/external", String.class);
+  }
+
+  public String callApiWithDelay() {
+    String result = restTemplate.getForObject("/api/external", String.class);
+    try {
+      Thread.sleep(5000);
+    } catch (InterruptedException ignore) {
+    }
+    return result;
+  }
+}
diff --git a/spring-boot-modules/spring-boot-resilience4j/src/main/java/com/baeldung/resilience4j/eventendpoints/ExternalApiCallerConfig.java b/spring-boot-modules/spring-boot-resilience4j/src/main/java/com/baeldung/resilience4j/eventendpoints/ExternalApiCallerConfig.java
new file mode 100644
index 0000000000..7145e58877
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/src/main/java/com/baeldung/resilience4j/eventendpoints/ExternalApiCallerConfig.java
@@ -0,0 +1,14 @@
+package com.baeldung.resilience4j.eventendpoints;
+
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+public class ExternalApiCallerConfig {
+  @Bean
+  public RestTemplate restTemplate() {
+    return new RestTemplateBuilder().rootUri("http://localhost:9090").build();
+  }
+}
diff --git a/spring-boot-modules/spring-boot-resilience4j/src/main/java/com/baeldung/resilience4j/eventendpoints/ResilientApp.java b/spring-boot-modules/spring-boot-resilience4j/src/main/java/com/baeldung/resilience4j/eventendpoints/ResilientApp.java
new file mode 100644
index 0000000000..35b999a9de
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/src/main/java/com/baeldung/resilience4j/eventendpoints/ResilientApp.java
@@ -0,0 +1,12 @@
+package com.baeldung.resilience4j.eventendpoints;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication()
+public class ResilientApp {
+
+  public static void main(String[] args) {
+    SpringApplication.run(ResilientApp.class, args);
+  }
+}
diff --git a/spring-boot-modules/spring-boot-resilience4j/src/main/java/com/baeldung/resilience4j/eventendpoints/ResilientAppController.java b/spring-boot-modules/spring-boot-resilience4j/src/main/java/com/baeldung/resilience4j/eventendpoints/ResilientAppController.java
new file mode 100644
index 0000000000..ccd0108c2f
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/src/main/java/com/baeldung/resilience4j/eventendpoints/ResilientAppController.java
@@ -0,0 +1,58 @@
+package com.baeldung.resilience4j.eventendpoints;
+
+import io.github.resilience4j.bulkhead.annotation.Bulkhead;
+import io.github.resilience4j.circuitbreaker.annotation.CircuitBreaker;
+import io.github.resilience4j.ratelimiter.annotation.RateLimiter;
+import io.github.resilience4j.retry.annotation.Retry;
+import io.github.resilience4j.timelimiter.annotation.TimeLimiter;
+import java.util.concurrent.CompletableFuture;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/")
+public class ResilientAppController {
+
+  private final ExternalAPICaller externalAPICaller;
+
+  @Autowired
+  public ResilientAppController(ExternalAPICaller externalApi) {
+    this.externalAPICaller = externalApi;
+  }
+
+  @GetMapping("/circuit-breaker")
+  @CircuitBreaker(name = "externalService")
+  public String circuitBreakerApi() {
+    return externalAPICaller.callApi();
+  }
+
+  @GetMapping("/retry")
+  @Retry(name = "externalService", fallbackMethod = "fallbackAfterRetry")
+  public String retryApi() {
+    return externalAPICaller.callApi();
+  }
+
+  @GetMapping("/bulkhead")
+  @Bulkhead(name = "externalService")
+  public String bulkheadApi() {
+    return externalAPICaller.callApi();
+  }
+
+  @GetMapping("/rate-limiter")
+  @RateLimiter(name = "externalService")
+  public String rateLimitApi() {
+    return externalAPICaller.callApi();
+  }
+
+  @GetMapping("/time-limiter")
+  @TimeLimiter(name = "externalService")
+  public CompletableFuture<String> timeLimiterApi() {
+    return CompletableFuture.supplyAsync(externalAPICaller::callApiWithDelay);
+  }
+
+  public String fallbackAfterRetry(Exception ex) {
+    return "all retries have exhausted";
+  }
+}
diff --git a/spring-boot-modules/spring-boot-resilience4j/src/main/resources/application.yml b/spring-boot-modules/spring-boot-resilience4j/src/main/resources/application.yml
new file mode 100644
index 0000000000..81904f56d9
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/src/main/resources/application.yml
@@ -0,0 +1,60 @@
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+
+resilience4j.circuitbreaker:
+  configs:
+    default:
+      registerHealthIndicator: true
+      slidingWindowSize: 10
+      minimumNumberOfCalls: 5
+      permittedNumberOfCallsInHalfOpenState: 3
+      automaticTransitionFromOpenToHalfOpenEnabled: true
+      waitDurationInOpenState: 5s
+      failureRateThreshold: 50
+      eventConsumerBufferSize: 50
+  instances:
+    externalService:
+      baseConfig: default
+
+resilience4j.retry:
+  configs:
+    default:
+      maxAttempts: 3
+      waitDuration: 100
+  instances:
+    externalService:
+      baseConfig: default
+
+resilience4j.timelimiter:
+  configs:
+    default:
+      cancelRunningFuture: true
+      timeoutDuration: 2s
+  instances:
+    externalService:
+      baseConfig: default
+
+resilience4j.bulkhead:
+  configs:
+    default:
+      max-concurrent-calls: 3
+      max-wait-duration: 1
+  instances:
+    externalService:
+      baseConfig: default
+
+resilience4j.ratelimiter:
+  configs:
+    default:
+      limit-for-period: 5
+      limit-refresh-period: 60s
+      timeout-duration: 0s
+      allow-health-indicator-to-fail: true
+      subscribe-for-events: true
+      event-consumer-buffer-size: 50
+  instances:
+    externalService:
+      baseConfig: default
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/ResilientAppControllerIntegrationTest.java b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/ResilientAppControllerIntegrationTest.java
new file mode 100644
index 0000000000..d1951218de
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/ResilientAppControllerIntegrationTest.java
@@ -0,0 +1,319 @@
+package com.baeldung.resilience4j.eventendpoints;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.springframework.http.HttpStatus.*;
+
+import com.baeldung.resilience4j.eventendpoints.model.*;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JSR310Module;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
+import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
+import java.net.URI;
+import java.nio.charset.Charset;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.*;
+import java.util.stream.IntStream;
+import org.apache.commons.io.IOUtils;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+class ResilientAppControllerIntegrationTest {
+
+  private final Logger LOGGER = LoggerFactory.getLogger(getClass());
+
+  @Autowired private TestRestTemplate restTemplate;
+
+  @LocalServerPort private Integer port;
+
+  private static final ObjectMapper objectMapper =
+      new ObjectMapper().registerModule(new JSR310Module());
+
+  @RegisterExtension
+  static WireMockExtension EXTERNAL_SERVICE =
+      WireMockExtension.newInstance()
+          .options(WireMockConfiguration.wireMockConfig().port(9090))
+          .build();
+
+  @Test
+  void testCircuitBreakerEvents() throws Exception {
+    EXTERNAL_SERVICE.stubFor(WireMock.get("/api/external").willReturn(serverError()));
+
+    IntStream.rangeClosed(1, 5)
+        .forEach(
+            i -> {
+              ResponseEntity<String> response =
+                  restTemplate.getForEntity("/api/circuit-breaker", String.class);
+              assertThat(response.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
+            });
+
+    // Fetch the events generated by the above calls
+    List<CircuitBreakerEvent> circuitBreakerEvents = getCircuitBreakerEvents();
+    assertThat(circuitBreakerEvents.size()).isEqualTo(7);
+
+    // The first 5 events are the error events corresponding to the above server error responses
+    IntStream.rangeClosed(0, 4)
+        .forEach(
+            i -> {
+              assertThat(circuitBreakerEvents.get(i).getCircuitBreakerName())
+                  .isEqualTo("externalService");
+              assertThat(circuitBreakerEvents.get(i).getType()).isEqualTo("ERROR");
+              assertThat(circuitBreakerEvents.get(i).getCreationTime()).isNotNull();
+              assertThat(circuitBreakerEvents.get(i).getErrorMessage()).isNotNull();
+              assertThat(circuitBreakerEvents.get(i).getDurationInMs()).isNotNull();
+              assertThat(circuitBreakerEvents.get(i).getStateTransition()).isNull();
+            });
+
+    // Following event signals the configured failure rate exceeded
+    CircuitBreakerEvent failureRateExceededEvent = circuitBreakerEvents.get(5);
+    assertThat(failureRateExceededEvent.getCircuitBreakerName()).isEqualTo("externalService");
+    assertThat(failureRateExceededEvent.getType()).isEqualTo("FAILURE_RATE_EXCEEDED");
+    assertThat(failureRateExceededEvent.getCreationTime()).isNotNull();
+    assertThat(failureRateExceededEvent.getErrorMessage()).isNull();
+    assertThat(failureRateExceededEvent.getDurationInMs()).isNull();
+    assertThat(failureRateExceededEvent.getStateTransition()).isNull();
+
+    // Following event signals the state transition from CLOSED TO OPEN
+    CircuitBreakerEvent stateTransitionEvent = circuitBreakerEvents.get(6);
+    assertThat(stateTransitionEvent.getCircuitBreakerName()).isEqualTo("externalService");
+    assertThat(stateTransitionEvent.getType()).isEqualTo("STATE_TRANSITION");
+    assertThat(stateTransitionEvent.getCreationTime()).isNotNull();
+    assertThat(stateTransitionEvent.getErrorMessage()).isNull();
+    assertThat(stateTransitionEvent.getDurationInMs()).isNull();
+    assertThat(stateTransitionEvent.getStateTransition()).isEqualTo("CLOSED_TO_OPEN");
+
+    IntStream.rangeClosed(1, 5)
+        .forEach(
+            i -> {
+              ResponseEntity<String> response =
+                  restTemplate.getForEntity("/api/circuit-breaker", String.class);
+              assertThat(response.getStatusCode()).isEqualTo(HttpStatus.SERVICE_UNAVAILABLE);
+            });
+
+    /// Fetch the events generated by the above calls
+    List<CircuitBreakerEvent> updatedCircuitBreakerEvents = getCircuitBreakerEvents();
+    assertThat(updatedCircuitBreakerEvents.size()).isEqualTo(12);
+
+    // Newly added events will be of type NOT_PERMITTED since the Circuit Breaker is in OPEN state
+    IntStream.rangeClosed(7, 11)
+        .forEach(
+            i -> {
+              assertThat(updatedCircuitBreakerEvents.get(i).getCircuitBreakerName())
+                  .isEqualTo("externalService");
+              assertThat(updatedCircuitBreakerEvents.get(i).getType()).isEqualTo("NOT_PERMITTED");
+              assertThat(updatedCircuitBreakerEvents.get(i).getCreationTime()).isNotNull();
+              assertThat(updatedCircuitBreakerEvents.get(i).getErrorMessage()).isNull();
+              assertThat(updatedCircuitBreakerEvents.get(i).getDurationInMs()).isNull();
+              assertThat(updatedCircuitBreakerEvents.get(i).getStateTransition()).isNull();
+            });
+
+    EXTERNAL_SERVICE.verify(5, getRequestedFor(urlEqualTo("/api/external")));
+  }
+
+  private List<CircuitBreakerEvent> getCircuitBreakerEvents() throws Exception {
+    String jsonEventsList =
+        IOUtils.toString(
+            new URI("http://localhost:" + port + "/actuator/circuitbreakerevents"),
+            Charset.forName("UTF-8"));
+    CircuitBreakerEvents circuitBreakerEvents =
+        objectMapper.readValue(jsonEventsList, CircuitBreakerEvents.class);
+    return circuitBreakerEvents.getCircuitBreakerEvents();
+  }
+
+  @Test
+  void testRetryEvents() throws Exception {
+    EXTERNAL_SERVICE.stubFor(WireMock.get("/api/external").willReturn(ok()));
+    ResponseEntity<String> response1 = restTemplate.getForEntity("/api/retry", String.class);
+    EXTERNAL_SERVICE.verify(1, getRequestedFor(urlEqualTo("/api/external")));
+
+    EXTERNAL_SERVICE.resetRequests();
+
+    EXTERNAL_SERVICE.stubFor(WireMock.get("/api/external").willReturn(serverError()));
+    ResponseEntity<String> response2 = restTemplate.getForEntity("/api/retry", String.class);
+    assertThat(response2.getBody()).isEqualTo("all retries have exhausted");
+    EXTERNAL_SERVICE.verify(3, getRequestedFor(urlEqualTo("/api/external")));
+
+    List<RetryEvent> retryEvents = getRetryEvents();
+    assertThat(retryEvents.size()).isEqualTo(3);
+
+    // First 2 events should be retry events
+    IntStream.rangeClosed(0, 1)
+        .forEach(
+            i -> {
+              assertThat(retryEvents.get(i).getRetryName()).isEqualTo("externalService");
+              assertThat(retryEvents.get(i).getType()).isEqualTo("RETRY");
+              assertThat(retryEvents.get(i).getCreationTime()).isNotNull();
+              assertThat(retryEvents.get(i).getErrorMessage()).isNotNull();
+              assertThat(retryEvents.get(i).getNumberOfAttempts()).isEqualTo(i + 1);
+            });
+
+    // Last event should be an error event because the configured num of retries is reached
+    RetryEvent errorRetryEvent = retryEvents.get(2);
+    assertThat(errorRetryEvent.getRetryName()).isEqualTo("externalService");
+    assertThat(errorRetryEvent.getType()).isEqualTo("ERROR");
+    assertThat(errorRetryEvent.getCreationTime()).isNotNull();
+    assertThat(errorRetryEvent.getErrorMessage()).isNotNull();
+    assertThat(errorRetryEvent.getNumberOfAttempts()).isEqualTo(3);
+  }
+
+  private List<RetryEvent> getRetryEvents() throws Exception {
+    String jsonEventsList =
+        IOUtils.toString(
+            new URI("http://localhost:" + port + "/actuator/retryevents"),
+            Charset.forName("UTF-8"));
+    RetryEvents retryEvents = objectMapper.readValue(jsonEventsList, RetryEvents.class);
+    return retryEvents.getRetryEvents();
+  }
+
+  @Test
+  void testTimeLimiterEvents() throws Exception {
+    EXTERNAL_SERVICE.stubFor(WireMock.get("/api/external").willReturn(ok()));
+    ResponseEntity<String> response = restTemplate.getForEntity("/api/time-limiter", String.class);
+
+    assertThat(response.getStatusCode()).isEqualTo(HttpStatus.REQUEST_TIMEOUT);
+    EXTERNAL_SERVICE.verify(1, getRequestedFor(urlEqualTo("/api/external")));
+
+    List<TimeLimiterEvent> timeLimiterEvents = getTimeLimiterEvents();
+    assertThat(timeLimiterEvents.size()).isEqualTo(1);
+    TimeLimiterEvent timeoutEvent = timeLimiterEvents.get(0);
+    assertThat(timeoutEvent.getTimeLimiterName()).isEqualTo("externalService");
+    assertThat(timeoutEvent.getType()).isEqualTo("TIMEOUT");
+    assertThat(timeoutEvent.getCreationTime()).isNotNull();
+  }
+
+  private List<TimeLimiterEvent> getTimeLimiterEvents() throws Exception {
+    String jsonEventsList =
+        IOUtils.toString(
+            new URI("http://localhost:" + port + "/actuator/timelimiterevents"),
+            Charset.forName("UTF-8"));
+    TimeLimiterEvents timeLimiterEvents =
+        objectMapper.readValue(jsonEventsList, TimeLimiterEvents.class);
+    return timeLimiterEvents.getTimeLimiterEvents();
+  }
+
+  @Test
+  void testBulkheadEvents() throws Exception {
+    EXTERNAL_SERVICE.stubFor(WireMock.get("/api/external").willReturn(ok()));
+    Map<Integer, Integer> responseStatusCount = new ConcurrentHashMap<>();
+    ExecutorService executorService = Executors.newFixedThreadPool(5);
+    CountDownLatch latch = new CountDownLatch(5);
+
+    IntStream.rangeClosed(1, 5)
+        .forEach(
+            i ->
+                executorService.execute(
+                    () -> {
+                      ResponseEntity<String> response =
+                          restTemplate.getForEntity("/api/bulkhead", String.class);
+                      int statusCode = response.getStatusCodeValue();
+                      responseStatusCount.merge(statusCode, 1, Integer::sum);
+                      latch.countDown();
+                    }));
+    latch.await();
+    executorService.shutdown();
+
+    assertEquals(2, responseStatusCount.keySet().size());
+    LOGGER.info("Response statuses: " + responseStatusCount.keySet());
+    assertTrue(responseStatusCount.containsKey(BANDWIDTH_LIMIT_EXCEEDED.value()));
+    assertTrue(responseStatusCount.containsKey(OK.value()));
+    EXTERNAL_SERVICE.verify(3, getRequestedFor(urlEqualTo("/api/external")));
+
+    List<BulkheadEvent> bulkheadEvents = getBulkheadEvents();
+
+    // Based on the configuration, the first 3 calls should be permitted, so we should see the
+    // CALL_PERMITTED events
+    IntStream.rangeClosed(0, 2)
+        .forEach(
+            i -> {
+              assertThat(bulkheadEvents.get(i).getBulkheadName()).isEqualTo("externalService");
+              assertThat(bulkheadEvents.get(i).getType()).isEqualTo("CALL_PERMITTED");
+              assertThat(bulkheadEvents.get(i).getCreationTime()).isNotNull();
+            });
+
+    // For the other 2 calls made we should see the CALL_REJECTED events
+    IntStream.rangeClosed(3, 4)
+        .forEach(
+            i -> {
+              assertThat(bulkheadEvents.get(i).getBulkheadName()).isEqualTo("externalService");
+              assertThat(bulkheadEvents.get(i).getType()).isEqualTo("CALL_REJECTED");
+              assertThat(bulkheadEvents.get(i).getCreationTime()).isNotNull();
+            });
+  }
+
+  private List<BulkheadEvent> getBulkheadEvents() throws Exception {
+    String jsonEventsList =
+        IOUtils.toString(
+            new URI("http://localhost:" + port + "/actuator/bulkheadevents"),
+            Charset.forName("UTF-8"));
+    BulkheadEvents bulkheadEvents = objectMapper.readValue(jsonEventsList, BulkheadEvents.class);
+    return bulkheadEvents.getBulkheadEvents();
+  }
+
+  @Test
+  void testRateLimiterEvents() throws Exception {
+    EXTERNAL_SERVICE.stubFor(WireMock.get("/api/external").willReturn(ok()));
+    Map<Integer, Integer> responseStatusCount = new ConcurrentHashMap<>();
+
+    IntStream.rangeClosed(1, 50)
+        .forEach(
+            i -> {
+              ResponseEntity<String> response =
+                  restTemplate.getForEntity("/api/rate-limiter", String.class);
+              int statusCode = response.getStatusCodeValue();
+              responseStatusCount.put(
+                  statusCode, responseStatusCount.getOrDefault(statusCode, 0) + 1);
+            });
+
+    assertEquals(2, responseStatusCount.keySet().size());
+    assertTrue(responseStatusCount.containsKey(TOO_MANY_REQUESTS.value()));
+    assertTrue(responseStatusCount.containsKey(OK.value()));
+    EXTERNAL_SERVICE.verify(5, getRequestedFor(urlEqualTo("/api/external")));
+
+    List<RateLimiterEvent> rateLimiterEvents = getRateLimiterEvents();
+    assertThat(rateLimiterEvents.size()).isEqualTo(50);
+
+    // First allowed calls in the rate limit is 5, so we should see for those SUCCESSFUL_ACQUIRE
+    // events
+    IntStream.rangeClosed(0, 4)
+        .forEach(
+            i -> {
+              assertThat(rateLimiterEvents.get(i).getRateLimiterName())
+                  .isEqualTo("externalService");
+              assertThat(rateLimiterEvents.get(i).getType()).isEqualTo("SUCCESSFUL_ACQUIRE");
+              assertThat(rateLimiterEvents.get(i).getCreationTime()).isNotNull();
+            });
+
+    // the rest should be FAILED_ACQUIRE events since the rate limiter kicks in
+    IntStream.rangeClosed(5, rateLimiterEvents.size() - 1)
+        .forEach(
+            i -> {
+              assertThat(rateLimiterEvents.get(i).getRateLimiterName())
+                  .isEqualTo("externalService");
+              assertThat(rateLimiterEvents.get(i).getType()).isEqualTo("FAILED_ACQUIRE");
+              assertThat(rateLimiterEvents.get(i).getCreationTime()).isNotNull();
+            });
+  }
+
+  private List<RateLimiterEvent> getRateLimiterEvents() throws Exception {
+    String jsonEventsList =
+        IOUtils.toString(
+            new URI("http://localhost:" + port + "/actuator/ratelimiterevents"),
+            Charset.forName("UTF-8"));
+    RateLimiterEvents rateLimiterEvents =
+        objectMapper.readValue(jsonEventsList, RateLimiterEvents.class);
+    return rateLimiterEvents.getRateLimiterEvents();
+  }
+}
diff --git a/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/BulkheadEvent.java b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/BulkheadEvent.java
new file mode 100644
index 0000000000..6d25006bbb
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/BulkheadEvent.java
@@ -0,0 +1,50 @@
+package com.baeldung.resilience4j.eventendpoints.model;
+
+import java.time.ZonedDateTime;
+import java.util.Objects;
+
+public class BulkheadEvent {
+
+  private String bulkheadName;
+  private String type;
+  private ZonedDateTime creationTime;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    BulkheadEvent that = (BulkheadEvent) o;
+    return Objects.equals(bulkheadName, that.bulkheadName)
+        && Objects.equals(type, that.type)
+        && Objects.equals(creationTime, that.creationTime);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(bulkheadName, type, creationTime);
+  }
+
+  public String getBulkheadName() {
+    return bulkheadName;
+  }
+
+  public void setBulkheadName(String bulkheadName) {
+    this.bulkheadName = bulkheadName;
+  }
+
+  public String getType() {
+    return type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  public ZonedDateTime getCreationTime() {
+    return creationTime;
+  }
+
+  public void setCreationTime(ZonedDateTime creationTime) {
+    this.creationTime = creationTime;
+  }
+}
diff --git a/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/BulkheadEvents.java b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/BulkheadEvents.java
new file mode 100644
index 0000000000..7d8b6b2a5f
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/BulkheadEvents.java
@@ -0,0 +1,16 @@
+package com.baeldung.resilience4j.eventendpoints.model;
+
+import java.util.List;
+
+public class BulkheadEvents {
+
+  private List<BulkheadEvent> bulkheadEvents;
+
+  public List<BulkheadEvent> getBulkheadEvents() {
+    return bulkheadEvents;
+  }
+
+  public void setBulkheadEvents(List<BulkheadEvent> bulkheadEvents) {
+    this.bulkheadEvents = bulkheadEvents;
+  }
+}
diff --git a/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/CircuitBreakerEvent.java b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/CircuitBreakerEvent.java
new file mode 100644
index 0000000000..0a07c9b495
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/CircuitBreakerEvent.java
@@ -0,0 +1,81 @@
+package com.baeldung.resilience4j.eventendpoints.model;
+
+import java.time.ZonedDateTime;
+import java.util.Objects;
+
+public class CircuitBreakerEvent {
+
+  private String circuitBreakerName;
+  private String type;
+  private ZonedDateTime creationTime;
+  private String errorMessage;
+  private Integer durationInMs;
+  private String stateTransition;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    CircuitBreakerEvent that = (CircuitBreakerEvent) o;
+    return Objects.equals(circuitBreakerName, that.circuitBreakerName)
+        && Objects.equals(type, that.type)
+        && Objects.equals(creationTime, that.creationTime)
+        && Objects.equals(errorMessage, that.errorMessage)
+        && Objects.equals(durationInMs, that.durationInMs)
+        && Objects.equals(stateTransition, that.stateTransition);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        circuitBreakerName, type, creationTime, errorMessage, durationInMs, stateTransition);
+  }
+
+  public String getCircuitBreakerName() {
+    return circuitBreakerName;
+  }
+
+  public void setCircuitBreakerName(String circuitBreakerName) {
+    this.circuitBreakerName = circuitBreakerName;
+  }
+
+  public String getType() {
+    return type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  public ZonedDateTime getCreationTime() {
+    return creationTime;
+  }
+
+  public void setCreationTime(ZonedDateTime creationTime) {
+    this.creationTime = creationTime;
+  }
+
+  public String getErrorMessage() {
+    return errorMessage;
+  }
+
+  public void setErrorMessage(String errorMessage) {
+    this.errorMessage = errorMessage;
+  }
+
+  public Integer getDurationInMs() {
+    return durationInMs;
+  }
+
+  public void setDurationInMs(Integer durationInMs) {
+    this.durationInMs = durationInMs;
+  }
+
+  public String getStateTransition() {
+    return stateTransition;
+  }
+
+  public void setStateTransition(String stateTransition) {
+    this.stateTransition = stateTransition;
+  }
+}
diff --git a/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/CircuitBreakerEvents.java b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/CircuitBreakerEvents.java
new file mode 100644
index 0000000000..c3ec741d05
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/CircuitBreakerEvents.java
@@ -0,0 +1,16 @@
+package com.baeldung.resilience4j.eventendpoints.model;
+
+import java.util.List;
+
+public class CircuitBreakerEvents {
+
+  private List<CircuitBreakerEvent> circuitBreakerEvents;
+
+  public List<CircuitBreakerEvent> getCircuitBreakerEvents() {
+    return circuitBreakerEvents;
+  }
+
+  public void setCircuitBreakerEvents(List<CircuitBreakerEvent> circuitBreakerEvents) {
+    this.circuitBreakerEvents = circuitBreakerEvents;
+  }
+}
diff --git a/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/RateLimiterEvent.java b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/RateLimiterEvent.java
new file mode 100644
index 0000000000..ccc0f5a9b3
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/RateLimiterEvent.java
@@ -0,0 +1,50 @@
+package com.baeldung.resilience4j.eventendpoints.model;
+
+import java.time.ZonedDateTime;
+import java.util.Objects;
+
+public class RateLimiterEvent {
+
+  private String rateLimiterName;
+  private String type;
+  private ZonedDateTime creationTime;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    RateLimiterEvent that = (RateLimiterEvent) o;
+    return Objects.equals(rateLimiterName, that.rateLimiterName)
+        && Objects.equals(type, that.type)
+        && Objects.equals(creationTime, that.creationTime);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(rateLimiterName, type, creationTime);
+  }
+
+  public String getRateLimiterName() {
+    return rateLimiterName;
+  }
+
+  public void setRateLimiterName(String rateLimiterName) {
+    this.rateLimiterName = rateLimiterName;
+  }
+
+  public String getType() {
+    return type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  public ZonedDateTime getCreationTime() {
+    return creationTime;
+  }
+
+  public void setCreationTime(ZonedDateTime creationTime) {
+    this.creationTime = creationTime;
+  }
+}
diff --git a/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/RateLimiterEvents.java b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/RateLimiterEvents.java
new file mode 100644
index 0000000000..c0cfcdf0d7
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/RateLimiterEvents.java
@@ -0,0 +1,16 @@
+package com.baeldung.resilience4j.eventendpoints.model;
+
+import java.util.List;
+
+public class RateLimiterEvents {
+
+  private List<RateLimiterEvent> rateLimiterEvents;
+
+  public List<RateLimiterEvent> getRateLimiterEvents() {
+    return rateLimiterEvents;
+  }
+
+  public void setRateLimiterEvents(List<RateLimiterEvent> rateLimiterEvents) {
+    this.rateLimiterEvents = rateLimiterEvents;
+  }
+}
diff --git a/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/RetryEvent.java b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/RetryEvent.java
new file mode 100644
index 0000000000..a17d45c679
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/RetryEvent.java
@@ -0,0 +1,70 @@
+package com.baeldung.resilience4j.eventendpoints.model;
+
+import java.time.ZonedDateTime;
+import java.util.Objects;
+
+public class RetryEvent {
+
+  private String retryName;
+  private String type;
+  private ZonedDateTime creationTime;
+  private String errorMessage;
+  private Integer numberOfAttempts;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    RetryEvent that = (RetryEvent) o;
+    return Objects.equals(retryName, that.retryName)
+        && Objects.equals(type, that.type)
+        && Objects.equals(creationTime, that.creationTime)
+        && Objects.equals(errorMessage, that.errorMessage)
+        && Objects.equals(numberOfAttempts, that.numberOfAttempts);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(retryName, type, creationTime, errorMessage, numberOfAttempts);
+  }
+
+  public String getRetryName() {
+    return retryName;
+  }
+
+  public void setRetryName(String retryName) {
+    this.retryName = retryName;
+  }
+
+  public String getType() {
+    return type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  public ZonedDateTime getCreationTime() {
+    return creationTime;
+  }
+
+  public void setCreationTime(ZonedDateTime creationTime) {
+    this.creationTime = creationTime;
+  }
+
+  public String getErrorMessage() {
+    return errorMessage;
+  }
+
+  public void setErrorMessage(String errorMessage) {
+    this.errorMessage = errorMessage;
+  }
+
+  public Integer getNumberOfAttempts() {
+    return numberOfAttempts;
+  }
+
+  public void setNumberOfAttempts(Integer numberOfAttempts) {
+    this.numberOfAttempts = numberOfAttempts;
+  }
+}
diff --git a/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/RetryEvents.java b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/RetryEvents.java
new file mode 100644
index 0000000000..e5bb73ff0c
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/RetryEvents.java
@@ -0,0 +1,16 @@
+package com.baeldung.resilience4j.eventendpoints.model;
+
+import java.util.List;
+
+public class RetryEvents {
+
+  private List<RetryEvent> retryEvents;
+
+  public List<RetryEvent> getRetryEvents() {
+    return retryEvents;
+  }
+
+  public void setRetryEvents(List<RetryEvent> retryEvents) {
+    this.retryEvents = retryEvents;
+  }
+}
diff --git a/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/TimeLimiterEvent.java b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/TimeLimiterEvent.java
new file mode 100644
index 0000000000..07f891c401
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/TimeLimiterEvent.java
@@ -0,0 +1,50 @@
+package com.baeldung.resilience4j.eventendpoints.model;
+
+import java.time.ZonedDateTime;
+import java.util.Objects;
+
+public class TimeLimiterEvent {
+
+  private String timeLimiterName;
+  private String type;
+  private ZonedDateTime creationTime;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    TimeLimiterEvent that = (TimeLimiterEvent) o;
+    return Objects.equals(timeLimiterName, that.timeLimiterName)
+        && Objects.equals(type, that.type)
+        && Objects.equals(creationTime, that.creationTime);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(timeLimiterName, type, creationTime);
+  }
+
+  public String getTimeLimiterName() {
+    return timeLimiterName;
+  }
+
+  public void setTimeLimiterName(String timeLimiterName) {
+    this.timeLimiterName = timeLimiterName;
+  }
+
+  public String getType() {
+    return type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  public ZonedDateTime getCreationTime() {
+    return creationTime;
+  }
+
+  public void setCreationTime(ZonedDateTime creationTime) {
+    this.creationTime = creationTime;
+  }
+}
diff --git a/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/TimeLimiterEvents.java b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/TimeLimiterEvents.java
new file mode 100644
index 0000000000..739ff91916
--- /dev/null
+++ b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/model/TimeLimiterEvents.java
@@ -0,0 +1,16 @@
+package com.baeldung.resilience4j.eventendpoints.model;
+
+import java.util.List;
+
+public class TimeLimiterEvents {
+
+  private List<TimeLimiterEvent> timeLimiterEvents;
+
+  public List<TimeLimiterEvent> getTimeLimiterEvents() {
+    return timeLimiterEvents;
+  }
+
+  public void setTimeLimiterEvents(List<TimeLimiterEvent> timeLimiterEvents) {
+    this.timeLimiterEvents = timeLimiterEvents;
+  }
+}
diff --git a/spring-boot-modules/spring-boot-springdoc/pom.xml b/spring-boot-modules/spring-boot-springdoc/pom.xml
index 8cd94179cf..e21efc35d2 100644
--- a/spring-boot-modules/spring-boot-springdoc/pom.xml
+++ b/spring-boot-modules/spring-boot-springdoc/pom.xml
@@ -146,7 +146,7 @@
                     <plugin>
                         <groupId>org.springdoc</groupId>
                         <artifactId>springdoc-openapi-maven-plugin</artifactId>
-                        <version>1.4</version>
+                        <version>${springdoc-openapi-maven-plugin.version}</version>
                         <executions>
                             <execution>
                                 <phase>integration-test</phase>
@@ -167,9 +167,10 @@
     </profiles>
 
     <properties>
-        <springdoc.version>1.6.8</springdoc.version>
+        <springdoc.version>1.7.0</springdoc.version>
         <asciidoctor-plugin.version>1.5.6</asciidoctor-plugin.version>
         <snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
+        <springdoc-openapi-maven-plugin.version>1.4</springdoc-openapi-maven-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-swagger-2/README.md b/spring-boot-modules/spring-boot-swagger-2/README.md
index 242f3d3385..99e4c4cca5 100644
--- a/spring-boot-modules/spring-boot-swagger-2/README.md
+++ b/spring-boot-modules/spring-boot-swagger-2/README.md
@@ -2,4 +2,7 @@
 
 - [Swagger: Specify Two Responses with the Same Response Code](https://www.baeldung.com/swagger-two-responses-one-response-code)
 - [Specify an Array of Strings as Body Parameters in Swagger](https://www.baeldung.com/swagger-body-array-of-strings)
-- [Swagger @ApiParam vs @ApiModelProperty](https://www.baeldung.com/swagger-apiparam-vs-apimodelproperty)
\ No newline at end of file
+- [Swagger @ApiParam vs @ApiModelProperty](https://www.baeldung.com/swagger-apiparam-vs-apimodelproperty)
+- [Map Date Types With OpenAPI Generator](https://www.baeldung.com/openapi-map-date-types)
+- [API First Development with Spring Boot and OpenAPI 3.0](https://www.baeldung.com/spring-boot-openapi-api-first-development)
+- [Change Swagger-UI URL prefix](https://www.baeldung.com/spring-boot-custom-swagger-url)
diff --git a/spring-boot-modules/spring-boot-swagger-2/pom.xml b/spring-boot-modules/spring-boot-swagger-2/pom.xml
index d2d1d10ad9..daca41426a 100644
--- a/spring-boot-modules/spring-boot-swagger-2/pom.xml
+++ b/spring-boot-modules/spring-boot-swagger-2/pom.xml
@@ -112,6 +112,7 @@
                         <configuration>
                             <skipValidateSpec>true</skipValidateSpec>
                             <inputSpec>${project.basedir}/src/main/resources/static/event.yaml</inputSpec>
+                            <inputSpec>${project.basedir}/src/main/resources/static/account_api_description.yaml</inputSpec>
                             <generatorName>spring</generatorName>
                             <configOptions>
                                 <java8>true</java8>
diff --git a/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/apifirstdevelopment/controller/AccountController.java b/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/apifirstdevelopment/controller/AccountController.java
new file mode 100644
index 0000000000..96242efb41
--- /dev/null
+++ b/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/apifirstdevelopment/controller/AccountController.java
@@ -0,0 +1,20 @@
+package com.baeldung.apifirstdevelopment.controller;
+
+import org.openapitools.api.AccountApi;
+import org.openapitools.model.Account;
+import org.openapitools.model.DepositRequest;
+import org.springframework.http.ResponseEntity;
+
+public class AccountController implements AccountApi {
+    @Override
+    public ResponseEntity<Void> depositToAccount(DepositRequest depositRequest) {
+        //Execute the business logic through Service/Utils/Repository classes
+        return AccountApi.super.depositToAccount(depositRequest);
+    }
+
+    @Override
+    public ResponseEntity<Account> getAccount() {
+        //Execute the business logic through Service/Utils/Repository classes
+        return AccountApi.super.getAccount();
+    }
+}
diff --git a/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/SpringDocExampleApplication.java b/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/SpringDocExampleApplication.java
new file mode 100644
index 0000000000..3ae057630d
--- /dev/null
+++ b/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/SpringDocExampleApplication.java
@@ -0,0 +1,17 @@
+package com.baeldung.springdoc.demo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import com.baeldung.springdoc.demo.config.SpringDocSwaggerConfig;
+
+@SpringBootApplication
+public class SpringDocExampleApplication {
+
+    public static void main(String[] args) { 
+    	SpringApplication application = new SpringApplication(SpringDocExampleApplication.class);
+    	//Note: SpringDocExampleApplication is the name of your main class 
+    	application.addListeners(new SpringDocSwaggerConfig()); 
+    	application.run(args);
+    }
+}
diff --git a/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/SpringFoxExampleApplication.java b/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/SpringFoxExampleApplication.java
new file mode 100644
index 0000000000..c6106cc95d
--- /dev/null
+++ b/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/SpringFoxExampleApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.springdoc.demo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpringFoxExampleApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringFoxExampleApplication.class, args);
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/config/SpringDocSwaggerConfig.java b/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/config/SpringDocSwaggerConfig.java
new file mode 100644
index 0000000000..5836235445
--- /dev/null
+++ b/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/config/SpringDocSwaggerConfig.java
@@ -0,0 +1,25 @@
+package com.baeldung.springdoc.demo.config;
+
+import java.util.Properties;
+
+import org.springframework.boot.context.event.ApplicationPreparedEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.PropertiesPropertySource;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SpringDocSwaggerConfig implements ApplicationListener<ApplicationPreparedEvent> {
+
+	@Override
+	public void onApplicationEvent(final ApplicationPreparedEvent event) {
+		ConfigurableEnvironment environment = event.getApplicationContext().getEnvironment();
+		Properties props = new Properties();
+		props.put("springdoc.swagger-ui.path", swaggerPath());
+		environment.getPropertySources().addFirst(new PropertiesPropertySource("programmatically", props));
+	}
+
+	private String swaggerPath() {
+		return "/myproject"; // TODO: implement your logic here.
+	}
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/config/SpringFoxSwaggerConfig.java b/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/config/SpringFoxSwaggerConfig.java
new file mode 100644
index 0000000000..e07ca5c2a1
--- /dev/null
+++ b/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/config/SpringFoxSwaggerConfig.java
@@ -0,0 +1,28 @@
+package com.baeldung.springdoc.demo.config;
+
+import java.util.ArrayList;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+
+@Configuration
+public class SpringFoxSwaggerConfig {
+
+	@Bean
+	public Docket productApi() {
+		return new Docket(DocumentationType.SWAGGER_2).select().apis(RequestHandlerSelectors.any())
+				.paths(PathSelectors.any()).build().apiInfo(metaInfo());
+	}
+
+	private ApiInfo metaInfo() {
+
+		return new ApiInfo("Sample API REST", "API REST", "1.0", "Terms of Service", null, "Apache License Version 2.0",
+				"https://www.apache.org/licesen.html", new ArrayList<>());
+	}
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/controller/SwaggerController.java b/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/controller/SwaggerController.java
new file mode 100644
index 0000000000..79c35e025e
--- /dev/null
+++ b/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/controller/SwaggerController.java
@@ -0,0 +1,13 @@
+package com.baeldung.springdoc.demo.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+public class SwaggerController {
+
+	@RequestMapping("/myproject")
+	public String getRedirectUrl() {
+		return "redirect:swagger-ui.html";
+	}
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/controller/TopicsController.java b/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/controller/TopicsController.java
new file mode 100644
index 0000000000..dee825788d
--- /dev/null
+++ b/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/controller/TopicsController.java
@@ -0,0 +1,26 @@
+package com.baeldung.springdoc.demo.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baeldung.springdoc.demo.model.Topic;
+import com.baeldung.springdoc.demo.service.TopicService;
+
+
+@RestController
+public class TopicsController {
+	
+	@Autowired
+	TopicService topicService;
+	
+	@GetMapping(value = "/topics")
+	public ResponseEntity<List<Topic>> getAllTopics() {
+		return new ResponseEntity<>(topicService.getAlllTopics(), HttpStatus.OK);
+	}
+}
diff --git a/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/model/Topic.java b/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/model/Topic.java
new file mode 100644
index 0000000000..0e4417b64f
--- /dev/null
+++ b/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/model/Topic.java
@@ -0,0 +1,26 @@
+package com.baeldung.springdoc.demo.model;
+
+public class Topic {
+	
+	Integer id;
+	String name;
+	
+	public Topic(Integer id, String name) {
+		super();
+		this.id = id;
+		this.name = name;
+	}
+
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+}
diff --git a/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/service/TopicService.java b/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/service/TopicService.java
new file mode 100644
index 0000000000..a468d2915b
--- /dev/null
+++ b/spring-boot-modules/spring-boot-swagger-2/src/main/java/com/baeldung/springdoc/demo/service/TopicService.java
@@ -0,0 +1,26 @@
+package com.baeldung.springdoc.demo.service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.baeldung.springdoc.demo.model.Topic;
+
+@Service
+public class TopicService {
+	
+	private List<Topic> topicsList;
+	
+	public TopicService(){
+		this.topicsList = new ArrayList<Topic>() {{
+			add(new Topic(1, "Topic1"));
+			add(new Topic(2, "Topic2"));
+			add(new Topic(3, "Topic3"));
+		}};
+	}
+	
+	public List<Topic> getAlllTopics(){
+		return topicsList;
+	}
+}
diff --git a/spring-boot-modules/spring-boot-swagger-2/src/main/resources/application.properties b/spring-boot-modules/spring-boot-swagger-2/src/main/resources/application.properties
index 03302ebb1c..901f0a6cc3 100644
--- a/spring-boot-modules/spring-boot-swagger-2/src/main/resources/application.properties
+++ b/spring-boot-modules/spring-boot-swagger-2/src/main/resources/application.properties
@@ -1,2 +1,7 @@
 springdoc.api-docs.enabled=false
 springdoc.swagger-ui.url=/api_3.yaml
+
+# Properties for custom Springdoc swagger-ui url
+
+#springdoc.swagger-ui.disable-swagger-default-url=true
+#springdoc.swagger-ui.path=/myproject
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-swagger-2/src/main/resources/static/account_api_description.yaml b/spring-boot-modules/spring-boot-swagger-2/src/main/resources/static/account_api_description.yaml
new file mode 100644
index 0000000000..38349d6540
--- /dev/null
+++ b/spring-boot-modules/spring-boot-swagger-2/src/main/resources/static/account_api_description.yaml
@@ -0,0 +1,78 @@
+openapi: 3.0.3
+info:
+  title: Banking API Specification for account interoperations
+  description: |-
+    A simple banking API that allows two operations:
+    - get account balance given account number
+    - deposit amount to a account
+  version: 1.0-SNAPSHOT
+servers:
+  - url: https://testenvironment.org/api/v1
+  - url: https://prodenvironment.org/api/v1
+tags:
+  - name: accounts
+    description: Operations for bank accounts
+
+paths:
+  /account:
+    get:
+      tags:
+        - accounts
+      summary: Get account information
+      description: Get account information using account number
+      operationId: getAccount
+      responses:
+        200:
+          description: Success
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Account'
+        404:
+          description: Account not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AccountNotFoundError'
+  /account/deposit:
+    post:
+      tags:
+        - accounts
+      summary: Deposit amount to account
+      description: Initiates a deposit operation of a desired amount to the account specified
+      operationId: depositToAccount
+      requestBody:
+        description: Account number and desired amount to deposit
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/DepositRequest'
+        required: true
+      responses:
+        204:
+          description: Success
+        404:
+          description: Account not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AccountNotFoundError'
+components:
+  schemas:
+    Account:
+      type: object
+      properties:
+        balance:
+          type: number
+    AccountNotFoundError:
+      type: object
+      properties:
+        message:
+          type: string
+    DepositRequest:
+      type: object
+      properties:
+        accountNumber:
+          type: string
+        depositAmount:
+          type: number
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-swagger-keycloak/pom.xml b/spring-boot-modules/spring-boot-swagger-keycloak/pom.xml
index de2c8c68c4..e7950fe393 100644
--- a/spring-boot-modules/spring-boot-swagger-keycloak/pom.xml
+++ b/spring-boot-modules/spring-boot-swagger-keycloak/pom.xml
@@ -1,75 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>spring-boot-swagger-keycloak</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <name>spring-boot-swagger-keycloak</name>
-    <packaging>jar</packaging>
-    <description>Module For Spring Boot Swagger UI with Keycloak</description>
+	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>spring-boot-swagger-keycloak</artifactId>
+	<version>0.1.0-SNAPSHOT</version>
+	<name>spring-boot-swagger-keycloak</name>
+	<packaging>jar</packaging>
+	<description>Module For Spring Boot Swagger UI with Keycloak</description>
 
-    <parent>
-        <groupId>com.baeldung.spring-boot-modules</groupId>
-        <artifactId>spring-boot-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
+	<parent>
+		<groupId>com.baeldung</groupId>
+		<artifactId>parent-boot-3</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../../parent-boot-3</relativePath>
+	</parent>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.keycloak.bom</groupId>
-                <artifactId>keycloak-adapter-bom</artifactId>
-                <version>${keycloak.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-bom</artifactId>
-                <version>${log4j2.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-bom</artifactId>
+				<version>${log4j2.version}</version>
+				<scope>import</scope>
+				<type>pom</type>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-boot-starter</artifactId>
-            <version>${springfox.version}</version>
-        </dependency>
-        <!-- Authentication with with Keycloak -->
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-spring-boot-starter</artifactId>
-        </dependency>
-        <!-- Authorization with MethodSecurity (@Secured) - optional -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-    </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
+		</dependency>
+		<!-- Authorization with MethodSecurity (@Secured) - optional -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springdoc</groupId>
+			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+			<version>${springdoc.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>javax.annotation-api</artifactId>
+			<version>${javax.version}</version>
+		</dependency>
+	</dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 
-    <properties>
-        <spring-boot.version>2.4.5</spring-boot.version>
-        <springfox.version>3.0.0</springfox.version>
-        <keycloak.version>15.0.2</keycloak.version>
-        <log4j2.version>2.17.1</log4j2.version>
-    </properties>
+	<properties>
+		<springdoc.version>2.1.0</springdoc.version>
+		<log4j2.version>2.17.1</log4j2.version>
+		<javax.version>1.3.2</javax.version>
+	</properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/java/com/baeldung/swaggerkeycloak/GlobalSecurityConfig.java b/spring-boot-modules/spring-boot-swagger-keycloak/src/main/java/com/baeldung/swaggerkeycloak/GlobalSecurityConfig.java
index 985cbf7d06..5c24368ce6 100644
--- a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/java/com/baeldung/swaggerkeycloak/GlobalSecurityConfig.java
+++ b/spring-boot-modules/spring-boot-swagger-keycloak/src/main/java/com/baeldung/swaggerkeycloak/GlobalSecurityConfig.java
@@ -1,59 +1,40 @@
 package com.baeldung.swaggerkeycloak;
 
-import org.keycloak.adapters.springsecurity.KeycloakConfiguration;
-import org.keycloak.adapters.springsecurity.authentication.KeycloakAuthenticationProvider;
-import org.keycloak.adapters.springsecurity.config.KeycloakWebSecurityConfigurerAdapter;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.core.authority.mapping.GrantedAuthoritiesMapper;
-import org.springframework.security.core.authority.mapping.SimpleAuthorityMapper;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
 import org.springframework.security.core.session.SessionRegistryImpl;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.session.RegisterSessionAuthenticationStrategy;
 import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy;
 
-@KeycloakConfiguration
+@Configuration
+@EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled = true)
-public class GlobalSecurityConfig extends KeycloakWebSecurityConfigurerAdapter {
+public class GlobalSecurityConfig {
 
-    @Override
+    @Bean
     protected SessionAuthenticationStrategy sessionAuthenticationStrategy() {
         return new RegisterSessionAuthenticationStrategy(new SessionRegistryImpl());
     }
 
-    // otherwise, we'll get an error 'permitAll only works with HttpSecurity.authorizeRequests()'
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        super.configure(http);
-        http
-          .csrf().disable()
-          .authorizeRequests()
-          // we can set up authorization here alternatively to @Secured methods
-          .antMatchers(HttpMethod.OPTIONS).permitAll()
-          .antMatchers("/api/**").authenticated()
-          // force authentication for all requests (and use global method security)
-          .anyRequest().permitAll();
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+        http.csrf()
+            .disable()
+            .authorizeRequests()
+            .requestMatchers(HttpMethod.OPTIONS)
+            .permitAll()
+            .requestMatchers("/api/**")
+            .authenticated()
+            .anyRequest()
+            .permitAll();
+        http.oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt);
+        return http.build();
     }
 
-    /*
-     * re-configure Spring Security to use
-     * registers the KeycloakAuthenticationProvider with the authentication manager
-     */
-    @Autowired
-    void configureGlobal(AuthenticationManagerBuilder auth) {
-        KeycloakAuthenticationProvider provider = keycloakAuthenticationProvider();
-        provider.setGrantedAuthoritiesMapper(authoritiesMapper());
-        auth.authenticationProvider(provider);
-    }
-
-    GrantedAuthoritiesMapper authoritiesMapper() {
-        SimpleAuthorityMapper mapper = new SimpleAuthorityMapper();
-        mapper.setPrefix("ROLE_"); // Spring Security adds a prefix to the authority/role names (we use the default here)
-        mapper.setConvertToUpperCase(true); // convert names to uppercase
-        mapper.setDefaultAuthority("ROLE_ANONYMOUS"); // set a default authority
-        return mapper;
-    }
-
-}
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/java/com/baeldung/swaggerkeycloak/KeycloakConfigResolverConfig.java b/spring-boot-modules/spring-boot-swagger-keycloak/src/main/java/com/baeldung/swaggerkeycloak/KeycloakConfigResolverConfig.java
deleted file mode 100644
index bca764a17d..0000000000
--- a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/java/com/baeldung/swaggerkeycloak/KeycloakConfigResolverConfig.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.baeldung.swaggerkeycloak;
-
-import org.keycloak.adapters.KeycloakConfigResolver;
-import org.keycloak.adapters.springboot.KeycloakSpringBootConfigResolver;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class KeycloakConfigResolverConfig {
-
-    /*
-     * re-configure keycloak adapter for Spring Boot environment,
-     * i.e. to read config from application.yml
-     * (otherwise, we need a keycloak.json file)
-     */
-    @Bean
-    public KeycloakConfigResolver configResolver() {
-        return new KeycloakSpringBootConfigResolver();
-    }
-
-
-
-}
diff --git a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/java/com/baeldung/swaggerkeycloak/OpenAPISecurityConfig.java b/spring-boot-modules/spring-boot-swagger-keycloak/src/main/java/com/baeldung/swaggerkeycloak/OpenAPISecurityConfig.java
index d3ab26e1ee..8d75a1a885 100644
--- a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/java/com/baeldung/swaggerkeycloak/OpenAPISecurityConfig.java
+++ b/spring-boot-modules/spring-boot-swagger-keycloak/src/main/java/com/baeldung/swaggerkeycloak/OpenAPISecurityConfig.java
@@ -1,22 +1,17 @@
 package com.baeldung.swaggerkeycloak;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpMethod;
-import springfox.documentation.builders.OAuth2SchemeBuilder;
-import springfox.documentation.service.AuthorizationScope;
-import springfox.documentation.service.SecurityReference;
-import springfox.documentation.service.SecurityScheme;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger.web.SecurityConfiguration;
-import springfox.documentation.swagger.web.SecurityConfigurationBuilder;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.security.OAuthFlow;
+import io.swagger.v3.oas.models.security.OAuthFlows;
+import io.swagger.v3.oas.models.security.Scopes;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
 
 @Configuration
 public class OpenAPISecurityConfig {
@@ -25,59 +20,35 @@ public class OpenAPISecurityConfig {
     String authServerUrl;
     @Value("${keycloak.realm}")
     String realm;
-    @Value("${keycloak.resource}")
-    private String clientId;
-    @Value("${keycloak.credentials.secret}")
-    private String clientSecret;
 
-    @Autowired
-    void addSecurity(Docket docket) {
-        docket
-          .securitySchemes(Collections.singletonList(authenticationScheme()))
-          .securityContexts(Collections.singletonList(securityContext()));
-    }
-
-    private SecurityScheme authenticationScheme() {
-        return new OAuth2SchemeBuilder("implicit")
-          .name("my_oAuth_security_schema")
-          .authorizationUrl(authServerUrl + "/realms/" + realm)
-          .scopes(authorizationScopes())
-          .build();
-    }
-
-    private List<AuthorizationScope> authorizationScopes() {
-        return Arrays.asList(
-          new AuthorizationScope("read_access", "read data"),
-          new AuthorizationScope("write_access", "modify data")
-        );
-    }
-
-    private SecurityContext securityContext() {
-        return SecurityContext.
-          builder().
-          securityReferences(readAccessAuth())
-          .operationSelector(operationContext -> HttpMethod.GET.equals(operationContext.httpMethod()))
-          .build();
-    }
-
-    private List<SecurityReference> readAccessAuth() {
-        AuthorizationScope[] authorizationScopes = new AuthorizationScope[] { authorizationScopes().get(0) };
-        return Collections.singletonList(
-          new SecurityReference("my_oAuth_security_schema", authorizationScopes)
-        );
-    }
+    private static final String OAUTH_SCHEME_NAME = "my_oAuth_security_schema";
 
     @Bean
-    public SecurityConfiguration security() {
-        return SecurityConfigurationBuilder.builder()
-          .clientId(clientId)
-          .clientSecret(clientSecret)
-          .realm(realm)
-          .appName(clientId)
-          .scopeSeparator(",")
-          .additionalQueryStringParams(null)
-          .useBasicAuthenticationWithAccessCodeGrant(false)
-          .build();
+    public OpenAPI openAPI() {
+        return new OpenAPI().components(new Components()
+            .addSecuritySchemes(OAUTH_SCHEME_NAME, createOAuthScheme()))
+            .addSecurityItem(new SecurityRequirement().addList(OAUTH_SCHEME_NAME))
+            .info(new Info().title("Todos Management Service")
+                .description("A service providing todos.")
+                .version("1.0"));
+    }
+
+    private SecurityScheme createOAuthScheme() {
+        OAuthFlows flows = createOAuthFlows();
+        return new SecurityScheme().type(SecurityScheme.Type.OAUTH2)
+            .flows(flows);
+    }
+
+    private OAuthFlows createOAuthFlows() {
+        OAuthFlow flow = createAuthorizationCodeFlow();
+        return new OAuthFlows().implicit(flow);
+    }
+
+    private OAuthFlow createAuthorizationCodeFlow() {
+        return new OAuthFlow()
+            .authorizationUrl(authServerUrl + "/realms/" + realm + "/protocol/openid-connect/auth")
+            .scopes(new Scopes().addString("read_access", "read data")
+                .addString("write_access", "modify data"));
     }
 
 }
diff --git a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/java/com/baeldung/swaggerkeycloak/SwaggerUIConfig.java b/spring-boot-modules/spring-boot-swagger-keycloak/src/main/java/com/baeldung/swaggerkeycloak/SwaggerUIConfig.java
deleted file mode 100644
index 1207fe5b9e..0000000000
--- a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/java/com/baeldung/swaggerkeycloak/SwaggerUIConfig.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.baeldung.swaggerkeycloak;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.oas.annotations.EnableOpenApi;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-
-import static springfox.documentation.builders.RequestHandlerSelectors.basePackage;
-
-@EnableOpenApi
-@Configuration
-class SwaggerUIConfig {
-
-    @Bean
-    Docket api() {
-        return new Docket(DocumentationType.OAS_30)
-          .useDefaultResponseMessages(false)
-          .select()
-          .apis(basePackage(TodosApplication.class.getPackage().getName()))
-          .paths(PathSelectors.any())
-          .build()
-          .apiInfo(apiInfo());
-    }
-
-    private ApiInfo apiInfo() {
-        return new ApiInfoBuilder().title("Todos Management Service")
-          .description("A service providing todos.")
-          .version("1.0")
-          .build();
-    }
-
-}
diff --git a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/java/com/baeldung/swaggerkeycloak/TodosController.java b/spring-boot-modules/spring-boot-swagger-keycloak/src/main/java/com/baeldung/swaggerkeycloak/TodosController.java
index 6b70072ce3..6d48a0c67d 100644
--- a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/java/com/baeldung/swaggerkeycloak/TodosController.java
+++ b/spring-boot-modules/spring-boot-swagger-keycloak/src/main/java/com/baeldung/swaggerkeycloak/TodosController.java
@@ -1,14 +1,15 @@
 package com.baeldung.swaggerkeycloak;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+
 import javax.annotation.PostConstruct;
 import java.time.LocalDate;
 import java.util.Collection;
@@ -28,13 +29,10 @@ public class TodosController {
     }
 
     @GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)
-    @ApiOperation("Read all todos")
-    @ApiResponses({
-      @ApiResponse(code = 200, message = "The todos were found and returned.")
-    })
+    @Operation(description = "Read all todos")
+    @ApiResponses({ @ApiResponse(responseCode = "200", description = "The todos were found and returned.") })
     @PreAuthorize("hasAuthority('SCOPE_read_access')")
     public Collection<Todo> readAll() {
         return todos.values();
     }
-
 }
diff --git a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/resources/META-INF/resources/webjars/springfox-swagger-ui/favicon-16x16.png b/spring-boot-modules/spring-boot-swagger-keycloak/src/main/resources/META-INF/resources/webjars/springfox-swagger-ui/favicon-16x16.png
deleted file mode 100644
index 8b194e617a..0000000000
Binary files a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/resources/META-INF/resources/webjars/springfox-swagger-ui/favicon-16x16.png and /dev/null differ
diff --git a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/resources/META-INF/resources/webjars/springfox-swagger-ui/favicon-32x32.png b/spring-boot-modules/spring-boot-swagger-keycloak/src/main/resources/META-INF/resources/webjars/springfox-swagger-ui/favicon-32x32.png
deleted file mode 100644
index 249737fe44..0000000000
Binary files a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/resources/META-INF/resources/webjars/springfox-swagger-ui/favicon-32x32.png and /dev/null differ
diff --git a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/resources/META-INF/resources/webjars/springfox-swagger-ui/oauth2-redirect.html b/spring-boot-modules/spring-boot-swagger-keycloak/src/main/resources/META-INF/resources/webjars/springfox-swagger-ui/oauth2-redirect.html
deleted file mode 100644
index 64b171f7de..0000000000
--- a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/resources/META-INF/resources/webjars/springfox-swagger-ui/oauth2-redirect.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!doctype html>
-<html lang="en-US">
-<head>
-    <title>Swagger UI: OAuth2 Redirect</title>
-</head>
-<body>
-<script>
-    'use strict';
-    function run () {
-        var oauth2 = window.opener.swaggerUIRedirectOauth2;
-        var sentState = oauth2.state;
-        var redirectUrl = oauth2.redirectUrl;
-        var isValid, qp, arr;
-
-        if (/code|token|error/.test(window.location.hash)) {
-            qp = window.location.hash.substring(1);
-        } else {
-            qp = location.search.substring(1);
-        }
-
-        arr = qp.split("&");
-        arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';});
-        qp = qp ? JSON.parse('{' + arr.join() + '}',
-                function (key, value) {
-                    return key === "" ? value : decodeURIComponent(value);
-                }
-        ) : {};
-
-        isValid = qp.state === sentState;
-
-        if ((
-          oauth2.auth.schema.get("flow") === "accessCode" ||
-          oauth2.auth.schema.get("flow") === "authorizationCode" ||
-          oauth2.auth.schema.get("flow") === "authorization_code"
-        ) && !oauth2.auth.code) {
-            if (!isValid) {
-                oauth2.errCb({
-                    authId: oauth2.auth.name,
-                    source: "auth",
-                    level: "warning",
-                    message: "Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"
-                });
-            }
-
-            if (qp.code) {
-                delete oauth2.state;
-                oauth2.auth.code = qp.code;
-                oauth2.callback({auth: oauth2.auth, redirectUrl: redirectUrl});
-            } else {
-                let oauthErrorMsg;
-                if (qp.error) {
-                    oauthErrorMsg = "["+qp.error+"]: " +
-                        (qp.error_description ? qp.error_description+ ". " : "no accessCode received from the server. ") +
-                        (qp.error_uri ? "More info: "+qp.error_uri : "");
-                }
-
-                oauth2.errCb({
-                    authId: oauth2.auth.name,
-                    source: "auth",
-                    level: "error",
-                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server"
-                });
-            }
-        } else {
-            oauth2.callback({auth: oauth2.auth, token: qp, isValid: isValid, redirectUrl: redirectUrl});
-        }
-        window.close();
-    }
-
-    window.addEventListener('DOMContentLoaded', function () {
-      run();
-    });
-</script>
-</body>
-</html>
diff --git a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/resources/META-INF/resources/webjars/springfox-swagger-ui/swagger-ui.css b/spring-boot-modules/spring-boot-swagger-keycloak/src/main/resources/META-INF/resources/webjars/springfox-swagger-ui/swagger-ui.css
deleted file mode 100644
index e43a572a13..0000000000
--- a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/resources/META-INF/resources/webjars/springfox-swagger-ui/swagger-ui.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.swagger-ui{color:#3b4151;
-  /*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */font-family:sans-serif}.swagger-ui html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;line-height:1.15}.swagger-ui body{margin:0}.swagger-ui article,.swagger-ui aside,.swagger-ui footer,.swagger-ui header,.swagger-ui nav,.swagger-ui section{display:block}.swagger-ui h1{font-size:2em;margin:.67em 0}.swagger-ui figcaption,.swagger-ui figure,.swagger-ui main{display:block}.swagger-ui figure{margin:1em 40px}.swagger-ui hr{box-sizing:content-box;height:0;overflow:visible}.swagger-ui pre{font-family:monospace,monospace;font-size:1em}.swagger-ui a{-webkit-text-decoration-skip:objects;background-color:transparent}.swagger-ui abbr[title]{border-bottom:none;text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}.swagger-ui b,.swagger-ui strong{font-weight:inherit;font-weight:bolder}.swagger-ui code,.swagger-ui kbd,.swagger-ui samp{font-family:monospace,monospace;font-size:1em}.swagger-ui dfn{font-style:italic}.swagger-ui mark{background-color:#ff0;color:#000}.swagger-ui small{font-size:80%}.swagger-ui sub,.swagger-ui sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}.swagger-ui sub{bottom:-.25em}.swagger-ui sup{top:-.5em}.swagger-ui audio,.swagger-ui video{display:inline-block}.swagger-ui audio:not([controls]){display:none;height:0}.swagger-ui img{border-style:none}.swagger-ui svg:not(:root){overflow:hidden}.swagger-ui button,.swagger-ui input,.swagger-ui optgroup,.swagger-ui select,.swagger-ui textarea{font-family:sans-serif;font-size:100%;line-height:1.15;margin:0}.swagger-ui button,.swagger-ui input{overflow:visible}.swagger-ui button,.swagger-ui select{text-transform:none}.swagger-ui [type=reset],.swagger-ui [type=submit],.swagger-ui button,.swagger-ui html [type=button]{-webkit-appearance:button}.swagger-ui [type=button]::-moz-focus-inner,.swagger-ui [type=reset]::-moz-focus-inner,.swagger-ui [type=submit]::-moz-focus-inner,.swagger-ui button::-moz-focus-inner{border-style:none;padding:0}.swagger-ui [type=button]:-moz-focusring,.swagger-ui [type=reset]:-moz-focusring,.swagger-ui [type=submit]:-moz-focusring,.swagger-ui button:-moz-focusring{outline:1px dotted ButtonText}.swagger-ui fieldset{padding:.35em .75em .625em}.swagger-ui legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}.swagger-ui progress{display:inline-block;vertical-align:baseline}.swagger-ui textarea{overflow:auto}.swagger-ui [type=checkbox],.swagger-ui [type=radio]{box-sizing:border-box;padding:0}.swagger-ui [type=number]::-webkit-inner-spin-button,.swagger-ui [type=number]::-webkit-outer-spin-button{height:auto}.swagger-ui [type=search]{-webkit-appearance:textfield;outline-offset:-2px}.swagger-ui [type=search]::-webkit-search-cancel-button,.swagger-ui [type=search]::-webkit-search-decoration{-webkit-appearance:none}.swagger-ui ::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}.swagger-ui details,.swagger-ui menu{display:block}.swagger-ui summary{display:list-item}.swagger-ui canvas{display:inline-block}.swagger-ui [hidden],.swagger-ui template{display:none}.swagger-ui .debug *{outline:1px solid gold}.swagger-ui .debug-white *{outline:1px solid #fff}.swagger-ui .debug-black *{outline:1px solid #000}.swagger-ui .debug-grid{background:transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTExIDc5LjE1ODMyNSwgMjAxNS8wOS8xMC0wMToxMDoyMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MTRDOTY4N0U2N0VFMTFFNjg2MzZDQjkwNkQ4MjgwMEIiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MTRDOTY4N0Q2N0VFMTFFNjg2MzZDQjkwNkQ4MjgwMEIiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo3NjcyQkQ3NjY3QzUxMUU2QjJCQ0UyNDA4MTAwMjE3MSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo3NjcyQkQ3NzY3QzUxMUU2QjJCQ0UyNDA4MTAwMjE3MSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PsBS+GMAAAAjSURBVHjaYvz//z8DLsD4gcGXiYEAGBIKGBne//fFpwAgwAB98AaF2pjlUQAAAABJRU5ErkJggg==) repeat 0 0}.swagger-ui .debug-grid-16{background:transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTExIDc5LjE1ODMyNSwgMjAxNS8wOS8xMC0wMToxMDoyMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6ODYyRjhERDU2N0YyMTFFNjg2MzZDQjkwNkQ4MjgwMEIiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ODYyRjhERDQ2N0YyMTFFNjg2MzZDQjkwNkQ4MjgwMEIiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo3NjcyQkQ3QTY3QzUxMUU2QjJCQ0UyNDA4MTAwMjE3MSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo3NjcyQkQ3QjY3QzUxMUU2QjJCQ0UyNDA4MTAwMjE3MSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PvCS01IAAABMSURBVHjaYmR4/5+BFPBfAMFm/MBgx8RAGWCn1AAmSg34Q6kBDKMGMDCwICeMIemF/5QawEipAWwUhwEjMDvbAWlWkvVBwu8vQIABAEwBCph8U6c0AAAAAElFTkSuQmCC) repeat 0 0}.swagger-ui .debug-grid-8-solid{background:#fff url(data:image/jpeg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAAAAAD/4QMxaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjYtYzExMSA3OS4xNTgzMjUsIDIwMTUvMDkvMTAtMDE6MTA6MjAgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE1IChNYWNpbnRvc2gpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkIxMjI0OTczNjdCMzExRTZCMkJDRTI0MDgxMDAyMTcxIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkIxMjI0OTc0NjdCMzExRTZCMkJDRTI0MDgxMDAyMTcxIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QjEyMjQ5NzE2N0IzMTFFNkIyQkNFMjQwODEwMDIxNzEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6QjEyMjQ5NzI2N0IzMTFFNkIyQkNFMjQwODEwMDIxNzEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7/7gAOQWRvYmUAZMAAAAAB/9sAhAAbGhopHSlBJiZBQi8vL0JHPz4+P0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHAR0pKTQmND8oKD9HPzU/R0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0f/wAARCAAIAAgDASIAAhEBAxEB/8QAWQABAQAAAAAAAAAAAAAAAAAAAAYBAQEAAAAAAAAAAAAAAAAAAAIEEAEBAAMBAAAAAAAAAAAAAAABADECA0ERAAEDBQAAAAAAAAAAAAAAAAARITFBUWESIv/aAAwDAQACEQMRAD8AoOnTV1QTD7JJshP3vSM3P//Z) repeat 0 0}.swagger-ui .debug-grid-16-solid{background:#fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTExIDc5LjE1ODMyNSwgMjAxNS8wOS8xMC0wMToxMDoyMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NzY3MkJEN0U2N0M1MTFFNkIyQkNFMjQwODEwMDIxNzEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NzY3MkJEN0Y2N0M1MTFFNkIyQkNFMjQwODEwMDIxNzEiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo3NjcyQkQ3QzY3QzUxMUU2QjJCQ0UyNDA4MTAwMjE3MSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo3NjcyQkQ3RDY3QzUxMUU2QjJCQ0UyNDA4MTAwMjE3MSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pve6J3kAAAAzSURBVHjaYvz//z8D0UDsMwMjSRoYP5Gq4SPNbRjVMEQ1fCRDg+in/6+J1AJUxsgAEGAA31BAJMS0GYEAAAAASUVORK5CYII=) repeat 0 0}.swagger-ui .border-box,.swagger-ui a,.swagger-ui article,.swagger-ui body,.swagger-ui code,.swagger-ui dd,.swagger-ui div,.swagger-ui dl,.swagger-ui dt,.swagger-ui fieldset,.swagger-ui footer,.swagger-ui form,.swagger-ui h1,.swagger-ui h2,.swagger-ui h3,.swagger-ui h4,.swagger-ui h5,.swagger-ui h6,.swagger-ui header,.swagger-ui html,.swagger-ui input[type=email],.swagger-ui input[type=number],.swagger-ui input[type=password],.swagger-ui input[type=tel],.swagger-ui input[type=text],.swagger-ui input[type=url],.swagger-ui legend,.swagger-ui li,.swagger-ui main,.swagger-ui ol,.swagger-ui p,.swagger-ui pre,.swagger-ui section,.swagger-ui table,.swagger-ui td,.swagger-ui textarea,.swagger-ui th,.swagger-ui tr,.swagger-ui ul{box-sizing:border-box}.swagger-ui .aspect-ratio{height:0;position:relative}.swagger-ui .aspect-ratio--16x9{padding-bottom:56.25%}.swagger-ui .aspect-ratio--9x16{padding-bottom:177.77%}.swagger-ui .aspect-ratio--4x3{padding-bottom:75%}.swagger-ui .aspect-ratio--3x4{padding-bottom:133.33%}.swagger-ui .aspect-ratio--6x4{padding-bottom:66.6%}.swagger-ui .aspect-ratio--4x6{padding-bottom:150%}.swagger-ui .aspect-ratio--8x5{padding-bottom:62.5%}.swagger-ui .aspect-ratio--5x8{padding-bottom:160%}.swagger-ui .aspect-ratio--7x5{padding-bottom:71.42%}.swagger-ui .aspect-ratio--5x7{padding-bottom:140%}.swagger-ui .aspect-ratio--1x1{padding-bottom:100%}.swagger-ui .aspect-ratio--object{bottom:0;height:100%;left:0;position:absolute;right:0;top:0;width:100%;z-index:100}@media screen and (min-width:30em){.swagger-ui .aspect-ratio-ns{height:0;position:relative}.swagger-ui .aspect-ratio--16x9-ns{padding-bottom:56.25%}.swagger-ui .aspect-ratio--9x16-ns{padding-bottom:177.77%}.swagger-ui .aspect-ratio--4x3-ns{padding-bottom:75%}.swagger-ui .aspect-ratio--3x4-ns{padding-bottom:133.33%}.swagger-ui .aspect-ratio--6x4-ns{padding-bottom:66.6%}.swagger-ui .aspect-ratio--4x6-ns{padding-bottom:150%}.swagger-ui .aspect-ratio--8x5-ns{padding-bottom:62.5%}.swagger-ui .aspect-ratio--5x8-ns{padding-bottom:160%}.swagger-ui .aspect-ratio--7x5-ns{padding-bottom:71.42%}.swagger-ui .aspect-ratio--5x7-ns{padding-bottom:140%}.swagger-ui .aspect-ratio--1x1-ns{padding-bottom:100%}.swagger-ui .aspect-ratio--object-ns{bottom:0;height:100%;left:0;position:absolute;right:0;top:0;width:100%;z-index:100}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .aspect-ratio-m{height:0;position:relative}.swagger-ui .aspect-ratio--16x9-m{padding-bottom:56.25%}.swagger-ui .aspect-ratio--9x16-m{padding-bottom:177.77%}.swagger-ui .aspect-ratio--4x3-m{padding-bottom:75%}.swagger-ui .aspect-ratio--3x4-m{padding-bottom:133.33%}.swagger-ui .aspect-ratio--6x4-m{padding-bottom:66.6%}.swagger-ui .aspect-ratio--4x6-m{padding-bottom:150%}.swagger-ui .aspect-ratio--8x5-m{padding-bottom:62.5%}.swagger-ui .aspect-ratio--5x8-m{padding-bottom:160%}.swagger-ui .aspect-ratio--7x5-m{padding-bottom:71.42%}.swagger-ui .aspect-ratio--5x7-m{padding-bottom:140%}.swagger-ui .aspect-ratio--1x1-m{padding-bottom:100%}.swagger-ui .aspect-ratio--object-m{bottom:0;height:100%;left:0;position:absolute;right:0;top:0;width:100%;z-index:100}}@media screen and (min-width:60em){.swagger-ui .aspect-ratio-l{height:0;position:relative}.swagger-ui .aspect-ratio--16x9-l{padding-bottom:56.25%}.swagger-ui .aspect-ratio--9x16-l{padding-bottom:177.77%}.swagger-ui .aspect-ratio--4x3-l{padding-bottom:75%}.swagger-ui .aspect-ratio--3x4-l{padding-bottom:133.33%}.swagger-ui .aspect-ratio--6x4-l{padding-bottom:66.6%}.swagger-ui .aspect-ratio--4x6-l{padding-bottom:150%}.swagger-ui .aspect-ratio--8x5-l{padding-bottom:62.5%}.swagger-ui .aspect-ratio--5x8-l{padding-bottom:160%}.swagger-ui .aspect-ratio--7x5-l{padding-bottom:71.42%}.swagger-ui .aspect-ratio--5x7-l{padding-bottom:140%}.swagger-ui .aspect-ratio--1x1-l{padding-bottom:100%}.swagger-ui .aspect-ratio--object-l{bottom:0;height:100%;left:0;position:absolute;right:0;top:0;width:100%;z-index:100}}.swagger-ui img{max-width:100%}.swagger-ui .cover{background-size:cover!important}.swagger-ui .contain{background-size:contain!important}@media screen and (min-width:30em){.swagger-ui .cover-ns{background-size:cover!important}.swagger-ui .contain-ns{background-size:contain!important}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .cover-m{background-size:cover!important}.swagger-ui .contain-m{background-size:contain!important}}@media screen and (min-width:60em){.swagger-ui .cover-l{background-size:cover!important}.swagger-ui .contain-l{background-size:contain!important}}.swagger-ui .bg-center{background-position:50%;background-repeat:no-repeat}.swagger-ui .bg-top{background-position:top;background-repeat:no-repeat}.swagger-ui .bg-right{background-position:100%;background-repeat:no-repeat}.swagger-ui .bg-bottom{background-position:bottom;background-repeat:no-repeat}.swagger-ui .bg-left{background-position:0;background-repeat:no-repeat}@media screen and (min-width:30em){.swagger-ui .bg-center-ns{background-position:50%;background-repeat:no-repeat}.swagger-ui .bg-top-ns{background-position:top;background-repeat:no-repeat}.swagger-ui .bg-right-ns{background-position:100%;background-repeat:no-repeat}.swagger-ui .bg-bottom-ns{background-position:bottom;background-repeat:no-repeat}.swagger-ui .bg-left-ns{background-position:0;background-repeat:no-repeat}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .bg-center-m{background-position:50%;background-repeat:no-repeat}.swagger-ui .bg-top-m{background-position:top;background-repeat:no-repeat}.swagger-ui .bg-right-m{background-position:100%;background-repeat:no-repeat}.swagger-ui .bg-bottom-m{background-position:bottom;background-repeat:no-repeat}.swagger-ui .bg-left-m{background-position:0;background-repeat:no-repeat}}@media screen and (min-width:60em){.swagger-ui .bg-center-l{background-position:50%;background-repeat:no-repeat}.swagger-ui .bg-top-l{background-position:top;background-repeat:no-repeat}.swagger-ui .bg-right-l{background-position:100%;background-repeat:no-repeat}.swagger-ui .bg-bottom-l{background-position:bottom;background-repeat:no-repeat}.swagger-ui .bg-left-l{background-position:0;background-repeat:no-repeat}}.swagger-ui .outline{outline:1px solid}.swagger-ui .outline-transparent{outline:1px solid transparent}.swagger-ui .outline-0{outline:0}@media screen and (min-width:30em){.swagger-ui .outline-ns{outline:1px solid}.swagger-ui .outline-transparent-ns{outline:1px solid transparent}.swagger-ui .outline-0-ns{outline:0}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .outline-m{outline:1px solid}.swagger-ui .outline-transparent-m{outline:1px solid transparent}.swagger-ui .outline-0-m{outline:0}}@media screen and (min-width:60em){.swagger-ui .outline-l{outline:1px solid}.swagger-ui .outline-transparent-l{outline:1px solid transparent}.swagger-ui .outline-0-l{outline:0}}.swagger-ui .ba{border-style:solid;border-width:1px}.swagger-ui .bt{border-top-style:solid;border-top-width:1px}.swagger-ui .br{border-right-style:solid;border-right-width:1px}.swagger-ui .bb{border-bottom-style:solid;border-bottom-width:1px}.swagger-ui .bl{border-left-style:solid;border-left-width:1px}.swagger-ui .bn{border-style:none;border-width:0}@media screen and (min-width:30em){.swagger-ui .ba-ns{border-style:solid;border-width:1px}.swagger-ui .bt-ns{border-top-style:solid;border-top-width:1px}.swagger-ui .br-ns{border-right-style:solid;border-right-width:1px}.swagger-ui .bb-ns{border-bottom-style:solid;border-bottom-width:1px}.swagger-ui .bl-ns{border-left-style:solid;border-left-width:1px}.swagger-ui .bn-ns{border-style:none;border-width:0}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .ba-m{border-style:solid;border-width:1px}.swagger-ui .bt-m{border-top-style:solid;border-top-width:1px}.swagger-ui .br-m{border-right-style:solid;border-right-width:1px}.swagger-ui .bb-m{border-bottom-style:solid;border-bottom-width:1px}.swagger-ui .bl-m{border-left-style:solid;border-left-width:1px}.swagger-ui .bn-m{border-style:none;border-width:0}}@media screen and (min-width:60em){.swagger-ui .ba-l{border-style:solid;border-width:1px}.swagger-ui .bt-l{border-top-style:solid;border-top-width:1px}.swagger-ui .br-l{border-right-style:solid;border-right-width:1px}.swagger-ui .bb-l{border-bottom-style:solid;border-bottom-width:1px}.swagger-ui .bl-l{border-left-style:solid;border-left-width:1px}.swagger-ui .bn-l{border-style:none;border-width:0}}.swagger-ui .b--black{border-color:#000}.swagger-ui .b--near-black{border-color:#111}.swagger-ui .b--dark-gray{border-color:#333}.swagger-ui .b--mid-gray{border-color:#555}.swagger-ui .b--gray{border-color:#777}.swagger-ui .b--silver{border-color:#999}.swagger-ui .b--light-silver{border-color:#aaa}.swagger-ui .b--moon-gray{border-color:#ccc}.swagger-ui .b--light-gray{border-color:#eee}.swagger-ui .b--near-white{border-color:#f4f4f4}.swagger-ui .b--white{border-color:#fff}.swagger-ui .b--white-90{border-color:hsla(0,0%,100%,.9)}.swagger-ui .b--white-80{border-color:hsla(0,0%,100%,.8)}.swagger-ui .b--white-70{border-color:hsla(0,0%,100%,.7)}.swagger-ui .b--white-60{border-color:hsla(0,0%,100%,.6)}.swagger-ui .b--white-50{border-color:hsla(0,0%,100%,.5)}.swagger-ui .b--white-40{border-color:hsla(0,0%,100%,.4)}.swagger-ui .b--white-30{border-color:hsla(0,0%,100%,.3)}.swagger-ui .b--white-20{border-color:hsla(0,0%,100%,.2)}.swagger-ui .b--white-10{border-color:hsla(0,0%,100%,.1)}.swagger-ui .b--white-05{border-color:hsla(0,0%,100%,.05)}.swagger-ui .b--white-025{border-color:hsla(0,0%,100%,.025)}.swagger-ui .b--white-0125{border-color:hsla(0,0%,100%,.013)}.swagger-ui .b--black-90{border-color:rgba(0,0,0,.9)}.swagger-ui .b--black-80{border-color:rgba(0,0,0,.8)}.swagger-ui .b--black-70{border-color:rgba(0,0,0,.7)}.swagger-ui .b--black-60{border-color:rgba(0,0,0,.6)}.swagger-ui .b--black-50{border-color:rgba(0,0,0,.5)}.swagger-ui .b--black-40{border-color:rgba(0,0,0,.4)}.swagger-ui .b--black-30{border-color:rgba(0,0,0,.3)}.swagger-ui .b--black-20{border-color:rgba(0,0,0,.2)}.swagger-ui .b--black-10{border-color:rgba(0,0,0,.1)}.swagger-ui .b--black-05{border-color:rgba(0,0,0,.05)}.swagger-ui .b--black-025{border-color:rgba(0,0,0,.025)}.swagger-ui .b--black-0125{border-color:rgba(0,0,0,.013)}.swagger-ui .b--dark-red{border-color:#e7040f}.swagger-ui .b--red{border-color:#ff4136}.swagger-ui .b--light-red{border-color:#ff725c}.swagger-ui .b--orange{border-color:#ff6300}.swagger-ui .b--gold{border-color:#ffb700}.swagger-ui .b--yellow{border-color:gold}.swagger-ui .b--light-yellow{border-color:#fbf1a9}.swagger-ui .b--purple{border-color:#5e2ca5}.swagger-ui .b--light-purple{border-color:#a463f2}.swagger-ui .b--dark-pink{border-color:#d5008f}.swagger-ui .b--hot-pink{border-color:#ff41b4}.swagger-ui .b--pink{border-color:#ff80cc}.swagger-ui .b--light-pink{border-color:#ffa3d7}.swagger-ui .b--dark-green{border-color:#137752}.swagger-ui .b--green{border-color:#19a974}.swagger-ui .b--light-green{border-color:#9eebcf}.swagger-ui .b--navy{border-color:#001b44}.swagger-ui .b--dark-blue{border-color:#00449e}.swagger-ui .b--blue{border-color:#357edd}.swagger-ui .b--light-blue{border-color:#96ccff}.swagger-ui .b--lightest-blue{border-color:#cdecff}.swagger-ui .b--washed-blue{border-color:#f6fffe}.swagger-ui .b--washed-green{border-color:#e8fdf5}.swagger-ui .b--washed-yellow{border-color:#fffceb}.swagger-ui .b--washed-red{border-color:#ffdfdf}.swagger-ui .b--transparent{border-color:transparent}.swagger-ui .b--inherit{border-color:inherit}.swagger-ui .br0{border-radius:0}.swagger-ui .br1{border-radius:.125rem}.swagger-ui .br2{border-radius:.25rem}.swagger-ui .br3{border-radius:.5rem}.swagger-ui .br4{border-radius:1rem}.swagger-ui .br-100{border-radius:100%}.swagger-ui .br-pill{border-radius:9999px}.swagger-ui .br--bottom{border-top-left-radius:0;border-top-right-radius:0}.swagger-ui .br--top{border-bottom-left-radius:0;border-bottom-right-radius:0}.swagger-ui .br--right{border-bottom-left-radius:0;border-top-left-radius:0}.swagger-ui .br--left{border-bottom-right-radius:0;border-top-right-radius:0}@media screen and (min-width:30em){.swagger-ui .br0-ns{border-radius:0}.swagger-ui .br1-ns{border-radius:.125rem}.swagger-ui .br2-ns{border-radius:.25rem}.swagger-ui .br3-ns{border-radius:.5rem}.swagger-ui .br4-ns{border-radius:1rem}.swagger-ui .br-100-ns{border-radius:100%}.swagger-ui .br-pill-ns{border-radius:9999px}.swagger-ui .br--bottom-ns{border-top-left-radius:0;border-top-right-radius:0}.swagger-ui .br--top-ns{border-bottom-left-radius:0;border-bottom-right-radius:0}.swagger-ui .br--right-ns{border-bottom-left-radius:0;border-top-left-radius:0}.swagger-ui .br--left-ns{border-bottom-right-radius:0;border-top-right-radius:0}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .br0-m{border-radius:0}.swagger-ui .br1-m{border-radius:.125rem}.swagger-ui .br2-m{border-radius:.25rem}.swagger-ui .br3-m{border-radius:.5rem}.swagger-ui .br4-m{border-radius:1rem}.swagger-ui .br-100-m{border-radius:100%}.swagger-ui .br-pill-m{border-radius:9999px}.swagger-ui .br--bottom-m{border-top-left-radius:0;border-top-right-radius:0}.swagger-ui .br--top-m{border-bottom-left-radius:0;border-bottom-right-radius:0}.swagger-ui .br--right-m{border-bottom-left-radius:0;border-top-left-radius:0}.swagger-ui .br--left-m{border-bottom-right-radius:0;border-top-right-radius:0}}@media screen and (min-width:60em){.swagger-ui .br0-l{border-radius:0}.swagger-ui .br1-l{border-radius:.125rem}.swagger-ui .br2-l{border-radius:.25rem}.swagger-ui .br3-l{border-radius:.5rem}.swagger-ui .br4-l{border-radius:1rem}.swagger-ui .br-100-l{border-radius:100%}.swagger-ui .br-pill-l{border-radius:9999px}.swagger-ui .br--bottom-l{border-top-left-radius:0;border-top-right-radius:0}.swagger-ui .br--top-l{border-bottom-left-radius:0;border-bottom-right-radius:0}.swagger-ui .br--right-l{border-bottom-left-radius:0;border-top-left-radius:0}.swagger-ui .br--left-l{border-bottom-right-radius:0;border-top-right-radius:0}}.swagger-ui .b--dotted{border-style:dotted}.swagger-ui .b--dashed{border-style:dashed}.swagger-ui .b--solid{border-style:solid}.swagger-ui .b--none{border-style:none}@media screen and (min-width:30em){.swagger-ui .b--dotted-ns{border-style:dotted}.swagger-ui .b--dashed-ns{border-style:dashed}.swagger-ui .b--solid-ns{border-style:solid}.swagger-ui .b--none-ns{border-style:none}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .b--dotted-m{border-style:dotted}.swagger-ui .b--dashed-m{border-style:dashed}.swagger-ui .b--solid-m{border-style:solid}.swagger-ui .b--none-m{border-style:none}}@media screen and (min-width:60em){.swagger-ui .b--dotted-l{border-style:dotted}.swagger-ui .b--dashed-l{border-style:dashed}.swagger-ui .b--solid-l{border-style:solid}.swagger-ui .b--none-l{border-style:none}}.swagger-ui .bw0{border-width:0}.swagger-ui .bw1{border-width:.125rem}.swagger-ui .bw2{border-width:.25rem}.swagger-ui .bw3{border-width:.5rem}.swagger-ui .bw4{border-width:1rem}.swagger-ui .bw5{border-width:2rem}.swagger-ui .bt-0{border-top-width:0}.swagger-ui .br-0{border-right-width:0}.swagger-ui .bb-0{border-bottom-width:0}.swagger-ui .bl-0{border-left-width:0}@media screen and (min-width:30em){.swagger-ui .bw0-ns{border-width:0}.swagger-ui .bw1-ns{border-width:.125rem}.swagger-ui .bw2-ns{border-width:.25rem}.swagger-ui .bw3-ns{border-width:.5rem}.swagger-ui .bw4-ns{border-width:1rem}.swagger-ui .bw5-ns{border-width:2rem}.swagger-ui .bt-0-ns{border-top-width:0}.swagger-ui .br-0-ns{border-right-width:0}.swagger-ui .bb-0-ns{border-bottom-width:0}.swagger-ui .bl-0-ns{border-left-width:0}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .bw0-m{border-width:0}.swagger-ui .bw1-m{border-width:.125rem}.swagger-ui .bw2-m{border-width:.25rem}.swagger-ui .bw3-m{border-width:.5rem}.swagger-ui .bw4-m{border-width:1rem}.swagger-ui .bw5-m{border-width:2rem}.swagger-ui .bt-0-m{border-top-width:0}.swagger-ui .br-0-m{border-right-width:0}.swagger-ui .bb-0-m{border-bottom-width:0}.swagger-ui .bl-0-m{border-left-width:0}}@media screen and (min-width:60em){.swagger-ui .bw0-l{border-width:0}.swagger-ui .bw1-l{border-width:.125rem}.swagger-ui .bw2-l{border-width:.25rem}.swagger-ui .bw3-l{border-width:.5rem}.swagger-ui .bw4-l{border-width:1rem}.swagger-ui .bw5-l{border-width:2rem}.swagger-ui .bt-0-l{border-top-width:0}.swagger-ui .br-0-l{border-right-width:0}.swagger-ui .bb-0-l{border-bottom-width:0}.swagger-ui .bl-0-l{border-left-width:0}}.swagger-ui .shadow-1{box-shadow:0 0 4px 2px rgba(0,0,0,.2)}.swagger-ui .shadow-2{box-shadow:0 0 8px 2px rgba(0,0,0,.2)}.swagger-ui .shadow-3{box-shadow:2px 2px 4px 2px rgba(0,0,0,.2)}.swagger-ui .shadow-4{box-shadow:2px 2px 8px 0 rgba(0,0,0,.2)}.swagger-ui .shadow-5{box-shadow:4px 4px 8px 0 rgba(0,0,0,.2)}@media screen and (min-width:30em){.swagger-ui .shadow-1-ns{box-shadow:0 0 4px 2px rgba(0,0,0,.2)}.swagger-ui .shadow-2-ns{box-shadow:0 0 8px 2px rgba(0,0,0,.2)}.swagger-ui .shadow-3-ns{box-shadow:2px 2px 4px 2px rgba(0,0,0,.2)}.swagger-ui .shadow-4-ns{box-shadow:2px 2px 8px 0 rgba(0,0,0,.2)}.swagger-ui .shadow-5-ns{box-shadow:4px 4px 8px 0 rgba(0,0,0,.2)}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .shadow-1-m{box-shadow:0 0 4px 2px rgba(0,0,0,.2)}.swagger-ui .shadow-2-m{box-shadow:0 0 8px 2px rgba(0,0,0,.2)}.swagger-ui .shadow-3-m{box-shadow:2px 2px 4px 2px rgba(0,0,0,.2)}.swagger-ui .shadow-4-m{box-shadow:2px 2px 8px 0 rgba(0,0,0,.2)}.swagger-ui .shadow-5-m{box-shadow:4px 4px 8px 0 rgba(0,0,0,.2)}}@media screen and (min-width:60em){.swagger-ui .shadow-1-l{box-shadow:0 0 4px 2px rgba(0,0,0,.2)}.swagger-ui .shadow-2-l{box-shadow:0 0 8px 2px rgba(0,0,0,.2)}.swagger-ui .shadow-3-l{box-shadow:2px 2px 4px 2px rgba(0,0,0,.2)}.swagger-ui .shadow-4-l{box-shadow:2px 2px 8px 0 rgba(0,0,0,.2)}.swagger-ui .shadow-5-l{box-shadow:4px 4px 8px 0 rgba(0,0,0,.2)}}.swagger-ui .pre{overflow-x:auto;overflow-y:hidden;overflow:scroll}.swagger-ui .top-0{top:0}.swagger-ui .right-0{right:0}.swagger-ui .bottom-0{bottom:0}.swagger-ui .left-0{left:0}.swagger-ui .top-1{top:1rem}.swagger-ui .right-1{right:1rem}.swagger-ui .bottom-1{bottom:1rem}.swagger-ui .left-1{left:1rem}.swagger-ui .top-2{top:2rem}.swagger-ui .right-2{right:2rem}.swagger-ui .bottom-2{bottom:2rem}.swagger-ui .left-2{left:2rem}.swagger-ui .top--1{top:-1rem}.swagger-ui .right--1{right:-1rem}.swagger-ui .bottom--1{bottom:-1rem}.swagger-ui .left--1{left:-1rem}.swagger-ui .top--2{top:-2rem}.swagger-ui .right--2{right:-2rem}.swagger-ui .bottom--2{bottom:-2rem}.swagger-ui .left--2{left:-2rem}.swagger-ui .absolute--fill{bottom:0;left:0;right:0;top:0}@media screen and (min-width:30em){.swagger-ui .top-0-ns{top:0}.swagger-ui .left-0-ns{left:0}.swagger-ui .right-0-ns{right:0}.swagger-ui .bottom-0-ns{bottom:0}.swagger-ui .top-1-ns{top:1rem}.swagger-ui .left-1-ns{left:1rem}.swagger-ui .right-1-ns{right:1rem}.swagger-ui .bottom-1-ns{bottom:1rem}.swagger-ui .top-2-ns{top:2rem}.swagger-ui .left-2-ns{left:2rem}.swagger-ui .right-2-ns{right:2rem}.swagger-ui .bottom-2-ns{bottom:2rem}.swagger-ui .top--1-ns{top:-1rem}.swagger-ui .right--1-ns{right:-1rem}.swagger-ui .bottom--1-ns{bottom:-1rem}.swagger-ui .left--1-ns{left:-1rem}.swagger-ui .top--2-ns{top:-2rem}.swagger-ui .right--2-ns{right:-2rem}.swagger-ui .bottom--2-ns{bottom:-2rem}.swagger-ui .left--2-ns{left:-2rem}.swagger-ui .absolute--fill-ns{bottom:0;left:0;right:0;top:0}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .top-0-m{top:0}.swagger-ui .left-0-m{left:0}.swagger-ui .right-0-m{right:0}.swagger-ui .bottom-0-m{bottom:0}.swagger-ui .top-1-m{top:1rem}.swagger-ui .left-1-m{left:1rem}.swagger-ui .right-1-m{right:1rem}.swagger-ui .bottom-1-m{bottom:1rem}.swagger-ui .top-2-m{top:2rem}.swagger-ui .left-2-m{left:2rem}.swagger-ui .right-2-m{right:2rem}.swagger-ui .bottom-2-m{bottom:2rem}.swagger-ui .top--1-m{top:-1rem}.swagger-ui .right--1-m{right:-1rem}.swagger-ui .bottom--1-m{bottom:-1rem}.swagger-ui .left--1-m{left:-1rem}.swagger-ui .top--2-m{top:-2rem}.swagger-ui .right--2-m{right:-2rem}.swagger-ui .bottom--2-m{bottom:-2rem}.swagger-ui .left--2-m{left:-2rem}.swagger-ui .absolute--fill-m{bottom:0;left:0;right:0;top:0}}@media screen and (min-width:60em){.swagger-ui .top-0-l{top:0}.swagger-ui .left-0-l{left:0}.swagger-ui .right-0-l{right:0}.swagger-ui .bottom-0-l{bottom:0}.swagger-ui .top-1-l{top:1rem}.swagger-ui .left-1-l{left:1rem}.swagger-ui .right-1-l{right:1rem}.swagger-ui .bottom-1-l{bottom:1rem}.swagger-ui .top-2-l{top:2rem}.swagger-ui .left-2-l{left:2rem}.swagger-ui .right-2-l{right:2rem}.swagger-ui .bottom-2-l{bottom:2rem}.swagger-ui .top--1-l{top:-1rem}.swagger-ui .right--1-l{right:-1rem}.swagger-ui .bottom--1-l{bottom:-1rem}.swagger-ui .left--1-l{left:-1rem}.swagger-ui .top--2-l{top:-2rem}.swagger-ui .right--2-l{right:-2rem}.swagger-ui .bottom--2-l{bottom:-2rem}.swagger-ui .left--2-l{left:-2rem}.swagger-ui .absolute--fill-l{bottom:0;left:0;right:0;top:0}}.swagger-ui .cf:after,.swagger-ui .cf:before{content:" ";display:table}.swagger-ui .cf:after{clear:both}.swagger-ui .cf{*zoom:1}.swagger-ui .cl{clear:left}.swagger-ui .cr{clear:right}.swagger-ui .cb{clear:both}.swagger-ui .cn{clear:none}@media screen and (min-width:30em){.swagger-ui .cl-ns{clear:left}.swagger-ui .cr-ns{clear:right}.swagger-ui .cb-ns{clear:both}.swagger-ui .cn-ns{clear:none}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .cl-m{clear:left}.swagger-ui .cr-m{clear:right}.swagger-ui .cb-m{clear:both}.swagger-ui .cn-m{clear:none}}@media screen and (min-width:60em){.swagger-ui .cl-l{clear:left}.swagger-ui .cr-l{clear:right}.swagger-ui .cb-l{clear:both}.swagger-ui .cn-l{clear:none}}.swagger-ui .flex{display:flex}.swagger-ui .inline-flex{display:inline-flex}.swagger-ui .flex-auto{flex:1 1 auto;min-height:0;min-width:0}.swagger-ui .flex-none{flex:none}.swagger-ui .flex-column{flex-direction:column}.swagger-ui .flex-row{flex-direction:row}.swagger-ui .flex-wrap{flex-wrap:wrap}.swagger-ui .flex-nowrap{flex-wrap:nowrap}.swagger-ui .flex-wrap-reverse{flex-wrap:wrap-reverse}.swagger-ui .flex-column-reverse{flex-direction:column-reverse}.swagger-ui .flex-row-reverse{flex-direction:row-reverse}.swagger-ui .items-start{align-items:flex-start}.swagger-ui .items-end{align-items:flex-end}.swagger-ui .items-center{align-items:center}.swagger-ui .items-baseline{align-items:baseline}.swagger-ui .items-stretch{align-items:stretch}.swagger-ui .self-start{align-self:flex-start}.swagger-ui .self-end{align-self:flex-end}.swagger-ui .self-center{align-self:center}.swagger-ui .self-baseline{align-self:baseline}.swagger-ui .self-stretch{align-self:stretch}.swagger-ui .justify-start{justify-content:flex-start}.swagger-ui .justify-end{justify-content:flex-end}.swagger-ui .justify-center{justify-content:center}.swagger-ui .justify-between{justify-content:space-between}.swagger-ui .justify-around{justify-content:space-around}.swagger-ui .content-start{align-content:flex-start}.swagger-ui .content-end{align-content:flex-end}.swagger-ui .content-center{align-content:center}.swagger-ui .content-between{align-content:space-between}.swagger-ui .content-around{align-content:space-around}.swagger-ui .content-stretch{align-content:stretch}.swagger-ui .order-0{order:0}.swagger-ui .order-1{order:1}.swagger-ui .order-2{order:2}.swagger-ui .order-3{order:3}.swagger-ui .order-4{order:4}.swagger-ui .order-5{order:5}.swagger-ui .order-6{order:6}.swagger-ui .order-7{order:7}.swagger-ui .order-8{order:8}.swagger-ui .order-last{order:99999}.swagger-ui .flex-grow-0{flex-grow:0}.swagger-ui .flex-grow-1{flex-grow:1}.swagger-ui .flex-shrink-0{flex-shrink:0}.swagger-ui .flex-shrink-1{flex-shrink:1}@media screen and (min-width:30em){.swagger-ui .flex-ns{display:flex}.swagger-ui .inline-flex-ns{display:inline-flex}.swagger-ui .flex-auto-ns{flex:1 1 auto;min-height:0;min-width:0}.swagger-ui .flex-none-ns{flex:none}.swagger-ui .flex-column-ns{flex-direction:column}.swagger-ui .flex-row-ns{flex-direction:row}.swagger-ui .flex-wrap-ns{flex-wrap:wrap}.swagger-ui .flex-nowrap-ns{flex-wrap:nowrap}.swagger-ui .flex-wrap-reverse-ns{flex-wrap:wrap-reverse}.swagger-ui .flex-column-reverse-ns{flex-direction:column-reverse}.swagger-ui .flex-row-reverse-ns{flex-direction:row-reverse}.swagger-ui .items-start-ns{align-items:flex-start}.swagger-ui .items-end-ns{align-items:flex-end}.swagger-ui .items-center-ns{align-items:center}.swagger-ui .items-baseline-ns{align-items:baseline}.swagger-ui .items-stretch-ns{align-items:stretch}.swagger-ui .self-start-ns{align-self:flex-start}.swagger-ui .self-end-ns{align-self:flex-end}.swagger-ui .self-center-ns{align-self:center}.swagger-ui .self-baseline-ns{align-self:baseline}.swagger-ui .self-stretch-ns{align-self:stretch}.swagger-ui .justify-start-ns{justify-content:flex-start}.swagger-ui .justify-end-ns{justify-content:flex-end}.swagger-ui .justify-center-ns{justify-content:center}.swagger-ui .justify-between-ns{justify-content:space-between}.swagger-ui .justify-around-ns{justify-content:space-around}.swagger-ui .content-start-ns{align-content:flex-start}.swagger-ui .content-end-ns{align-content:flex-end}.swagger-ui .content-center-ns{align-content:center}.swagger-ui .content-between-ns{align-content:space-between}.swagger-ui .content-around-ns{align-content:space-around}.swagger-ui .content-stretch-ns{align-content:stretch}.swagger-ui .order-0-ns{order:0}.swagger-ui .order-1-ns{order:1}.swagger-ui .order-2-ns{order:2}.swagger-ui .order-3-ns{order:3}.swagger-ui .order-4-ns{order:4}.swagger-ui .order-5-ns{order:5}.swagger-ui .order-6-ns{order:6}.swagger-ui .order-7-ns{order:7}.swagger-ui .order-8-ns{order:8}.swagger-ui .order-last-ns{order:99999}.swagger-ui .flex-grow-0-ns{flex-grow:0}.swagger-ui .flex-grow-1-ns{flex-grow:1}.swagger-ui .flex-shrink-0-ns{flex-shrink:0}.swagger-ui .flex-shrink-1-ns{flex-shrink:1}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .flex-m{display:flex}.swagger-ui .inline-flex-m{display:inline-flex}.swagger-ui .flex-auto-m{flex:1 1 auto;min-height:0;min-width:0}.swagger-ui .flex-none-m{flex:none}.swagger-ui .flex-column-m{flex-direction:column}.swagger-ui .flex-row-m{flex-direction:row}.swagger-ui .flex-wrap-m{flex-wrap:wrap}.swagger-ui .flex-nowrap-m{flex-wrap:nowrap}.swagger-ui .flex-wrap-reverse-m{flex-wrap:wrap-reverse}.swagger-ui .flex-column-reverse-m{flex-direction:column-reverse}.swagger-ui .flex-row-reverse-m{flex-direction:row-reverse}.swagger-ui .items-start-m{align-items:flex-start}.swagger-ui .items-end-m{align-items:flex-end}.swagger-ui .items-center-m{align-items:center}.swagger-ui .items-baseline-m{align-items:baseline}.swagger-ui .items-stretch-m{align-items:stretch}.swagger-ui .self-start-m{align-self:flex-start}.swagger-ui .self-end-m{align-self:flex-end}.swagger-ui .self-center-m{align-self:center}.swagger-ui .self-baseline-m{align-self:baseline}.swagger-ui .self-stretch-m{align-self:stretch}.swagger-ui .justify-start-m{justify-content:flex-start}.swagger-ui .justify-end-m{justify-content:flex-end}.swagger-ui .justify-center-m{justify-content:center}.swagger-ui .justify-between-m{justify-content:space-between}.swagger-ui .justify-around-m{justify-content:space-around}.swagger-ui .content-start-m{align-content:flex-start}.swagger-ui .content-end-m{align-content:flex-end}.swagger-ui .content-center-m{align-content:center}.swagger-ui .content-between-m{align-content:space-between}.swagger-ui .content-around-m{align-content:space-around}.swagger-ui .content-stretch-m{align-content:stretch}.swagger-ui .order-0-m{order:0}.swagger-ui .order-1-m{order:1}.swagger-ui .order-2-m{order:2}.swagger-ui .order-3-m{order:3}.swagger-ui .order-4-m{order:4}.swagger-ui .order-5-m{order:5}.swagger-ui .order-6-m{order:6}.swagger-ui .order-7-m{order:7}.swagger-ui .order-8-m{order:8}.swagger-ui .order-last-m{order:99999}.swagger-ui .flex-grow-0-m{flex-grow:0}.swagger-ui .flex-grow-1-m{flex-grow:1}.swagger-ui .flex-shrink-0-m{flex-shrink:0}.swagger-ui .flex-shrink-1-m{flex-shrink:1}}@media screen and (min-width:60em){.swagger-ui .flex-l{display:flex}.swagger-ui .inline-flex-l{display:inline-flex}.swagger-ui .flex-auto-l{flex:1 1 auto;min-height:0;min-width:0}.swagger-ui .flex-none-l{flex:none}.swagger-ui .flex-column-l{flex-direction:column}.swagger-ui .flex-row-l{flex-direction:row}.swagger-ui .flex-wrap-l{flex-wrap:wrap}.swagger-ui .flex-nowrap-l{flex-wrap:nowrap}.swagger-ui .flex-wrap-reverse-l{flex-wrap:wrap-reverse}.swagger-ui .flex-column-reverse-l{flex-direction:column-reverse}.swagger-ui .flex-row-reverse-l{flex-direction:row-reverse}.swagger-ui .items-start-l{align-items:flex-start}.swagger-ui .items-end-l{align-items:flex-end}.swagger-ui .items-center-l{align-items:center}.swagger-ui .items-baseline-l{align-items:baseline}.swagger-ui .items-stretch-l{align-items:stretch}.swagger-ui .self-start-l{align-self:flex-start}.swagger-ui .self-end-l{align-self:flex-end}.swagger-ui .self-center-l{align-self:center}.swagger-ui .self-baseline-l{align-self:baseline}.swagger-ui .self-stretch-l{align-self:stretch}.swagger-ui .justify-start-l{justify-content:flex-start}.swagger-ui .justify-end-l{justify-content:flex-end}.swagger-ui .justify-center-l{justify-content:center}.swagger-ui .justify-between-l{justify-content:space-between}.swagger-ui .justify-around-l{justify-content:space-around}.swagger-ui .content-start-l{align-content:flex-start}.swagger-ui .content-end-l{align-content:flex-end}.swagger-ui .content-center-l{align-content:center}.swagger-ui .content-between-l{align-content:space-between}.swagger-ui .content-around-l{align-content:space-around}.swagger-ui .content-stretch-l{align-content:stretch}.swagger-ui .order-0-l{order:0}.swagger-ui .order-1-l{order:1}.swagger-ui .order-2-l{order:2}.swagger-ui .order-3-l{order:3}.swagger-ui .order-4-l{order:4}.swagger-ui .order-5-l{order:5}.swagger-ui .order-6-l{order:6}.swagger-ui .order-7-l{order:7}.swagger-ui .order-8-l{order:8}.swagger-ui .order-last-l{order:99999}.swagger-ui .flex-grow-0-l{flex-grow:0}.swagger-ui .flex-grow-1-l{flex-grow:1}.swagger-ui .flex-shrink-0-l{flex-shrink:0}.swagger-ui .flex-shrink-1-l{flex-shrink:1}}.swagger-ui .dn{display:none}.swagger-ui .di{display:inline}.swagger-ui .db{display:block}.swagger-ui .dib{display:inline-block}.swagger-ui .dit{display:inline-table}.swagger-ui .dt{display:table}.swagger-ui .dtc{display:table-cell}.swagger-ui .dt-row{display:table-row}.swagger-ui .dt-row-group{display:table-row-group}.swagger-ui .dt-column{display:table-column}.swagger-ui .dt-column-group{display:table-column-group}.swagger-ui .dt--fixed{table-layout:fixed;width:100%}@media screen and (min-width:30em){.swagger-ui .dn-ns{display:none}.swagger-ui .di-ns{display:inline}.swagger-ui .db-ns{display:block}.swagger-ui .dib-ns{display:inline-block}.swagger-ui .dit-ns{display:inline-table}.swagger-ui .dt-ns{display:table}.swagger-ui .dtc-ns{display:table-cell}.swagger-ui .dt-row-ns{display:table-row}.swagger-ui .dt-row-group-ns{display:table-row-group}.swagger-ui .dt-column-ns{display:table-column}.swagger-ui .dt-column-group-ns{display:table-column-group}.swagger-ui .dt--fixed-ns{table-layout:fixed;width:100%}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .dn-m{display:none}.swagger-ui .di-m{display:inline}.swagger-ui .db-m{display:block}.swagger-ui .dib-m{display:inline-block}.swagger-ui .dit-m{display:inline-table}.swagger-ui .dt-m{display:table}.swagger-ui .dtc-m{display:table-cell}.swagger-ui .dt-row-m{display:table-row}.swagger-ui .dt-row-group-m{display:table-row-group}.swagger-ui .dt-column-m{display:table-column}.swagger-ui .dt-column-group-m{display:table-column-group}.swagger-ui .dt--fixed-m{table-layout:fixed;width:100%}}@media screen and (min-width:60em){.swagger-ui .dn-l{display:none}.swagger-ui .di-l{display:inline}.swagger-ui .db-l{display:block}.swagger-ui .dib-l{display:inline-block}.swagger-ui .dit-l{display:inline-table}.swagger-ui .dt-l{display:table}.swagger-ui .dtc-l{display:table-cell}.swagger-ui .dt-row-l{display:table-row}.swagger-ui .dt-row-group-l{display:table-row-group}.swagger-ui .dt-column-l{display:table-column}.swagger-ui .dt-column-group-l{display:table-column-group}.swagger-ui .dt--fixed-l{table-layout:fixed;width:100%}}.swagger-ui .fl{_display:inline;float:left}.swagger-ui .fr{_display:inline;float:right}.swagger-ui .fn{float:none}@media screen and (min-width:30em){.swagger-ui .fl-ns{_display:inline;float:left}.swagger-ui .fr-ns{_display:inline;float:right}.swagger-ui .fn-ns{float:none}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .fl-m{_display:inline;float:left}.swagger-ui .fr-m{_display:inline;float:right}.swagger-ui .fn-m{float:none}}@media screen and (min-width:60em){.swagger-ui .fl-l{_display:inline;float:left}.swagger-ui .fr-l{_display:inline;float:right}.swagger-ui .fn-l{float:none}}.swagger-ui .sans-serif{font-family:-apple-system,BlinkMacSystemFont,avenir next,avenir,helvetica,helvetica neue,ubuntu,roboto,noto,segoe ui,arial,sans-serif}.swagger-ui .serif{font-family:georgia,serif}.swagger-ui .system-sans-serif{font-family:sans-serif}.swagger-ui .system-serif{font-family:serif}.swagger-ui .code,.swagger-ui code{font-family:Consolas,monaco,monospace}.swagger-ui .courier{font-family:Courier Next,courier,monospace}.swagger-ui .helvetica{font-family:helvetica neue,helvetica,sans-serif}.swagger-ui .avenir{font-family:avenir next,avenir,sans-serif}.swagger-ui .athelas{font-family:athelas,georgia,serif}.swagger-ui .georgia{font-family:georgia,serif}.swagger-ui .times{font-family:times,serif}.swagger-ui .bodoni{font-family:Bodoni MT,serif}.swagger-ui .calisto{font-family:Calisto MT,serif}.swagger-ui .garamond{font-family:garamond,serif}.swagger-ui .baskerville{font-family:baskerville,serif}.swagger-ui .i{font-style:italic}.swagger-ui .fs-normal{font-style:normal}@media screen and (min-width:30em){.swagger-ui .i-ns{font-style:italic}.swagger-ui .fs-normal-ns{font-style:normal}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .i-m{font-style:italic}.swagger-ui .fs-normal-m{font-style:normal}}@media screen and (min-width:60em){.swagger-ui .i-l{font-style:italic}.swagger-ui .fs-normal-l{font-style:normal}}.swagger-ui .normal{font-weight:400}.swagger-ui .b{font-weight:700}.swagger-ui .fw1{font-weight:100}.swagger-ui .fw2{font-weight:200}.swagger-ui .fw3{font-weight:300}.swagger-ui .fw4{font-weight:400}.swagger-ui .fw5{font-weight:500}.swagger-ui .fw6{font-weight:600}.swagger-ui .fw7{font-weight:700}.swagger-ui .fw8{font-weight:800}.swagger-ui .fw9{font-weight:900}@media screen and (min-width:30em){.swagger-ui .normal-ns{font-weight:400}.swagger-ui .b-ns{font-weight:700}.swagger-ui .fw1-ns{font-weight:100}.swagger-ui .fw2-ns{font-weight:200}.swagger-ui .fw3-ns{font-weight:300}.swagger-ui .fw4-ns{font-weight:400}.swagger-ui .fw5-ns{font-weight:500}.swagger-ui .fw6-ns{font-weight:600}.swagger-ui .fw7-ns{font-weight:700}.swagger-ui .fw8-ns{font-weight:800}.swagger-ui .fw9-ns{font-weight:900}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .normal-m{font-weight:400}.swagger-ui .b-m{font-weight:700}.swagger-ui .fw1-m{font-weight:100}.swagger-ui .fw2-m{font-weight:200}.swagger-ui .fw3-m{font-weight:300}.swagger-ui .fw4-m{font-weight:400}.swagger-ui .fw5-m{font-weight:500}.swagger-ui .fw6-m{font-weight:600}.swagger-ui .fw7-m{font-weight:700}.swagger-ui .fw8-m{font-weight:800}.swagger-ui .fw9-m{font-weight:900}}@media screen and (min-width:60em){.swagger-ui .normal-l{font-weight:400}.swagger-ui .b-l{font-weight:700}.swagger-ui .fw1-l{font-weight:100}.swagger-ui .fw2-l{font-weight:200}.swagger-ui .fw3-l{font-weight:300}.swagger-ui .fw4-l{font-weight:400}.swagger-ui .fw5-l{font-weight:500}.swagger-ui .fw6-l{font-weight:600}.swagger-ui .fw7-l{font-weight:700}.swagger-ui .fw8-l{font-weight:800}.swagger-ui .fw9-l{font-weight:900}}.swagger-ui .input-reset{-webkit-appearance:none;-moz-appearance:none}.swagger-ui .button-reset::-moz-focus-inner,.swagger-ui .input-reset::-moz-focus-inner{border:0;padding:0}.swagger-ui .h1{height:1rem}.swagger-ui .h2{height:2rem}.swagger-ui .h3{height:4rem}.swagger-ui .h4{height:8rem}.swagger-ui .h5{height:16rem}.swagger-ui .h-25{height:25%}.swagger-ui .h-50{height:50%}.swagger-ui .h-75{height:75%}.swagger-ui .h-100{height:100%}.swagger-ui .min-h-100{min-height:100%}.swagger-ui .vh-25{height:25vh}.swagger-ui .vh-50{height:50vh}.swagger-ui .vh-75{height:75vh}.swagger-ui .vh-100{height:100vh}.swagger-ui .min-vh-100{min-height:100vh}.swagger-ui .h-auto{height:auto}.swagger-ui .h-inherit{height:inherit}@media screen and (min-width:30em){.swagger-ui .h1-ns{height:1rem}.swagger-ui .h2-ns{height:2rem}.swagger-ui .h3-ns{height:4rem}.swagger-ui .h4-ns{height:8rem}.swagger-ui .h5-ns{height:16rem}.swagger-ui .h-25-ns{height:25%}.swagger-ui .h-50-ns{height:50%}.swagger-ui .h-75-ns{height:75%}.swagger-ui .h-100-ns{height:100%}.swagger-ui .min-h-100-ns{min-height:100%}.swagger-ui .vh-25-ns{height:25vh}.swagger-ui .vh-50-ns{height:50vh}.swagger-ui .vh-75-ns{height:75vh}.swagger-ui .vh-100-ns{height:100vh}.swagger-ui .min-vh-100-ns{min-height:100vh}.swagger-ui .h-auto-ns{height:auto}.swagger-ui .h-inherit-ns{height:inherit}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .h1-m{height:1rem}.swagger-ui .h2-m{height:2rem}.swagger-ui .h3-m{height:4rem}.swagger-ui .h4-m{height:8rem}.swagger-ui .h5-m{height:16rem}.swagger-ui .h-25-m{height:25%}.swagger-ui .h-50-m{height:50%}.swagger-ui .h-75-m{height:75%}.swagger-ui .h-100-m{height:100%}.swagger-ui .min-h-100-m{min-height:100%}.swagger-ui .vh-25-m{height:25vh}.swagger-ui .vh-50-m{height:50vh}.swagger-ui .vh-75-m{height:75vh}.swagger-ui .vh-100-m{height:100vh}.swagger-ui .min-vh-100-m{min-height:100vh}.swagger-ui .h-auto-m{height:auto}.swagger-ui .h-inherit-m{height:inherit}}@media screen and (min-width:60em){.swagger-ui .h1-l{height:1rem}.swagger-ui .h2-l{height:2rem}.swagger-ui .h3-l{height:4rem}.swagger-ui .h4-l{height:8rem}.swagger-ui .h5-l{height:16rem}.swagger-ui .h-25-l{height:25%}.swagger-ui .h-50-l{height:50%}.swagger-ui .h-75-l{height:75%}.swagger-ui .h-100-l{height:100%}.swagger-ui .min-h-100-l{min-height:100%}.swagger-ui .vh-25-l{height:25vh}.swagger-ui .vh-50-l{height:50vh}.swagger-ui .vh-75-l{height:75vh}.swagger-ui .vh-100-l{height:100vh}.swagger-ui .min-vh-100-l{min-height:100vh}.swagger-ui .h-auto-l{height:auto}.swagger-ui .h-inherit-l{height:inherit}}.swagger-ui .tracked{letter-spacing:.1em}.swagger-ui .tracked-tight{letter-spacing:-.05em}.swagger-ui .tracked-mega{letter-spacing:.25em}@media screen and (min-width:30em){.swagger-ui .tracked-ns{letter-spacing:.1em}.swagger-ui .tracked-tight-ns{letter-spacing:-.05em}.swagger-ui .tracked-mega-ns{letter-spacing:.25em}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .tracked-m{letter-spacing:.1em}.swagger-ui .tracked-tight-m{letter-spacing:-.05em}.swagger-ui .tracked-mega-m{letter-spacing:.25em}}@media screen and (min-width:60em){.swagger-ui .tracked-l{letter-spacing:.1em}.swagger-ui .tracked-tight-l{letter-spacing:-.05em}.swagger-ui .tracked-mega-l{letter-spacing:.25em}}.swagger-ui .lh-solid{line-height:1}.swagger-ui .lh-title{line-height:1.25}.swagger-ui .lh-copy{line-height:1.5}@media screen and (min-width:30em){.swagger-ui .lh-solid-ns{line-height:1}.swagger-ui .lh-title-ns{line-height:1.25}.swagger-ui .lh-copy-ns{line-height:1.5}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .lh-solid-m{line-height:1}.swagger-ui .lh-title-m{line-height:1.25}.swagger-ui .lh-copy-m{line-height:1.5}}@media screen and (min-width:60em){.swagger-ui .lh-solid-l{line-height:1}.swagger-ui .lh-title-l{line-height:1.25}.swagger-ui .lh-copy-l{line-height:1.5}}.swagger-ui .link{text-decoration:none}.swagger-ui .link,.swagger-ui .link:active,.swagger-ui .link:focus,.swagger-ui .link:hover,.swagger-ui .link:link,.swagger-ui .link:visited{transition:color .15s ease-in}.swagger-ui .link:focus{outline:1px dotted currentColor}.swagger-ui .list{list-style-type:none}.swagger-ui .mw-100{max-width:100%}.swagger-ui .mw1{max-width:1rem}.swagger-ui .mw2{max-width:2rem}.swagger-ui .mw3{max-width:4rem}.swagger-ui .mw4{max-width:8rem}.swagger-ui .mw5{max-width:16rem}.swagger-ui .mw6{max-width:32rem}.swagger-ui .mw7{max-width:48rem}.swagger-ui .mw8{max-width:64rem}.swagger-ui .mw9{max-width:96rem}.swagger-ui .mw-none{max-width:none}@media screen and (min-width:30em){.swagger-ui .mw-100-ns{max-width:100%}.swagger-ui .mw1-ns{max-width:1rem}.swagger-ui .mw2-ns{max-width:2rem}.swagger-ui .mw3-ns{max-width:4rem}.swagger-ui .mw4-ns{max-width:8rem}.swagger-ui .mw5-ns{max-width:16rem}.swagger-ui .mw6-ns{max-width:32rem}.swagger-ui .mw7-ns{max-width:48rem}.swagger-ui .mw8-ns{max-width:64rem}.swagger-ui .mw9-ns{max-width:96rem}.swagger-ui .mw-none-ns{max-width:none}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .mw-100-m{max-width:100%}.swagger-ui .mw1-m{max-width:1rem}.swagger-ui .mw2-m{max-width:2rem}.swagger-ui .mw3-m{max-width:4rem}.swagger-ui .mw4-m{max-width:8rem}.swagger-ui .mw5-m{max-width:16rem}.swagger-ui .mw6-m{max-width:32rem}.swagger-ui .mw7-m{max-width:48rem}.swagger-ui .mw8-m{max-width:64rem}.swagger-ui .mw9-m{max-width:96rem}.swagger-ui .mw-none-m{max-width:none}}@media screen and (min-width:60em){.swagger-ui .mw-100-l{max-width:100%}.swagger-ui .mw1-l{max-width:1rem}.swagger-ui .mw2-l{max-width:2rem}.swagger-ui .mw3-l{max-width:4rem}.swagger-ui .mw4-l{max-width:8rem}.swagger-ui .mw5-l{max-width:16rem}.swagger-ui .mw6-l{max-width:32rem}.swagger-ui .mw7-l{max-width:48rem}.swagger-ui .mw8-l{max-width:64rem}.swagger-ui .mw9-l{max-width:96rem}.swagger-ui .mw-none-l{max-width:none}}.swagger-ui .w1{width:1rem}.swagger-ui .w2{width:2rem}.swagger-ui .w3{width:4rem}.swagger-ui .w4{width:8rem}.swagger-ui .w5{width:16rem}.swagger-ui .w-10{width:10%}.swagger-ui .w-20{width:20%}.swagger-ui .w-25{width:25%}.swagger-ui .w-30{width:30%}.swagger-ui .w-33{width:33%}.swagger-ui .w-34{width:34%}.swagger-ui .w-40{width:40%}.swagger-ui .w-50{width:50%}.swagger-ui .w-60{width:60%}.swagger-ui .w-70{width:70%}.swagger-ui .w-75{width:75%}.swagger-ui .w-80{width:80%}.swagger-ui .w-90{width:90%}.swagger-ui .w-100{width:100%}.swagger-ui .w-third{width:33.3333333333%}.swagger-ui .w-two-thirds{width:66.6666666667%}.swagger-ui .w-auto{width:auto}@media screen and (min-width:30em){.swagger-ui .w1-ns{width:1rem}.swagger-ui .w2-ns{width:2rem}.swagger-ui .w3-ns{width:4rem}.swagger-ui .w4-ns{width:8rem}.swagger-ui .w5-ns{width:16rem}.swagger-ui .w-10-ns{width:10%}.swagger-ui .w-20-ns{width:20%}.swagger-ui .w-25-ns{width:25%}.swagger-ui .w-30-ns{width:30%}.swagger-ui .w-33-ns{width:33%}.swagger-ui .w-34-ns{width:34%}.swagger-ui .w-40-ns{width:40%}.swagger-ui .w-50-ns{width:50%}.swagger-ui .w-60-ns{width:60%}.swagger-ui .w-70-ns{width:70%}.swagger-ui .w-75-ns{width:75%}.swagger-ui .w-80-ns{width:80%}.swagger-ui .w-90-ns{width:90%}.swagger-ui .w-100-ns{width:100%}.swagger-ui .w-third-ns{width:33.3333333333%}.swagger-ui .w-two-thirds-ns{width:66.6666666667%}.swagger-ui .w-auto-ns{width:auto}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .w1-m{width:1rem}.swagger-ui .w2-m{width:2rem}.swagger-ui .w3-m{width:4rem}.swagger-ui .w4-m{width:8rem}.swagger-ui .w5-m{width:16rem}.swagger-ui .w-10-m{width:10%}.swagger-ui .w-20-m{width:20%}.swagger-ui .w-25-m{width:25%}.swagger-ui .w-30-m{width:30%}.swagger-ui .w-33-m{width:33%}.swagger-ui .w-34-m{width:34%}.swagger-ui .w-40-m{width:40%}.swagger-ui .w-50-m{width:50%}.swagger-ui .w-60-m{width:60%}.swagger-ui .w-70-m{width:70%}.swagger-ui .w-75-m{width:75%}.swagger-ui .w-80-m{width:80%}.swagger-ui .w-90-m{width:90%}.swagger-ui .w-100-m{width:100%}.swagger-ui .w-third-m{width:33.3333333333%}.swagger-ui .w-two-thirds-m{width:66.6666666667%}.swagger-ui .w-auto-m{width:auto}}@media screen and (min-width:60em){.swagger-ui .w1-l{width:1rem}.swagger-ui .w2-l{width:2rem}.swagger-ui .w3-l{width:4rem}.swagger-ui .w4-l{width:8rem}.swagger-ui .w5-l{width:16rem}.swagger-ui .w-10-l{width:10%}.swagger-ui .w-20-l{width:20%}.swagger-ui .w-25-l{width:25%}.swagger-ui .w-30-l{width:30%}.swagger-ui .w-33-l{width:33%}.swagger-ui .w-34-l{width:34%}.swagger-ui .w-40-l{width:40%}.swagger-ui .w-50-l{width:50%}.swagger-ui .w-60-l{width:60%}.swagger-ui .w-70-l{width:70%}.swagger-ui .w-75-l{width:75%}.swagger-ui .w-80-l{width:80%}.swagger-ui .w-90-l{width:90%}.swagger-ui .w-100-l{width:100%}.swagger-ui .w-third-l{width:33.3333333333%}.swagger-ui .w-two-thirds-l{width:66.6666666667%}.swagger-ui .w-auto-l{width:auto}}.swagger-ui .overflow-visible{overflow:visible}.swagger-ui .overflow-hidden{overflow:hidden}.swagger-ui .overflow-scroll{overflow:scroll}.swagger-ui .overflow-auto{overflow:auto}.swagger-ui .overflow-x-visible{overflow-x:visible}.swagger-ui .overflow-x-hidden{overflow-x:hidden}.swagger-ui .overflow-x-scroll{overflow-x:scroll}.swagger-ui .overflow-x-auto{overflow-x:auto}.swagger-ui .overflow-y-visible{overflow-y:visible}.swagger-ui .overflow-y-hidden{overflow-y:hidden}.swagger-ui .overflow-y-scroll{overflow-y:scroll}.swagger-ui .overflow-y-auto{overflow-y:auto}@media screen and (min-width:30em){.swagger-ui .overflow-visible-ns{overflow:visible}.swagger-ui .overflow-hidden-ns{overflow:hidden}.swagger-ui .overflow-scroll-ns{overflow:scroll}.swagger-ui .overflow-auto-ns{overflow:auto}.swagger-ui .overflow-x-visible-ns{overflow-x:visible}.swagger-ui .overflow-x-hidden-ns{overflow-x:hidden}.swagger-ui .overflow-x-scroll-ns{overflow-x:scroll}.swagger-ui .overflow-x-auto-ns{overflow-x:auto}.swagger-ui .overflow-y-visible-ns{overflow-y:visible}.swagger-ui .overflow-y-hidden-ns{overflow-y:hidden}.swagger-ui .overflow-y-scroll-ns{overflow-y:scroll}.swagger-ui .overflow-y-auto-ns{overflow-y:auto}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .overflow-visible-m{overflow:visible}.swagger-ui .overflow-hidden-m{overflow:hidden}.swagger-ui .overflow-scroll-m{overflow:scroll}.swagger-ui .overflow-auto-m{overflow:auto}.swagger-ui .overflow-x-visible-m{overflow-x:visible}.swagger-ui .overflow-x-hidden-m{overflow-x:hidden}.swagger-ui .overflow-x-scroll-m{overflow-x:scroll}.swagger-ui .overflow-x-auto-m{overflow-x:auto}.swagger-ui .overflow-y-visible-m{overflow-y:visible}.swagger-ui .overflow-y-hidden-m{overflow-y:hidden}.swagger-ui .overflow-y-scroll-m{overflow-y:scroll}.swagger-ui .overflow-y-auto-m{overflow-y:auto}}@media screen and (min-width:60em){.swagger-ui .overflow-visible-l{overflow:visible}.swagger-ui .overflow-hidden-l{overflow:hidden}.swagger-ui .overflow-scroll-l{overflow:scroll}.swagger-ui .overflow-auto-l{overflow:auto}.swagger-ui .overflow-x-visible-l{overflow-x:visible}.swagger-ui .overflow-x-hidden-l{overflow-x:hidden}.swagger-ui .overflow-x-scroll-l{overflow-x:scroll}.swagger-ui .overflow-x-auto-l{overflow-x:auto}.swagger-ui .overflow-y-visible-l{overflow-y:visible}.swagger-ui .overflow-y-hidden-l{overflow-y:hidden}.swagger-ui .overflow-y-scroll-l{overflow-y:scroll}.swagger-ui .overflow-y-auto-l{overflow-y:auto}}.swagger-ui .static{position:static}.swagger-ui .relative{position:relative}.swagger-ui .absolute{position:absolute}.swagger-ui .fixed{position:fixed}@media screen and (min-width:30em){.swagger-ui .static-ns{position:static}.swagger-ui .relative-ns{position:relative}.swagger-ui .absolute-ns{position:absolute}.swagger-ui .fixed-ns{position:fixed}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .static-m{position:static}.swagger-ui .relative-m{position:relative}.swagger-ui .absolute-m{position:absolute}.swagger-ui .fixed-m{position:fixed}}@media screen and (min-width:60em){.swagger-ui .static-l{position:static}.swagger-ui .relative-l{position:relative}.swagger-ui .absolute-l{position:absolute}.swagger-ui .fixed-l{position:fixed}}.swagger-ui .o-100{opacity:1}.swagger-ui .o-90{opacity:.9}.swagger-ui .o-80{opacity:.8}.swagger-ui .o-70{opacity:.7}.swagger-ui .o-60{opacity:.6}.swagger-ui .o-50{opacity:.5}.swagger-ui .o-40{opacity:.4}.swagger-ui .o-30{opacity:.3}.swagger-ui .o-20{opacity:.2}.swagger-ui .o-10{opacity:.1}.swagger-ui .o-05{opacity:.05}.swagger-ui .o-025{opacity:.025}.swagger-ui .o-0{opacity:0}.swagger-ui .rotate-45{transform:rotate(45deg)}.swagger-ui .rotate-90{transform:rotate(90deg)}.swagger-ui .rotate-135{transform:rotate(135deg)}.swagger-ui .rotate-180{transform:rotate(180deg)}.swagger-ui .rotate-225{transform:rotate(225deg)}.swagger-ui .rotate-270{transform:rotate(270deg)}.swagger-ui .rotate-315{transform:rotate(315deg)}@media screen and (min-width:30em){.swagger-ui .rotate-45-ns{transform:rotate(45deg)}.swagger-ui .rotate-90-ns{transform:rotate(90deg)}.swagger-ui .rotate-135-ns{transform:rotate(135deg)}.swagger-ui .rotate-180-ns{transform:rotate(180deg)}.swagger-ui .rotate-225-ns{transform:rotate(225deg)}.swagger-ui .rotate-270-ns{transform:rotate(270deg)}.swagger-ui .rotate-315-ns{transform:rotate(315deg)}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .rotate-45-m{transform:rotate(45deg)}.swagger-ui .rotate-90-m{transform:rotate(90deg)}.swagger-ui .rotate-135-m{transform:rotate(135deg)}.swagger-ui .rotate-180-m{transform:rotate(180deg)}.swagger-ui .rotate-225-m{transform:rotate(225deg)}.swagger-ui .rotate-270-m{transform:rotate(270deg)}.swagger-ui .rotate-315-m{transform:rotate(315deg)}}@media screen and (min-width:60em){.swagger-ui .rotate-45-l{transform:rotate(45deg)}.swagger-ui .rotate-90-l{transform:rotate(90deg)}.swagger-ui .rotate-135-l{transform:rotate(135deg)}.swagger-ui .rotate-180-l{transform:rotate(180deg)}.swagger-ui .rotate-225-l{transform:rotate(225deg)}.swagger-ui .rotate-270-l{transform:rotate(270deg)}.swagger-ui .rotate-315-l{transform:rotate(315deg)}}.swagger-ui .black-90{color:rgba(0,0,0,.9)}.swagger-ui .black-80{color:rgba(0,0,0,.8)}.swagger-ui .black-70{color:rgba(0,0,0,.7)}.swagger-ui .black-60{color:rgba(0,0,0,.6)}.swagger-ui .black-50{color:rgba(0,0,0,.5)}.swagger-ui .black-40{color:rgba(0,0,0,.4)}.swagger-ui .black-30{color:rgba(0,0,0,.3)}.swagger-ui .black-20{color:rgba(0,0,0,.2)}.swagger-ui .black-10{color:rgba(0,0,0,.1)}.swagger-ui .black-05{color:rgba(0,0,0,.05)}.swagger-ui .white-90{color:hsla(0,0%,100%,.9)}.swagger-ui .white-80{color:hsla(0,0%,100%,.8)}.swagger-ui .white-70{color:hsla(0,0%,100%,.7)}.swagger-ui .white-60{color:hsla(0,0%,100%,.6)}.swagger-ui .white-50{color:hsla(0,0%,100%,.5)}.swagger-ui .white-40{color:hsla(0,0%,100%,.4)}.swagger-ui .white-30{color:hsla(0,0%,100%,.3)}.swagger-ui .white-20{color:hsla(0,0%,100%,.2)}.swagger-ui .white-10{color:hsla(0,0%,100%,.1)}.swagger-ui .black{color:#000}.swagger-ui .near-black{color:#111}.swagger-ui .dark-gray{color:#333}.swagger-ui .mid-gray{color:#555}.swagger-ui .gray{color:#777}.swagger-ui .silver{color:#999}.swagger-ui .light-silver{color:#aaa}.swagger-ui .moon-gray{color:#ccc}.swagger-ui .light-gray{color:#eee}.swagger-ui .near-white{color:#f4f4f4}.swagger-ui .white{color:#fff}.swagger-ui .dark-red{color:#e7040f}.swagger-ui .red{color:#ff4136}.swagger-ui .light-red{color:#ff725c}.swagger-ui .orange{color:#ff6300}.swagger-ui .gold{color:#ffb700}.swagger-ui .yellow{color:gold}.swagger-ui .light-yellow{color:#fbf1a9}.swagger-ui .purple{color:#5e2ca5}.swagger-ui .light-purple{color:#a463f2}.swagger-ui .dark-pink{color:#d5008f}.swagger-ui .hot-pink{color:#ff41b4}.swagger-ui .pink{color:#ff80cc}.swagger-ui .light-pink{color:#ffa3d7}.swagger-ui .dark-green{color:#137752}.swagger-ui .green{color:#19a974}.swagger-ui .light-green{color:#9eebcf}.swagger-ui .navy{color:#001b44}.swagger-ui .dark-blue{color:#00449e}.swagger-ui .blue{color:#357edd}.swagger-ui .light-blue{color:#96ccff}.swagger-ui .lightest-blue{color:#cdecff}.swagger-ui .washed-blue{color:#f6fffe}.swagger-ui .washed-green{color:#e8fdf5}.swagger-ui .washed-yellow{color:#fffceb}.swagger-ui .washed-red{color:#ffdfdf}.swagger-ui .color-inherit{color:inherit}.swagger-ui .bg-black-90{background-color:rgba(0,0,0,.9)}.swagger-ui .bg-black-80{background-color:rgba(0,0,0,.8)}.swagger-ui .bg-black-70{background-color:rgba(0,0,0,.7)}.swagger-ui .bg-black-60{background-color:rgba(0,0,0,.6)}.swagger-ui .bg-black-50{background-color:rgba(0,0,0,.5)}.swagger-ui .bg-black-40{background-color:rgba(0,0,0,.4)}.swagger-ui .bg-black-30{background-color:rgba(0,0,0,.3)}.swagger-ui .bg-black-20{background-color:rgba(0,0,0,.2)}.swagger-ui .bg-black-10{background-color:rgba(0,0,0,.1)}.swagger-ui .bg-black-05{background-color:rgba(0,0,0,.05)}.swagger-ui .bg-white-90{background-color:hsla(0,0%,100%,.9)}.swagger-ui .bg-white-80{background-color:hsla(0,0%,100%,.8)}.swagger-ui .bg-white-70{background-color:hsla(0,0%,100%,.7)}.swagger-ui .bg-white-60{background-color:hsla(0,0%,100%,.6)}.swagger-ui .bg-white-50{background-color:hsla(0,0%,100%,.5)}.swagger-ui .bg-white-40{background-color:hsla(0,0%,100%,.4)}.swagger-ui .bg-white-30{background-color:hsla(0,0%,100%,.3)}.swagger-ui .bg-white-20{background-color:hsla(0,0%,100%,.2)}.swagger-ui .bg-white-10{background-color:hsla(0,0%,100%,.1)}.swagger-ui .bg-black{background-color:#000}.swagger-ui .bg-near-black{background-color:#111}.swagger-ui .bg-dark-gray{background-color:#333}.swagger-ui .bg-mid-gray{background-color:#555}.swagger-ui .bg-gray{background-color:#777}.swagger-ui .bg-silver{background-color:#999}.swagger-ui .bg-light-silver{background-color:#aaa}.swagger-ui .bg-moon-gray{background-color:#ccc}.swagger-ui .bg-light-gray{background-color:#eee}.swagger-ui .bg-near-white{background-color:#f4f4f4}.swagger-ui .bg-white{background-color:#fff}.swagger-ui .bg-transparent{background-color:transparent}.swagger-ui .bg-dark-red{background-color:#e7040f}.swagger-ui .bg-red{background-color:#ff4136}.swagger-ui .bg-light-red{background-color:#ff725c}.swagger-ui .bg-orange{background-color:#ff6300}.swagger-ui .bg-gold{background-color:#ffb700}.swagger-ui .bg-yellow{background-color:gold}.swagger-ui .bg-light-yellow{background-color:#fbf1a9}.swagger-ui .bg-purple{background-color:#5e2ca5}.swagger-ui .bg-light-purple{background-color:#a463f2}.swagger-ui .bg-dark-pink{background-color:#d5008f}.swagger-ui .bg-hot-pink{background-color:#ff41b4}.swagger-ui .bg-pink{background-color:#ff80cc}.swagger-ui .bg-light-pink{background-color:#ffa3d7}.swagger-ui .bg-dark-green{background-color:#137752}.swagger-ui .bg-green{background-color:#19a974}.swagger-ui .bg-light-green{background-color:#9eebcf}.swagger-ui .bg-navy{background-color:#001b44}.swagger-ui .bg-dark-blue{background-color:#00449e}.swagger-ui .bg-blue{background-color:#357edd}.swagger-ui .bg-light-blue{background-color:#96ccff}.swagger-ui .bg-lightest-blue{background-color:#cdecff}.swagger-ui .bg-washed-blue{background-color:#f6fffe}.swagger-ui .bg-washed-green{background-color:#e8fdf5}.swagger-ui .bg-washed-yellow{background-color:#fffceb}.swagger-ui .bg-washed-red{background-color:#ffdfdf}.swagger-ui .bg-inherit{background-color:inherit}.swagger-ui .hover-black:focus,.swagger-ui .hover-black:hover{color:#000}.swagger-ui .hover-near-black:focus,.swagger-ui .hover-near-black:hover{color:#111}.swagger-ui .hover-dark-gray:focus,.swagger-ui .hover-dark-gray:hover{color:#333}.swagger-ui .hover-mid-gray:focus,.swagger-ui .hover-mid-gray:hover{color:#555}.swagger-ui .hover-gray:focus,.swagger-ui .hover-gray:hover{color:#777}.swagger-ui .hover-silver:focus,.swagger-ui .hover-silver:hover{color:#999}.swagger-ui .hover-light-silver:focus,.swagger-ui .hover-light-silver:hover{color:#aaa}.swagger-ui .hover-moon-gray:focus,.swagger-ui .hover-moon-gray:hover{color:#ccc}.swagger-ui .hover-light-gray:focus,.swagger-ui .hover-light-gray:hover{color:#eee}.swagger-ui .hover-near-white:focus,.swagger-ui .hover-near-white:hover{color:#f4f4f4}.swagger-ui .hover-white:focus,.swagger-ui .hover-white:hover{color:#fff}.swagger-ui .hover-black-90:focus,.swagger-ui .hover-black-90:hover{color:rgba(0,0,0,.9)}.swagger-ui .hover-black-80:focus,.swagger-ui .hover-black-80:hover{color:rgba(0,0,0,.8)}.swagger-ui .hover-black-70:focus,.swagger-ui .hover-black-70:hover{color:rgba(0,0,0,.7)}.swagger-ui .hover-black-60:focus,.swagger-ui .hover-black-60:hover{color:rgba(0,0,0,.6)}.swagger-ui .hover-black-50:focus,.swagger-ui .hover-black-50:hover{color:rgba(0,0,0,.5)}.swagger-ui .hover-black-40:focus,.swagger-ui .hover-black-40:hover{color:rgba(0,0,0,.4)}.swagger-ui .hover-black-30:focus,.swagger-ui .hover-black-30:hover{color:rgba(0,0,0,.3)}.swagger-ui .hover-black-20:focus,.swagger-ui .hover-black-20:hover{color:rgba(0,0,0,.2)}.swagger-ui .hover-black-10:focus,.swagger-ui .hover-black-10:hover{color:rgba(0,0,0,.1)}.swagger-ui .hover-white-90:focus,.swagger-ui .hover-white-90:hover{color:hsla(0,0%,100%,.9)}.swagger-ui .hover-white-80:focus,.swagger-ui .hover-white-80:hover{color:hsla(0,0%,100%,.8)}.swagger-ui .hover-white-70:focus,.swagger-ui .hover-white-70:hover{color:hsla(0,0%,100%,.7)}.swagger-ui .hover-white-60:focus,.swagger-ui .hover-white-60:hover{color:hsla(0,0%,100%,.6)}.swagger-ui .hover-white-50:focus,.swagger-ui .hover-white-50:hover{color:hsla(0,0%,100%,.5)}.swagger-ui .hover-white-40:focus,.swagger-ui .hover-white-40:hover{color:hsla(0,0%,100%,.4)}.swagger-ui .hover-white-30:focus,.swagger-ui .hover-white-30:hover{color:hsla(0,0%,100%,.3)}.swagger-ui .hover-white-20:focus,.swagger-ui .hover-white-20:hover{color:hsla(0,0%,100%,.2)}.swagger-ui .hover-white-10:focus,.swagger-ui .hover-white-10:hover{color:hsla(0,0%,100%,.1)}.swagger-ui .hover-inherit:focus,.swagger-ui .hover-inherit:hover{color:inherit}.swagger-ui .hover-bg-black:focus,.swagger-ui .hover-bg-black:hover{background-color:#000}.swagger-ui .hover-bg-near-black:focus,.swagger-ui .hover-bg-near-black:hover{background-color:#111}.swagger-ui .hover-bg-dark-gray:focus,.swagger-ui .hover-bg-dark-gray:hover{background-color:#333}.swagger-ui .hover-bg-mid-gray:focus,.swagger-ui .hover-bg-mid-gray:hover{background-color:#555}.swagger-ui .hover-bg-gray:focus,.swagger-ui .hover-bg-gray:hover{background-color:#777}.swagger-ui .hover-bg-silver:focus,.swagger-ui .hover-bg-silver:hover{background-color:#999}.swagger-ui .hover-bg-light-silver:focus,.swagger-ui .hover-bg-light-silver:hover{background-color:#aaa}.swagger-ui .hover-bg-moon-gray:focus,.swagger-ui .hover-bg-moon-gray:hover{background-color:#ccc}.swagger-ui .hover-bg-light-gray:focus,.swagger-ui .hover-bg-light-gray:hover{background-color:#eee}.swagger-ui .hover-bg-near-white:focus,.swagger-ui .hover-bg-near-white:hover{background-color:#f4f4f4}.swagger-ui .hover-bg-white:focus,.swagger-ui .hover-bg-white:hover{background-color:#fff}.swagger-ui .hover-bg-transparent:focus,.swagger-ui .hover-bg-transparent:hover{background-color:transparent}.swagger-ui .hover-bg-black-90:focus,.swagger-ui .hover-bg-black-90:hover{background-color:rgba(0,0,0,.9)}.swagger-ui .hover-bg-black-80:focus,.swagger-ui .hover-bg-black-80:hover{background-color:rgba(0,0,0,.8)}.swagger-ui .hover-bg-black-70:focus,.swagger-ui .hover-bg-black-70:hover{background-color:rgba(0,0,0,.7)}.swagger-ui .hover-bg-black-60:focus,.swagger-ui .hover-bg-black-60:hover{background-color:rgba(0,0,0,.6)}.swagger-ui .hover-bg-black-50:focus,.swagger-ui .hover-bg-black-50:hover{background-color:rgba(0,0,0,.5)}.swagger-ui .hover-bg-black-40:focus,.swagger-ui .hover-bg-black-40:hover{background-color:rgba(0,0,0,.4)}.swagger-ui .hover-bg-black-30:focus,.swagger-ui .hover-bg-black-30:hover{background-color:rgba(0,0,0,.3)}.swagger-ui .hover-bg-black-20:focus,.swagger-ui .hover-bg-black-20:hover{background-color:rgba(0,0,0,.2)}.swagger-ui .hover-bg-black-10:focus,.swagger-ui .hover-bg-black-10:hover{background-color:rgba(0,0,0,.1)}.swagger-ui .hover-bg-white-90:focus,.swagger-ui .hover-bg-white-90:hover{background-color:hsla(0,0%,100%,.9)}.swagger-ui .hover-bg-white-80:focus,.swagger-ui .hover-bg-white-80:hover{background-color:hsla(0,0%,100%,.8)}.swagger-ui .hover-bg-white-70:focus,.swagger-ui .hover-bg-white-70:hover{background-color:hsla(0,0%,100%,.7)}.swagger-ui .hover-bg-white-60:focus,.swagger-ui .hover-bg-white-60:hover{background-color:hsla(0,0%,100%,.6)}.swagger-ui .hover-bg-white-50:focus,.swagger-ui .hover-bg-white-50:hover{background-color:hsla(0,0%,100%,.5)}.swagger-ui .hover-bg-white-40:focus,.swagger-ui .hover-bg-white-40:hover{background-color:hsla(0,0%,100%,.4)}.swagger-ui .hover-bg-white-30:focus,.swagger-ui .hover-bg-white-30:hover{background-color:hsla(0,0%,100%,.3)}.swagger-ui .hover-bg-white-20:focus,.swagger-ui .hover-bg-white-20:hover{background-color:hsla(0,0%,100%,.2)}.swagger-ui .hover-bg-white-10:focus,.swagger-ui .hover-bg-white-10:hover{background-color:hsla(0,0%,100%,.1)}.swagger-ui .hover-dark-red:focus,.swagger-ui .hover-dark-red:hover{color:#e7040f}.swagger-ui .hover-red:focus,.swagger-ui .hover-red:hover{color:#ff4136}.swagger-ui .hover-light-red:focus,.swagger-ui .hover-light-red:hover{color:#ff725c}.swagger-ui .hover-orange:focus,.swagger-ui .hover-orange:hover{color:#ff6300}.swagger-ui .hover-gold:focus,.swagger-ui .hover-gold:hover{color:#ffb700}.swagger-ui .hover-yellow:focus,.swagger-ui .hover-yellow:hover{color:gold}.swagger-ui .hover-light-yellow:focus,.swagger-ui .hover-light-yellow:hover{color:#fbf1a9}.swagger-ui .hover-purple:focus,.swagger-ui .hover-purple:hover{color:#5e2ca5}.swagger-ui .hover-light-purple:focus,.swagger-ui .hover-light-purple:hover{color:#a463f2}.swagger-ui .hover-dark-pink:focus,.swagger-ui .hover-dark-pink:hover{color:#d5008f}.swagger-ui .hover-hot-pink:focus,.swagger-ui .hover-hot-pink:hover{color:#ff41b4}.swagger-ui .hover-pink:focus,.swagger-ui .hover-pink:hover{color:#ff80cc}.swagger-ui .hover-light-pink:focus,.swagger-ui .hover-light-pink:hover{color:#ffa3d7}.swagger-ui .hover-dark-green:focus,.swagger-ui .hover-dark-green:hover{color:#137752}.swagger-ui .hover-green:focus,.swagger-ui .hover-green:hover{color:#19a974}.swagger-ui .hover-light-green:focus,.swagger-ui .hover-light-green:hover{color:#9eebcf}.swagger-ui .hover-navy:focus,.swagger-ui .hover-navy:hover{color:#001b44}.swagger-ui .hover-dark-blue:focus,.swagger-ui .hover-dark-blue:hover{color:#00449e}.swagger-ui .hover-blue:focus,.swagger-ui .hover-blue:hover{color:#357edd}.swagger-ui .hover-light-blue:focus,.swagger-ui .hover-light-blue:hover{color:#96ccff}.swagger-ui .hover-lightest-blue:focus,.swagger-ui .hover-lightest-blue:hover{color:#cdecff}.swagger-ui .hover-washed-blue:focus,.swagger-ui .hover-washed-blue:hover{color:#f6fffe}.swagger-ui .hover-washed-green:focus,.swagger-ui .hover-washed-green:hover{color:#e8fdf5}.swagger-ui .hover-washed-yellow:focus,.swagger-ui .hover-washed-yellow:hover{color:#fffceb}.swagger-ui .hover-washed-red:focus,.swagger-ui .hover-washed-red:hover{color:#ffdfdf}.swagger-ui .hover-bg-dark-red:focus,.swagger-ui .hover-bg-dark-red:hover{background-color:#e7040f}.swagger-ui .hover-bg-red:focus,.swagger-ui .hover-bg-red:hover{background-color:#ff4136}.swagger-ui .hover-bg-light-red:focus,.swagger-ui .hover-bg-light-red:hover{background-color:#ff725c}.swagger-ui .hover-bg-orange:focus,.swagger-ui .hover-bg-orange:hover{background-color:#ff6300}.swagger-ui .hover-bg-gold:focus,.swagger-ui .hover-bg-gold:hover{background-color:#ffb700}.swagger-ui .hover-bg-yellow:focus,.swagger-ui .hover-bg-yellow:hover{background-color:gold}.swagger-ui .hover-bg-light-yellow:focus,.swagger-ui .hover-bg-light-yellow:hover{background-color:#fbf1a9}.swagger-ui .hover-bg-purple:focus,.swagger-ui .hover-bg-purple:hover{background-color:#5e2ca5}.swagger-ui .hover-bg-light-purple:focus,.swagger-ui .hover-bg-light-purple:hover{background-color:#a463f2}.swagger-ui .hover-bg-dark-pink:focus,.swagger-ui .hover-bg-dark-pink:hover{background-color:#d5008f}.swagger-ui .hover-bg-hot-pink:focus,.swagger-ui .hover-bg-hot-pink:hover{background-color:#ff41b4}.swagger-ui .hover-bg-pink:focus,.swagger-ui .hover-bg-pink:hover{background-color:#ff80cc}.swagger-ui .hover-bg-light-pink:focus,.swagger-ui .hover-bg-light-pink:hover{background-color:#ffa3d7}.swagger-ui .hover-bg-dark-green:focus,.swagger-ui .hover-bg-dark-green:hover{background-color:#137752}.swagger-ui .hover-bg-green:focus,.swagger-ui .hover-bg-green:hover{background-color:#19a974}.swagger-ui .hover-bg-light-green:focus,.swagger-ui .hover-bg-light-green:hover{background-color:#9eebcf}.swagger-ui .hover-bg-navy:focus,.swagger-ui .hover-bg-navy:hover{background-color:#001b44}.swagger-ui .hover-bg-dark-blue:focus,.swagger-ui .hover-bg-dark-blue:hover{background-color:#00449e}.swagger-ui .hover-bg-blue:focus,.swagger-ui .hover-bg-blue:hover{background-color:#357edd}.swagger-ui .hover-bg-light-blue:focus,.swagger-ui .hover-bg-light-blue:hover{background-color:#96ccff}.swagger-ui .hover-bg-lightest-blue:focus,.swagger-ui .hover-bg-lightest-blue:hover{background-color:#cdecff}.swagger-ui .hover-bg-washed-blue:focus,.swagger-ui .hover-bg-washed-blue:hover{background-color:#f6fffe}.swagger-ui .hover-bg-washed-green:focus,.swagger-ui .hover-bg-washed-green:hover{background-color:#e8fdf5}.swagger-ui .hover-bg-washed-yellow:focus,.swagger-ui .hover-bg-washed-yellow:hover{background-color:#fffceb}.swagger-ui .hover-bg-washed-red:focus,.swagger-ui .hover-bg-washed-red:hover{background-color:#ffdfdf}.swagger-ui .hover-bg-inherit:focus,.swagger-ui .hover-bg-inherit:hover{background-color:inherit}.swagger-ui .pa0{padding:0}.swagger-ui .pa1{padding:.25rem}.swagger-ui .pa2{padding:.5rem}.swagger-ui .pa3{padding:1rem}.swagger-ui .pa4{padding:2rem}.swagger-ui .pa5{padding:4rem}.swagger-ui .pa6{padding:8rem}.swagger-ui .pa7{padding:16rem}.swagger-ui .pl0{padding-left:0}.swagger-ui .pl1{padding-left:.25rem}.swagger-ui .pl2{padding-left:.5rem}.swagger-ui .pl3{padding-left:1rem}.swagger-ui .pl4{padding-left:2rem}.swagger-ui .pl5{padding-left:4rem}.swagger-ui .pl6{padding-left:8rem}.swagger-ui .pl7{padding-left:16rem}.swagger-ui .pr0{padding-right:0}.swagger-ui .pr1{padding-right:.25rem}.swagger-ui .pr2{padding-right:.5rem}.swagger-ui .pr3{padding-right:1rem}.swagger-ui .pr4{padding-right:2rem}.swagger-ui .pr5{padding-right:4rem}.swagger-ui .pr6{padding-right:8rem}.swagger-ui .pr7{padding-right:16rem}.swagger-ui .pb0{padding-bottom:0}.swagger-ui .pb1{padding-bottom:.25rem}.swagger-ui .pb2{padding-bottom:.5rem}.swagger-ui .pb3{padding-bottom:1rem}.swagger-ui .pb4{padding-bottom:2rem}.swagger-ui .pb5{padding-bottom:4rem}.swagger-ui .pb6{padding-bottom:8rem}.swagger-ui .pb7{padding-bottom:16rem}.swagger-ui .pt0{padding-top:0}.swagger-ui .pt1{padding-top:.25rem}.swagger-ui .pt2{padding-top:.5rem}.swagger-ui .pt3{padding-top:1rem}.swagger-ui .pt4{padding-top:2rem}.swagger-ui .pt5{padding-top:4rem}.swagger-ui .pt6{padding-top:8rem}.swagger-ui .pt7{padding-top:16rem}.swagger-ui .pv0{padding-bottom:0;padding-top:0}.swagger-ui .pv1{padding-bottom:.25rem;padding-top:.25rem}.swagger-ui .pv2{padding-bottom:.5rem;padding-top:.5rem}.swagger-ui .pv3{padding-bottom:1rem;padding-top:1rem}.swagger-ui .pv4{padding-bottom:2rem;padding-top:2rem}.swagger-ui .pv5{padding-bottom:4rem;padding-top:4rem}.swagger-ui .pv6{padding-bottom:8rem;padding-top:8rem}.swagger-ui .pv7{padding-bottom:16rem;padding-top:16rem}.swagger-ui .ph0{padding-left:0;padding-right:0}.swagger-ui .ph1{padding-left:.25rem;padding-right:.25rem}.swagger-ui .ph2{padding-left:.5rem;padding-right:.5rem}.swagger-ui .ph3{padding-left:1rem;padding-right:1rem}.swagger-ui .ph4{padding-left:2rem;padding-right:2rem}.swagger-ui .ph5{padding-left:4rem;padding-right:4rem}.swagger-ui .ph6{padding-left:8rem;padding-right:8rem}.swagger-ui .ph7{padding-left:16rem;padding-right:16rem}.swagger-ui .ma0{margin:0}.swagger-ui .ma1{margin:.25rem}.swagger-ui .ma2{margin:.5rem}.swagger-ui .ma3{margin:1rem}.swagger-ui .ma4{margin:2rem}.swagger-ui .ma5{margin:4rem}.swagger-ui .ma6{margin:8rem}.swagger-ui .ma7{margin:16rem}.swagger-ui .ml0{margin-left:0}.swagger-ui .ml1{margin-left:.25rem}.swagger-ui .ml2{margin-left:.5rem}.swagger-ui .ml3{margin-left:1rem}.swagger-ui .ml4{margin-left:2rem}.swagger-ui .ml5{margin-left:4rem}.swagger-ui .ml6{margin-left:8rem}.swagger-ui .ml7{margin-left:16rem}.swagger-ui .mr0{margin-right:0}.swagger-ui .mr1{margin-right:.25rem}.swagger-ui .mr2{margin-right:.5rem}.swagger-ui .mr3{margin-right:1rem}.swagger-ui .mr4{margin-right:2rem}.swagger-ui .mr5{margin-right:4rem}.swagger-ui .mr6{margin-right:8rem}.swagger-ui .mr7{margin-right:16rem}.swagger-ui .mb0{margin-bottom:0}.swagger-ui .mb1{margin-bottom:.25rem}.swagger-ui .mb2{margin-bottom:.5rem}.swagger-ui .mb3{margin-bottom:1rem}.swagger-ui .mb4{margin-bottom:2rem}.swagger-ui .mb5{margin-bottom:4rem}.swagger-ui .mb6{margin-bottom:8rem}.swagger-ui .mb7{margin-bottom:16rem}.swagger-ui .mt0{margin-top:0}.swagger-ui .mt1{margin-top:.25rem}.swagger-ui .mt2{margin-top:.5rem}.swagger-ui .mt3{margin-top:1rem}.swagger-ui .mt4{margin-top:2rem}.swagger-ui .mt5{margin-top:4rem}.swagger-ui .mt6{margin-top:8rem}.swagger-ui .mt7{margin-top:16rem}.swagger-ui .mv0{margin-bottom:0;margin-top:0}.swagger-ui .mv1{margin-bottom:.25rem;margin-top:.25rem}.swagger-ui .mv2{margin-bottom:.5rem;margin-top:.5rem}.swagger-ui .mv3{margin-bottom:1rem;margin-top:1rem}.swagger-ui .mv4{margin-bottom:2rem;margin-top:2rem}.swagger-ui .mv5{margin-bottom:4rem;margin-top:4rem}.swagger-ui .mv6{margin-bottom:8rem;margin-top:8rem}.swagger-ui .mv7{margin-bottom:16rem;margin-top:16rem}.swagger-ui .mh0{margin-left:0;margin-right:0}.swagger-ui .mh1{margin-left:.25rem;margin-right:.25rem}.swagger-ui .mh2{margin-left:.5rem;margin-right:.5rem}.swagger-ui .mh3{margin-left:1rem;margin-right:1rem}.swagger-ui .mh4{margin-left:2rem;margin-right:2rem}.swagger-ui .mh5{margin-left:4rem;margin-right:4rem}.swagger-ui .mh6{margin-left:8rem;margin-right:8rem}.swagger-ui .mh7{margin-left:16rem;margin-right:16rem}@media screen and (min-width:30em){.swagger-ui .pa0-ns{padding:0}.swagger-ui .pa1-ns{padding:.25rem}.swagger-ui .pa2-ns{padding:.5rem}.swagger-ui .pa3-ns{padding:1rem}.swagger-ui .pa4-ns{padding:2rem}.swagger-ui .pa5-ns{padding:4rem}.swagger-ui .pa6-ns{padding:8rem}.swagger-ui .pa7-ns{padding:16rem}.swagger-ui .pl0-ns{padding-left:0}.swagger-ui .pl1-ns{padding-left:.25rem}.swagger-ui .pl2-ns{padding-left:.5rem}.swagger-ui .pl3-ns{padding-left:1rem}.swagger-ui .pl4-ns{padding-left:2rem}.swagger-ui .pl5-ns{padding-left:4rem}.swagger-ui .pl6-ns{padding-left:8rem}.swagger-ui .pl7-ns{padding-left:16rem}.swagger-ui .pr0-ns{padding-right:0}.swagger-ui .pr1-ns{padding-right:.25rem}.swagger-ui .pr2-ns{padding-right:.5rem}.swagger-ui .pr3-ns{padding-right:1rem}.swagger-ui .pr4-ns{padding-right:2rem}.swagger-ui .pr5-ns{padding-right:4rem}.swagger-ui .pr6-ns{padding-right:8rem}.swagger-ui .pr7-ns{padding-right:16rem}.swagger-ui .pb0-ns{padding-bottom:0}.swagger-ui .pb1-ns{padding-bottom:.25rem}.swagger-ui .pb2-ns{padding-bottom:.5rem}.swagger-ui .pb3-ns{padding-bottom:1rem}.swagger-ui .pb4-ns{padding-bottom:2rem}.swagger-ui .pb5-ns{padding-bottom:4rem}.swagger-ui .pb6-ns{padding-bottom:8rem}.swagger-ui .pb7-ns{padding-bottom:16rem}.swagger-ui .pt0-ns{padding-top:0}.swagger-ui .pt1-ns{padding-top:.25rem}.swagger-ui .pt2-ns{padding-top:.5rem}.swagger-ui .pt3-ns{padding-top:1rem}.swagger-ui .pt4-ns{padding-top:2rem}.swagger-ui .pt5-ns{padding-top:4rem}.swagger-ui .pt6-ns{padding-top:8rem}.swagger-ui .pt7-ns{padding-top:16rem}.swagger-ui .pv0-ns{padding-bottom:0;padding-top:0}.swagger-ui .pv1-ns{padding-bottom:.25rem;padding-top:.25rem}.swagger-ui .pv2-ns{padding-bottom:.5rem;padding-top:.5rem}.swagger-ui .pv3-ns{padding-bottom:1rem;padding-top:1rem}.swagger-ui .pv4-ns{padding-bottom:2rem;padding-top:2rem}.swagger-ui .pv5-ns{padding-bottom:4rem;padding-top:4rem}.swagger-ui .pv6-ns{padding-bottom:8rem;padding-top:8rem}.swagger-ui .pv7-ns{padding-bottom:16rem;padding-top:16rem}.swagger-ui .ph0-ns{padding-left:0;padding-right:0}.swagger-ui .ph1-ns{padding-left:.25rem;padding-right:.25rem}.swagger-ui .ph2-ns{padding-left:.5rem;padding-right:.5rem}.swagger-ui .ph3-ns{padding-left:1rem;padding-right:1rem}.swagger-ui .ph4-ns{padding-left:2rem;padding-right:2rem}.swagger-ui .ph5-ns{padding-left:4rem;padding-right:4rem}.swagger-ui .ph6-ns{padding-left:8rem;padding-right:8rem}.swagger-ui .ph7-ns{padding-left:16rem;padding-right:16rem}.swagger-ui .ma0-ns{margin:0}.swagger-ui .ma1-ns{margin:.25rem}.swagger-ui .ma2-ns{margin:.5rem}.swagger-ui .ma3-ns{margin:1rem}.swagger-ui .ma4-ns{margin:2rem}.swagger-ui .ma5-ns{margin:4rem}.swagger-ui .ma6-ns{margin:8rem}.swagger-ui .ma7-ns{margin:16rem}.swagger-ui .ml0-ns{margin-left:0}.swagger-ui .ml1-ns{margin-left:.25rem}.swagger-ui .ml2-ns{margin-left:.5rem}.swagger-ui .ml3-ns{margin-left:1rem}.swagger-ui .ml4-ns{margin-left:2rem}.swagger-ui .ml5-ns{margin-left:4rem}.swagger-ui .ml6-ns{margin-left:8rem}.swagger-ui .ml7-ns{margin-left:16rem}.swagger-ui .mr0-ns{margin-right:0}.swagger-ui .mr1-ns{margin-right:.25rem}.swagger-ui .mr2-ns{margin-right:.5rem}.swagger-ui .mr3-ns{margin-right:1rem}.swagger-ui .mr4-ns{margin-right:2rem}.swagger-ui .mr5-ns{margin-right:4rem}.swagger-ui .mr6-ns{margin-right:8rem}.swagger-ui .mr7-ns{margin-right:16rem}.swagger-ui .mb0-ns{margin-bottom:0}.swagger-ui .mb1-ns{margin-bottom:.25rem}.swagger-ui .mb2-ns{margin-bottom:.5rem}.swagger-ui .mb3-ns{margin-bottom:1rem}.swagger-ui .mb4-ns{margin-bottom:2rem}.swagger-ui .mb5-ns{margin-bottom:4rem}.swagger-ui .mb6-ns{margin-bottom:8rem}.swagger-ui .mb7-ns{margin-bottom:16rem}.swagger-ui .mt0-ns{margin-top:0}.swagger-ui .mt1-ns{margin-top:.25rem}.swagger-ui .mt2-ns{margin-top:.5rem}.swagger-ui .mt3-ns{margin-top:1rem}.swagger-ui .mt4-ns{margin-top:2rem}.swagger-ui .mt5-ns{margin-top:4rem}.swagger-ui .mt6-ns{margin-top:8rem}.swagger-ui .mt7-ns{margin-top:16rem}.swagger-ui .mv0-ns{margin-bottom:0;margin-top:0}.swagger-ui .mv1-ns{margin-bottom:.25rem;margin-top:.25rem}.swagger-ui .mv2-ns{margin-bottom:.5rem;margin-top:.5rem}.swagger-ui .mv3-ns{margin-bottom:1rem;margin-top:1rem}.swagger-ui .mv4-ns{margin-bottom:2rem;margin-top:2rem}.swagger-ui .mv5-ns{margin-bottom:4rem;margin-top:4rem}.swagger-ui .mv6-ns{margin-bottom:8rem;margin-top:8rem}.swagger-ui .mv7-ns{margin-bottom:16rem;margin-top:16rem}.swagger-ui .mh0-ns{margin-left:0;margin-right:0}.swagger-ui .mh1-ns{margin-left:.25rem;margin-right:.25rem}.swagger-ui .mh2-ns{margin-left:.5rem;margin-right:.5rem}.swagger-ui .mh3-ns{margin-left:1rem;margin-right:1rem}.swagger-ui .mh4-ns{margin-left:2rem;margin-right:2rem}.swagger-ui .mh5-ns{margin-left:4rem;margin-right:4rem}.swagger-ui .mh6-ns{margin-left:8rem;margin-right:8rem}.swagger-ui .mh7-ns{margin-left:16rem;margin-right:16rem}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .pa0-m{padding:0}.swagger-ui .pa1-m{padding:.25rem}.swagger-ui .pa2-m{padding:.5rem}.swagger-ui .pa3-m{padding:1rem}.swagger-ui .pa4-m{padding:2rem}.swagger-ui .pa5-m{padding:4rem}.swagger-ui .pa6-m{padding:8rem}.swagger-ui .pa7-m{padding:16rem}.swagger-ui .pl0-m{padding-left:0}.swagger-ui .pl1-m{padding-left:.25rem}.swagger-ui .pl2-m{padding-left:.5rem}.swagger-ui .pl3-m{padding-left:1rem}.swagger-ui .pl4-m{padding-left:2rem}.swagger-ui .pl5-m{padding-left:4rem}.swagger-ui .pl6-m{padding-left:8rem}.swagger-ui .pl7-m{padding-left:16rem}.swagger-ui .pr0-m{padding-right:0}.swagger-ui .pr1-m{padding-right:.25rem}.swagger-ui .pr2-m{padding-right:.5rem}.swagger-ui .pr3-m{padding-right:1rem}.swagger-ui .pr4-m{padding-right:2rem}.swagger-ui .pr5-m{padding-right:4rem}.swagger-ui .pr6-m{padding-right:8rem}.swagger-ui .pr7-m{padding-right:16rem}.swagger-ui .pb0-m{padding-bottom:0}.swagger-ui .pb1-m{padding-bottom:.25rem}.swagger-ui .pb2-m{padding-bottom:.5rem}.swagger-ui .pb3-m{padding-bottom:1rem}.swagger-ui .pb4-m{padding-bottom:2rem}.swagger-ui .pb5-m{padding-bottom:4rem}.swagger-ui .pb6-m{padding-bottom:8rem}.swagger-ui .pb7-m{padding-bottom:16rem}.swagger-ui .pt0-m{padding-top:0}.swagger-ui .pt1-m{padding-top:.25rem}.swagger-ui .pt2-m{padding-top:.5rem}.swagger-ui .pt3-m{padding-top:1rem}.swagger-ui .pt4-m{padding-top:2rem}.swagger-ui .pt5-m{padding-top:4rem}.swagger-ui .pt6-m{padding-top:8rem}.swagger-ui .pt7-m{padding-top:16rem}.swagger-ui .pv0-m{padding-bottom:0;padding-top:0}.swagger-ui .pv1-m{padding-bottom:.25rem;padding-top:.25rem}.swagger-ui .pv2-m{padding-bottom:.5rem;padding-top:.5rem}.swagger-ui .pv3-m{padding-bottom:1rem;padding-top:1rem}.swagger-ui .pv4-m{padding-bottom:2rem;padding-top:2rem}.swagger-ui .pv5-m{padding-bottom:4rem;padding-top:4rem}.swagger-ui .pv6-m{padding-bottom:8rem;padding-top:8rem}.swagger-ui .pv7-m{padding-bottom:16rem;padding-top:16rem}.swagger-ui .ph0-m{padding-left:0;padding-right:0}.swagger-ui .ph1-m{padding-left:.25rem;padding-right:.25rem}.swagger-ui .ph2-m{padding-left:.5rem;padding-right:.5rem}.swagger-ui .ph3-m{padding-left:1rem;padding-right:1rem}.swagger-ui .ph4-m{padding-left:2rem;padding-right:2rem}.swagger-ui .ph5-m{padding-left:4rem;padding-right:4rem}.swagger-ui .ph6-m{padding-left:8rem;padding-right:8rem}.swagger-ui .ph7-m{padding-left:16rem;padding-right:16rem}.swagger-ui .ma0-m{margin:0}.swagger-ui .ma1-m{margin:.25rem}.swagger-ui .ma2-m{margin:.5rem}.swagger-ui .ma3-m{margin:1rem}.swagger-ui .ma4-m{margin:2rem}.swagger-ui .ma5-m{margin:4rem}.swagger-ui .ma6-m{margin:8rem}.swagger-ui .ma7-m{margin:16rem}.swagger-ui .ml0-m{margin-left:0}.swagger-ui .ml1-m{margin-left:.25rem}.swagger-ui .ml2-m{margin-left:.5rem}.swagger-ui .ml3-m{margin-left:1rem}.swagger-ui .ml4-m{margin-left:2rem}.swagger-ui .ml5-m{margin-left:4rem}.swagger-ui .ml6-m{margin-left:8rem}.swagger-ui .ml7-m{margin-left:16rem}.swagger-ui .mr0-m{margin-right:0}.swagger-ui .mr1-m{margin-right:.25rem}.swagger-ui .mr2-m{margin-right:.5rem}.swagger-ui .mr3-m{margin-right:1rem}.swagger-ui .mr4-m{margin-right:2rem}.swagger-ui .mr5-m{margin-right:4rem}.swagger-ui .mr6-m{margin-right:8rem}.swagger-ui .mr7-m{margin-right:16rem}.swagger-ui .mb0-m{margin-bottom:0}.swagger-ui .mb1-m{margin-bottom:.25rem}.swagger-ui .mb2-m{margin-bottom:.5rem}.swagger-ui .mb3-m{margin-bottom:1rem}.swagger-ui .mb4-m{margin-bottom:2rem}.swagger-ui .mb5-m{margin-bottom:4rem}.swagger-ui .mb6-m{margin-bottom:8rem}.swagger-ui .mb7-m{margin-bottom:16rem}.swagger-ui .mt0-m{margin-top:0}.swagger-ui .mt1-m{margin-top:.25rem}.swagger-ui .mt2-m{margin-top:.5rem}.swagger-ui .mt3-m{margin-top:1rem}.swagger-ui .mt4-m{margin-top:2rem}.swagger-ui .mt5-m{margin-top:4rem}.swagger-ui .mt6-m{margin-top:8rem}.swagger-ui .mt7-m{margin-top:16rem}.swagger-ui .mv0-m{margin-bottom:0;margin-top:0}.swagger-ui .mv1-m{margin-bottom:.25rem;margin-top:.25rem}.swagger-ui .mv2-m{margin-bottom:.5rem;margin-top:.5rem}.swagger-ui .mv3-m{margin-bottom:1rem;margin-top:1rem}.swagger-ui .mv4-m{margin-bottom:2rem;margin-top:2rem}.swagger-ui .mv5-m{margin-bottom:4rem;margin-top:4rem}.swagger-ui .mv6-m{margin-bottom:8rem;margin-top:8rem}.swagger-ui .mv7-m{margin-bottom:16rem;margin-top:16rem}.swagger-ui .mh0-m{margin-left:0;margin-right:0}.swagger-ui .mh1-m{margin-left:.25rem;margin-right:.25rem}.swagger-ui .mh2-m{margin-left:.5rem;margin-right:.5rem}.swagger-ui .mh3-m{margin-left:1rem;margin-right:1rem}.swagger-ui .mh4-m{margin-left:2rem;margin-right:2rem}.swagger-ui .mh5-m{margin-left:4rem;margin-right:4rem}.swagger-ui .mh6-m{margin-left:8rem;margin-right:8rem}.swagger-ui .mh7-m{margin-left:16rem;margin-right:16rem}}@media screen and (min-width:60em){.swagger-ui .pa0-l{padding:0}.swagger-ui .pa1-l{padding:.25rem}.swagger-ui .pa2-l{padding:.5rem}.swagger-ui .pa3-l{padding:1rem}.swagger-ui .pa4-l{padding:2rem}.swagger-ui .pa5-l{padding:4rem}.swagger-ui .pa6-l{padding:8rem}.swagger-ui .pa7-l{padding:16rem}.swagger-ui .pl0-l{padding-left:0}.swagger-ui .pl1-l{padding-left:.25rem}.swagger-ui .pl2-l{padding-left:.5rem}.swagger-ui .pl3-l{padding-left:1rem}.swagger-ui .pl4-l{padding-left:2rem}.swagger-ui .pl5-l{padding-left:4rem}.swagger-ui .pl6-l{padding-left:8rem}.swagger-ui .pl7-l{padding-left:16rem}.swagger-ui .pr0-l{padding-right:0}.swagger-ui .pr1-l{padding-right:.25rem}.swagger-ui .pr2-l{padding-right:.5rem}.swagger-ui .pr3-l{padding-right:1rem}.swagger-ui .pr4-l{padding-right:2rem}.swagger-ui .pr5-l{padding-right:4rem}.swagger-ui .pr6-l{padding-right:8rem}.swagger-ui .pr7-l{padding-right:16rem}.swagger-ui .pb0-l{padding-bottom:0}.swagger-ui .pb1-l{padding-bottom:.25rem}.swagger-ui .pb2-l{padding-bottom:.5rem}.swagger-ui .pb3-l{padding-bottom:1rem}.swagger-ui .pb4-l{padding-bottom:2rem}.swagger-ui .pb5-l{padding-bottom:4rem}.swagger-ui .pb6-l{padding-bottom:8rem}.swagger-ui .pb7-l{padding-bottom:16rem}.swagger-ui .pt0-l{padding-top:0}.swagger-ui .pt1-l{padding-top:.25rem}.swagger-ui .pt2-l{padding-top:.5rem}.swagger-ui .pt3-l{padding-top:1rem}.swagger-ui .pt4-l{padding-top:2rem}.swagger-ui .pt5-l{padding-top:4rem}.swagger-ui .pt6-l{padding-top:8rem}.swagger-ui .pt7-l{padding-top:16rem}.swagger-ui .pv0-l{padding-bottom:0;padding-top:0}.swagger-ui .pv1-l{padding-bottom:.25rem;padding-top:.25rem}.swagger-ui .pv2-l{padding-bottom:.5rem;padding-top:.5rem}.swagger-ui .pv3-l{padding-bottom:1rem;padding-top:1rem}.swagger-ui .pv4-l{padding-bottom:2rem;padding-top:2rem}.swagger-ui .pv5-l{padding-bottom:4rem;padding-top:4rem}.swagger-ui .pv6-l{padding-bottom:8rem;padding-top:8rem}.swagger-ui .pv7-l{padding-bottom:16rem;padding-top:16rem}.swagger-ui .ph0-l{padding-left:0;padding-right:0}.swagger-ui .ph1-l{padding-left:.25rem;padding-right:.25rem}.swagger-ui .ph2-l{padding-left:.5rem;padding-right:.5rem}.swagger-ui .ph3-l{padding-left:1rem;padding-right:1rem}.swagger-ui .ph4-l{padding-left:2rem;padding-right:2rem}.swagger-ui .ph5-l{padding-left:4rem;padding-right:4rem}.swagger-ui .ph6-l{padding-left:8rem;padding-right:8rem}.swagger-ui .ph7-l{padding-left:16rem;padding-right:16rem}.swagger-ui .ma0-l{margin:0}.swagger-ui .ma1-l{margin:.25rem}.swagger-ui .ma2-l{margin:.5rem}.swagger-ui .ma3-l{margin:1rem}.swagger-ui .ma4-l{margin:2rem}.swagger-ui .ma5-l{margin:4rem}.swagger-ui .ma6-l{margin:8rem}.swagger-ui .ma7-l{margin:16rem}.swagger-ui .ml0-l{margin-left:0}.swagger-ui .ml1-l{margin-left:.25rem}.swagger-ui .ml2-l{margin-left:.5rem}.swagger-ui .ml3-l{margin-left:1rem}.swagger-ui .ml4-l{margin-left:2rem}.swagger-ui .ml5-l{margin-left:4rem}.swagger-ui .ml6-l{margin-left:8rem}.swagger-ui .ml7-l{margin-left:16rem}.swagger-ui .mr0-l{margin-right:0}.swagger-ui .mr1-l{margin-right:.25rem}.swagger-ui .mr2-l{margin-right:.5rem}.swagger-ui .mr3-l{margin-right:1rem}.swagger-ui .mr4-l{margin-right:2rem}.swagger-ui .mr5-l{margin-right:4rem}.swagger-ui .mr6-l{margin-right:8rem}.swagger-ui .mr7-l{margin-right:16rem}.swagger-ui .mb0-l{margin-bottom:0}.swagger-ui .mb1-l{margin-bottom:.25rem}.swagger-ui .mb2-l{margin-bottom:.5rem}.swagger-ui .mb3-l{margin-bottom:1rem}.swagger-ui .mb4-l{margin-bottom:2rem}.swagger-ui .mb5-l{margin-bottom:4rem}.swagger-ui .mb6-l{margin-bottom:8rem}.swagger-ui .mb7-l{margin-bottom:16rem}.swagger-ui .mt0-l{margin-top:0}.swagger-ui .mt1-l{margin-top:.25rem}.swagger-ui .mt2-l{margin-top:.5rem}.swagger-ui .mt3-l{margin-top:1rem}.swagger-ui .mt4-l{margin-top:2rem}.swagger-ui .mt5-l{margin-top:4rem}.swagger-ui .mt6-l{margin-top:8rem}.swagger-ui .mt7-l{margin-top:16rem}.swagger-ui .mv0-l{margin-bottom:0;margin-top:0}.swagger-ui .mv1-l{margin-bottom:.25rem;margin-top:.25rem}.swagger-ui .mv2-l{margin-bottom:.5rem;margin-top:.5rem}.swagger-ui .mv3-l{margin-bottom:1rem;margin-top:1rem}.swagger-ui .mv4-l{margin-bottom:2rem;margin-top:2rem}.swagger-ui .mv5-l{margin-bottom:4rem;margin-top:4rem}.swagger-ui .mv6-l{margin-bottom:8rem;margin-top:8rem}.swagger-ui .mv7-l{margin-bottom:16rem;margin-top:16rem}.swagger-ui .mh0-l{margin-left:0;margin-right:0}.swagger-ui .mh1-l{margin-left:.25rem;margin-right:.25rem}.swagger-ui .mh2-l{margin-left:.5rem;margin-right:.5rem}.swagger-ui .mh3-l{margin-left:1rem;margin-right:1rem}.swagger-ui .mh4-l{margin-left:2rem;margin-right:2rem}.swagger-ui .mh5-l{margin-left:4rem;margin-right:4rem}.swagger-ui .mh6-l{margin-left:8rem;margin-right:8rem}.swagger-ui .mh7-l{margin-left:16rem;margin-right:16rem}}.swagger-ui .na1{margin:-.25rem}.swagger-ui .na2{margin:-.5rem}.swagger-ui .na3{margin:-1rem}.swagger-ui .na4{margin:-2rem}.swagger-ui .na5{margin:-4rem}.swagger-ui .na6{margin:-8rem}.swagger-ui .na7{margin:-16rem}.swagger-ui .nl1{margin-left:-.25rem}.swagger-ui .nl2{margin-left:-.5rem}.swagger-ui .nl3{margin-left:-1rem}.swagger-ui .nl4{margin-left:-2rem}.swagger-ui .nl5{margin-left:-4rem}.swagger-ui .nl6{margin-left:-8rem}.swagger-ui .nl7{margin-left:-16rem}.swagger-ui .nr1{margin-right:-.25rem}.swagger-ui .nr2{margin-right:-.5rem}.swagger-ui .nr3{margin-right:-1rem}.swagger-ui .nr4{margin-right:-2rem}.swagger-ui .nr5{margin-right:-4rem}.swagger-ui .nr6{margin-right:-8rem}.swagger-ui .nr7{margin-right:-16rem}.swagger-ui .nb1{margin-bottom:-.25rem}.swagger-ui .nb2{margin-bottom:-.5rem}.swagger-ui .nb3{margin-bottom:-1rem}.swagger-ui .nb4{margin-bottom:-2rem}.swagger-ui .nb5{margin-bottom:-4rem}.swagger-ui .nb6{margin-bottom:-8rem}.swagger-ui .nb7{margin-bottom:-16rem}.swagger-ui .nt1{margin-top:-.25rem}.swagger-ui .nt2{margin-top:-.5rem}.swagger-ui .nt3{margin-top:-1rem}.swagger-ui .nt4{margin-top:-2rem}.swagger-ui .nt5{margin-top:-4rem}.swagger-ui .nt6{margin-top:-8rem}.swagger-ui .nt7{margin-top:-16rem}@media screen and (min-width:30em){.swagger-ui .na1-ns{margin:-.25rem}.swagger-ui .na2-ns{margin:-.5rem}.swagger-ui .na3-ns{margin:-1rem}.swagger-ui .na4-ns{margin:-2rem}.swagger-ui .na5-ns{margin:-4rem}.swagger-ui .na6-ns{margin:-8rem}.swagger-ui .na7-ns{margin:-16rem}.swagger-ui .nl1-ns{margin-left:-.25rem}.swagger-ui .nl2-ns{margin-left:-.5rem}.swagger-ui .nl3-ns{margin-left:-1rem}.swagger-ui .nl4-ns{margin-left:-2rem}.swagger-ui .nl5-ns{margin-left:-4rem}.swagger-ui .nl6-ns{margin-left:-8rem}.swagger-ui .nl7-ns{margin-left:-16rem}.swagger-ui .nr1-ns{margin-right:-.25rem}.swagger-ui .nr2-ns{margin-right:-.5rem}.swagger-ui .nr3-ns{margin-right:-1rem}.swagger-ui .nr4-ns{margin-right:-2rem}.swagger-ui .nr5-ns{margin-right:-4rem}.swagger-ui .nr6-ns{margin-right:-8rem}.swagger-ui .nr7-ns{margin-right:-16rem}.swagger-ui .nb1-ns{margin-bottom:-.25rem}.swagger-ui .nb2-ns{margin-bottom:-.5rem}.swagger-ui .nb3-ns{margin-bottom:-1rem}.swagger-ui .nb4-ns{margin-bottom:-2rem}.swagger-ui .nb5-ns{margin-bottom:-4rem}.swagger-ui .nb6-ns{margin-bottom:-8rem}.swagger-ui .nb7-ns{margin-bottom:-16rem}.swagger-ui .nt1-ns{margin-top:-.25rem}.swagger-ui .nt2-ns{margin-top:-.5rem}.swagger-ui .nt3-ns{margin-top:-1rem}.swagger-ui .nt4-ns{margin-top:-2rem}.swagger-ui .nt5-ns{margin-top:-4rem}.swagger-ui .nt6-ns{margin-top:-8rem}.swagger-ui .nt7-ns{margin-top:-16rem}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .na1-m{margin:-.25rem}.swagger-ui .na2-m{margin:-.5rem}.swagger-ui .na3-m{margin:-1rem}.swagger-ui .na4-m{margin:-2rem}.swagger-ui .na5-m{margin:-4rem}.swagger-ui .na6-m{margin:-8rem}.swagger-ui .na7-m{margin:-16rem}.swagger-ui .nl1-m{margin-left:-.25rem}.swagger-ui .nl2-m{margin-left:-.5rem}.swagger-ui .nl3-m{margin-left:-1rem}.swagger-ui .nl4-m{margin-left:-2rem}.swagger-ui .nl5-m{margin-left:-4rem}.swagger-ui .nl6-m{margin-left:-8rem}.swagger-ui .nl7-m{margin-left:-16rem}.swagger-ui .nr1-m{margin-right:-.25rem}.swagger-ui .nr2-m{margin-right:-.5rem}.swagger-ui .nr3-m{margin-right:-1rem}.swagger-ui .nr4-m{margin-right:-2rem}.swagger-ui .nr5-m{margin-right:-4rem}.swagger-ui .nr6-m{margin-right:-8rem}.swagger-ui .nr7-m{margin-right:-16rem}.swagger-ui .nb1-m{margin-bottom:-.25rem}.swagger-ui .nb2-m{margin-bottom:-.5rem}.swagger-ui .nb3-m{margin-bottom:-1rem}.swagger-ui .nb4-m{margin-bottom:-2rem}.swagger-ui .nb5-m{margin-bottom:-4rem}.swagger-ui .nb6-m{margin-bottom:-8rem}.swagger-ui .nb7-m{margin-bottom:-16rem}.swagger-ui .nt1-m{margin-top:-.25rem}.swagger-ui .nt2-m{margin-top:-.5rem}.swagger-ui .nt3-m{margin-top:-1rem}.swagger-ui .nt4-m{margin-top:-2rem}.swagger-ui .nt5-m{margin-top:-4rem}.swagger-ui .nt6-m{margin-top:-8rem}.swagger-ui .nt7-m{margin-top:-16rem}}@media screen and (min-width:60em){.swagger-ui .na1-l{margin:-.25rem}.swagger-ui .na2-l{margin:-.5rem}.swagger-ui .na3-l{margin:-1rem}.swagger-ui .na4-l{margin:-2rem}.swagger-ui .na5-l{margin:-4rem}.swagger-ui .na6-l{margin:-8rem}.swagger-ui .na7-l{margin:-16rem}.swagger-ui .nl1-l{margin-left:-.25rem}.swagger-ui .nl2-l{margin-left:-.5rem}.swagger-ui .nl3-l{margin-left:-1rem}.swagger-ui .nl4-l{margin-left:-2rem}.swagger-ui .nl5-l{margin-left:-4rem}.swagger-ui .nl6-l{margin-left:-8rem}.swagger-ui .nl7-l{margin-left:-16rem}.swagger-ui .nr1-l{margin-right:-.25rem}.swagger-ui .nr2-l{margin-right:-.5rem}.swagger-ui .nr3-l{margin-right:-1rem}.swagger-ui .nr4-l{margin-right:-2rem}.swagger-ui .nr5-l{margin-right:-4rem}.swagger-ui .nr6-l{margin-right:-8rem}.swagger-ui .nr7-l{margin-right:-16rem}.swagger-ui .nb1-l{margin-bottom:-.25rem}.swagger-ui .nb2-l{margin-bottom:-.5rem}.swagger-ui .nb3-l{margin-bottom:-1rem}.swagger-ui .nb4-l{margin-bottom:-2rem}.swagger-ui .nb5-l{margin-bottom:-4rem}.swagger-ui .nb6-l{margin-bottom:-8rem}.swagger-ui .nb7-l{margin-bottom:-16rem}.swagger-ui .nt1-l{margin-top:-.25rem}.swagger-ui .nt2-l{margin-top:-.5rem}.swagger-ui .nt3-l{margin-top:-1rem}.swagger-ui .nt4-l{margin-top:-2rem}.swagger-ui .nt5-l{margin-top:-4rem}.swagger-ui .nt6-l{margin-top:-8rem}.swagger-ui .nt7-l{margin-top:-16rem}}.swagger-ui .collapse{border-collapse:collapse;border-spacing:0}.swagger-ui .striped--light-silver:nth-child(odd){background-color:#aaa}.swagger-ui .striped--moon-gray:nth-child(odd){background-color:#ccc}.swagger-ui .striped--light-gray:nth-child(odd){background-color:#eee}.swagger-ui .striped--near-white:nth-child(odd){background-color:#f4f4f4}.swagger-ui .stripe-light:nth-child(odd){background-color:hsla(0,0%,100%,.1)}.swagger-ui .stripe-dark:nth-child(odd){background-color:rgba(0,0,0,.1)}.swagger-ui .strike{text-decoration:line-through}.swagger-ui .underline{text-decoration:underline}.swagger-ui .no-underline{text-decoration:none}@media screen and (min-width:30em){.swagger-ui .strike-ns{text-decoration:line-through}.swagger-ui .underline-ns{text-decoration:underline}.swagger-ui .no-underline-ns{text-decoration:none}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .strike-m{text-decoration:line-through}.swagger-ui .underline-m{text-decoration:underline}.swagger-ui .no-underline-m{text-decoration:none}}@media screen and (min-width:60em){.swagger-ui .strike-l{text-decoration:line-through}.swagger-ui .underline-l{text-decoration:underline}.swagger-ui .no-underline-l{text-decoration:none}}.swagger-ui .tl{text-align:left}.swagger-ui .tr{text-align:right}.swagger-ui .tc{text-align:center}.swagger-ui .tj{text-align:justify}@media screen and (min-width:30em){.swagger-ui .tl-ns{text-align:left}.swagger-ui .tr-ns{text-align:right}.swagger-ui .tc-ns{text-align:center}.swagger-ui .tj-ns{text-align:justify}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .tl-m{text-align:left}.swagger-ui .tr-m{text-align:right}.swagger-ui .tc-m{text-align:center}.swagger-ui .tj-m{text-align:justify}}@media screen and (min-width:60em){.swagger-ui .tl-l{text-align:left}.swagger-ui .tr-l{text-align:right}.swagger-ui .tc-l{text-align:center}.swagger-ui .tj-l{text-align:justify}}.swagger-ui .ttc{text-transform:capitalize}.swagger-ui .ttl{text-transform:lowercase}.swagger-ui .ttu{text-transform:uppercase}.swagger-ui .ttn{text-transform:none}@media screen and (min-width:30em){.swagger-ui .ttc-ns{text-transform:capitalize}.swagger-ui .ttl-ns{text-transform:lowercase}.swagger-ui .ttu-ns{text-transform:uppercase}.swagger-ui .ttn-ns{text-transform:none}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .ttc-m{text-transform:capitalize}.swagger-ui .ttl-m{text-transform:lowercase}.swagger-ui .ttu-m{text-transform:uppercase}.swagger-ui .ttn-m{text-transform:none}}@media screen and (min-width:60em){.swagger-ui .ttc-l{text-transform:capitalize}.swagger-ui .ttl-l{text-transform:lowercase}.swagger-ui .ttu-l{text-transform:uppercase}.swagger-ui .ttn-l{text-transform:none}}.swagger-ui .f-6,.swagger-ui .f-headline{font-size:6rem}.swagger-ui .f-5,.swagger-ui .f-subheadline{font-size:5rem}.swagger-ui .f1{font-size:3rem}.swagger-ui .f2{font-size:2.25rem}.swagger-ui .f3{font-size:1.5rem}.swagger-ui .f4{font-size:1.25rem}.swagger-ui .f5{font-size:1rem}.swagger-ui .f6{font-size:.875rem}.swagger-ui .f7{font-size:.75rem}@media screen and (min-width:30em){.swagger-ui .f-6-ns,.swagger-ui .f-headline-ns{font-size:6rem}.swagger-ui .f-5-ns,.swagger-ui .f-subheadline-ns{font-size:5rem}.swagger-ui .f1-ns{font-size:3rem}.swagger-ui .f2-ns{font-size:2.25rem}.swagger-ui .f3-ns{font-size:1.5rem}.swagger-ui .f4-ns{font-size:1.25rem}.swagger-ui .f5-ns{font-size:1rem}.swagger-ui .f6-ns{font-size:.875rem}.swagger-ui .f7-ns{font-size:.75rem}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .f-6-m,.swagger-ui .f-headline-m{font-size:6rem}.swagger-ui .f-5-m,.swagger-ui .f-subheadline-m{font-size:5rem}.swagger-ui .f1-m{font-size:3rem}.swagger-ui .f2-m{font-size:2.25rem}.swagger-ui .f3-m{font-size:1.5rem}.swagger-ui .f4-m{font-size:1.25rem}.swagger-ui .f5-m{font-size:1rem}.swagger-ui .f6-m{font-size:.875rem}.swagger-ui .f7-m{font-size:.75rem}}@media screen and (min-width:60em){.swagger-ui .f-6-l,.swagger-ui .f-headline-l{font-size:6rem}.swagger-ui .f-5-l,.swagger-ui .f-subheadline-l{font-size:5rem}.swagger-ui .f1-l{font-size:3rem}.swagger-ui .f2-l{font-size:2.25rem}.swagger-ui .f3-l{font-size:1.5rem}.swagger-ui .f4-l{font-size:1.25rem}.swagger-ui .f5-l{font-size:1rem}.swagger-ui .f6-l{font-size:.875rem}.swagger-ui .f7-l{font-size:.75rem}}.swagger-ui .measure{max-width:30em}.swagger-ui .measure-wide{max-width:34em}.swagger-ui .measure-narrow{max-width:20em}.swagger-ui .indent{margin-bottom:0;margin-top:0;text-indent:1em}.swagger-ui .small-caps{font-feature-settings:"smcp";font-variant:small-caps}.swagger-ui .truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}@media screen and (min-width:30em){.swagger-ui .measure-ns{max-width:30em}.swagger-ui .measure-wide-ns{max-width:34em}.swagger-ui .measure-narrow-ns{max-width:20em}.swagger-ui .indent-ns{margin-bottom:0;margin-top:0;text-indent:1em}.swagger-ui .small-caps-ns{font-feature-settings:"smcp";font-variant:small-caps}.swagger-ui .truncate-ns{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .measure-m{max-width:30em}.swagger-ui .measure-wide-m{max-width:34em}.swagger-ui .measure-narrow-m{max-width:20em}.swagger-ui .indent-m{margin-bottom:0;margin-top:0;text-indent:1em}.swagger-ui .small-caps-m{font-feature-settings:"smcp";font-variant:small-caps}.swagger-ui .truncate-m{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}}@media screen and (min-width:60em){.swagger-ui .measure-l{max-width:30em}.swagger-ui .measure-wide-l{max-width:34em}.swagger-ui .measure-narrow-l{max-width:20em}.swagger-ui .indent-l{margin-bottom:0;margin-top:0;text-indent:1em}.swagger-ui .small-caps-l{font-feature-settings:"smcp";font-variant:small-caps}.swagger-ui .truncate-l{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}}.swagger-ui .overflow-container{overflow-y:scroll}.swagger-ui .center{margin-left:auto;margin-right:auto}.swagger-ui .mr-auto{margin-right:auto}.swagger-ui .ml-auto{margin-left:auto}@media screen and (min-width:30em){.swagger-ui .center-ns{margin-left:auto;margin-right:auto}.swagger-ui .mr-auto-ns{margin-right:auto}.swagger-ui .ml-auto-ns{margin-left:auto}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .center-m{margin-left:auto;margin-right:auto}.swagger-ui .mr-auto-m{margin-right:auto}.swagger-ui .ml-auto-m{margin-left:auto}}@media screen and (min-width:60em){.swagger-ui .center-l{margin-left:auto;margin-right:auto}.swagger-ui .mr-auto-l{margin-right:auto}.swagger-ui .ml-auto-l{margin-left:auto}}.swagger-ui .clip{clip:rect(1px 1px 1px 1px);clip:rect(1px,1px,1px,1px);position:fixed!important;_position:absolute!important}@media screen and (min-width:30em){.swagger-ui .clip-ns{clip:rect(1px 1px 1px 1px);clip:rect(1px,1px,1px,1px);position:fixed!important;_position:absolute!important}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .clip-m{clip:rect(1px 1px 1px 1px);clip:rect(1px,1px,1px,1px);position:fixed!important;_position:absolute!important}}@media screen and (min-width:60em){.swagger-ui .clip-l{clip:rect(1px 1px 1px 1px);clip:rect(1px,1px,1px,1px);position:fixed!important;_position:absolute!important}}.swagger-ui .ws-normal{white-space:normal}.swagger-ui .nowrap{white-space:nowrap}.swagger-ui .pre{white-space:pre}@media screen and (min-width:30em){.swagger-ui .ws-normal-ns{white-space:normal}.swagger-ui .nowrap-ns{white-space:nowrap}.swagger-ui .pre-ns{white-space:pre}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .ws-normal-m{white-space:normal}.swagger-ui .nowrap-m{white-space:nowrap}.swagger-ui .pre-m{white-space:pre}}@media screen and (min-width:60em){.swagger-ui .ws-normal-l{white-space:normal}.swagger-ui .nowrap-l{white-space:nowrap}.swagger-ui .pre-l{white-space:pre}}.swagger-ui .v-base{vertical-align:baseline}.swagger-ui .v-mid{vertical-align:middle}.swagger-ui .v-top{vertical-align:top}.swagger-ui .v-btm{vertical-align:bottom}@media screen and (min-width:30em){.swagger-ui .v-base-ns{vertical-align:baseline}.swagger-ui .v-mid-ns{vertical-align:middle}.swagger-ui .v-top-ns{vertical-align:top}.swagger-ui .v-btm-ns{vertical-align:bottom}}@media screen and (min-width:30em) and (max-width:60em){.swagger-ui .v-base-m{vertical-align:baseline}.swagger-ui .v-mid-m{vertical-align:middle}.swagger-ui .v-top-m{vertical-align:top}.swagger-ui .v-btm-m{vertical-align:bottom}}@media screen and (min-width:60em){.swagger-ui .v-base-l{vertical-align:baseline}.swagger-ui .v-mid-l{vertical-align:middle}.swagger-ui .v-top-l{vertical-align:top}.swagger-ui .v-btm-l{vertical-align:bottom}}.swagger-ui .dim{opacity:1;transition:opacity .15s ease-in}.swagger-ui .dim:focus,.swagger-ui .dim:hover{opacity:.5;transition:opacity .15s ease-in}.swagger-ui .dim:active{opacity:.8;transition:opacity .15s ease-out}.swagger-ui .glow{transition:opacity .15s ease-in}.swagger-ui .glow:focus,.swagger-ui .glow:hover{opacity:1;transition:opacity .15s ease-in}.swagger-ui .hide-child .child{opacity:0;transition:opacity .15s ease-in}.swagger-ui .hide-child:active .child,.swagger-ui .hide-child:focus .child,.swagger-ui .hide-child:hover .child{opacity:1;transition:opacity .15s ease-in}.swagger-ui .underline-hover:focus,.swagger-ui .underline-hover:hover{text-decoration:underline}.swagger-ui .grow{-moz-osx-font-smoothing:grayscale;-webkit-backface-visibility:hidden;backface-visibility:hidden;transform:translateZ(0);transition:transform .25s ease-out}.swagger-ui .grow:focus,.swagger-ui .grow:hover{transform:scale(1.05)}.swagger-ui .grow:active{transform:scale(.9)}.swagger-ui .grow-large{-moz-osx-font-smoothing:grayscale;-webkit-backface-visibility:hidden;backface-visibility:hidden;transform:translateZ(0);transition:transform .25s ease-in-out}.swagger-ui .grow-large:focus,.swagger-ui .grow-large:hover{transform:scale(1.2)}.swagger-ui .grow-large:active{transform:scale(.95)}.swagger-ui .pointer:hover{cursor:pointer}.swagger-ui .shadow-hover{cursor:pointer;position:relative;transition:all .5s cubic-bezier(.165,.84,.44,1)}.swagger-ui .shadow-hover:after{border-radius:inherit;box-shadow:0 0 16px 2px rgba(0,0,0,.2);content:"";height:100%;left:0;opacity:0;position:absolute;top:0;transition:opacity .5s cubic-bezier(.165,.84,.44,1);width:100%;z-index:-1}.swagger-ui .shadow-hover:focus:after,.swagger-ui .shadow-hover:hover:after{opacity:1}.swagger-ui .bg-animate,.swagger-ui .bg-animate:focus,.swagger-ui .bg-animate:hover{transition:background-color .15s ease-in-out}.swagger-ui .z-0{z-index:0}.swagger-ui .z-1{z-index:1}.swagger-ui .z-2{z-index:2}.swagger-ui .z-3{z-index:3}.swagger-ui .z-4{z-index:4}.swagger-ui .z-5{z-index:5}.swagger-ui .z-999{z-index:999}.swagger-ui .z-9999{z-index:9999}.swagger-ui .z-max{z-index:2147483647}.swagger-ui .z-inherit{z-index:inherit}.swagger-ui .z-initial{z-index:auto}.swagger-ui .z-unset{z-index:unset}.swagger-ui .nested-copy-line-height ol,.swagger-ui .nested-copy-line-height p,.swagger-ui .nested-copy-line-height ul{line-height:1.5}.swagger-ui .nested-headline-line-height h1,.swagger-ui .nested-headline-line-height h2,.swagger-ui .nested-headline-line-height h3,.swagger-ui .nested-headline-line-height h4,.swagger-ui .nested-headline-line-height h5,.swagger-ui .nested-headline-line-height h6{line-height:1.25}.swagger-ui .nested-list-reset ol,.swagger-ui .nested-list-reset ul{list-style-type:none;margin-left:0;padding-left:0}.swagger-ui .nested-copy-indent p+p{margin-bottom:0;margin-top:0;text-indent:.1em}.swagger-ui .nested-copy-seperator p+p{margin-top:1.5em}.swagger-ui .nested-img img{display:block;max-width:100%;width:100%}.swagger-ui .nested-links a{color:#357edd;transition:color .15s ease-in}.swagger-ui .nested-links a:focus,.swagger-ui .nested-links a:hover{color:#96ccff;transition:color .15s ease-in}.swagger-ui .wrapper{box-sizing:border-box;margin:0 auto;max-width:1460px;padding:0 20px;width:100%}.swagger-ui .opblock-tag-section{display:flex;flex-direction:column}.swagger-ui .try-out.btn-group{display:flex;flex:0.1 2 auto;padding:0}.swagger-ui .try-out__btn{margin-left:1.25rem}.swagger-ui .opblock-tag{align-items:center;border-bottom:1px solid rgba(59,65,81,.3);cursor:pointer;display:flex;padding:10px 20px 10px 10px;transition:all .2s}.swagger-ui .opblock-tag:hover{background:rgba(0,0,0,.02)}.swagger-ui .opblock-tag{color:#3b4151;font-family:sans-serif;font-size:24px;margin:0 0 5px}.swagger-ui .opblock-tag.no-desc span{flex:1}.swagger-ui .opblock-tag svg{transition:all .4s}.swagger-ui .opblock-tag small{color:#3b4151;flex:1;font-family:sans-serif;font-size:14px;font-weight:400;padding:0 10px}.swagger-ui .parameter__type{color:#3b4151;font-family:monospace;font-size:12px;font-weight:600;padding:5px 0}.swagger-ui .parameter-controls{margin-top:.75em}.swagger-ui .examples__title{display:block;font-size:1.1em;font-weight:700;margin-bottom:.75em}.swagger-ui .examples__section{margin-top:1.5em}.swagger-ui .examples__section-header{font-size:.9rem;font-weight:700;margin-bottom:.5rem}.swagger-ui .examples-select{display:inline-block;margin-bottom:.75em}.swagger-ui .examples-select .examples-select-element{width:100%}.swagger-ui .examples-select__section-label{font-size:.9rem;font-weight:700;margin-right:.5rem}.swagger-ui .example__section{margin-top:1.5em}.swagger-ui .example__section-header{font-size:.9rem;font-weight:700;margin-bottom:.5rem}.swagger-ui .view-line-link{cursor:pointer;margin:0 5px;position:relative;top:3px;transition:all .5s;width:20px}.swagger-ui .opblock{border:1px solid #000;border-radius:4px;box-shadow:0 0 3px rgba(0,0,0,.19);margin:0 0 15px}.swagger-ui .opblock .tab-header{display:flex;flex:1}.swagger-ui .opblock .tab-header .tab-item{cursor:pointer;padding:0 40px}.swagger-ui .opblock .tab-header .tab-item:first-of-type{padding:0 40px 0 0}.swagger-ui .opblock .tab-header .tab-item.active h4 span{position:relative}.swagger-ui .opblock .tab-header .tab-item.active h4 span:after{background:gray;bottom:-15px;content:"";height:4px;left:50%;position:absolute;transform:translateX(-50%);width:120%}.swagger-ui .opblock.is-open .opblock-summary{border-bottom:1px solid #000}.swagger-ui .opblock .opblock-section-header{align-items:center;background:hsla(0,0%,100%,.8);box-shadow:0 1px 2px rgba(0,0,0,.1);display:flex;min-height:50px;padding:8px 20px}.swagger-ui .opblock .opblock-section-header>label{align-items:center;color:#3b4151;display:flex;font-family:sans-serif;font-size:12px;font-weight:700;margin:0 0 0 auto}.swagger-ui .opblock .opblock-section-header>label>span{padding:0 10px 0 0}.swagger-ui .opblock .opblock-section-header h4{color:#3b4151;flex:1;font-family:sans-serif;font-size:14px;margin:0}.swagger-ui .opblock .opblock-summary-method{background:#000;border-radius:3px;color:#fff;font-family:sans-serif;font-size:14px;font-weight:700;min-width:80px;padding:6px 0;text-align:center;text-shadow:0 1px 0 rgba(0,0,0,.1)}.swagger-ui .opblock .opblock-summary-operation-id,.swagger-ui .opblock .opblock-summary-path,.swagger-ui .opblock .opblock-summary-path__deprecated{align-items:center;color:#3b4151;display:flex;font-family:monospace;font-size:16px;font-weight:600;padding:0 10px;word-break:break-word}@media (max-width:768px){.swagger-ui .opblock .opblock-summary-operation-id,.swagger-ui .opblock .opblock-summary-path,.swagger-ui .opblock .opblock-summary-path__deprecated{font-size:12px}}.swagger-ui .opblock .opblock-summary-path{flex-shrink:0;max-width:calc(100% - 110px - 15rem)}.swagger-ui .opblock .opblock-summary-path__deprecated{text-decoration:line-through}.swagger-ui .opblock .opblock-summary-operation-id{font-size:14px}.swagger-ui .opblock .opblock-summary-description{color:#3b4151;flex:1 1 auto;font-family:sans-serif;font-size:13px;word-break:break-word}.swagger-ui .opblock .opblock-summary{align-items:center;cursor:pointer;display:flex;padding:5px}.swagger-ui .opblock .opblock-summary .view-line-link{cursor:pointer;margin:0;position:relative;top:2px;transition:all .5s;width:0}.swagger-ui .opblock .opblock-summary:hover .view-line-link{margin:0 5px;width:18px}.swagger-ui .opblock.opblock-post{background:rgba(73,204,144,.1);border-color:#49cc90}.swagger-ui .opblock.opblock-post .opblock-summary-method{background:#49cc90}.swagger-ui .opblock.opblock-post .opblock-summary{border-color:#49cc90}.swagger-ui .opblock.opblock-post .tab-header .tab-item.active h4 span:after{background:#49cc90}.swagger-ui .opblock.opblock-put{background:rgba(252,161,48,.1);border-color:#fca130}.swagger-ui .opblock.opblock-put .opblock-summary-method{background:#fca130}.swagger-ui .opblock.opblock-put .opblock-summary{border-color:#fca130}.swagger-ui .opblock.opblock-put .tab-header .tab-item.active h4 span:after{background:#fca130}.swagger-ui .opblock.opblock-delete{background:rgba(249,62,62,.1);border-color:#f93e3e}.swagger-ui .opblock.opblock-delete .opblock-summary-method{background:#f93e3e}.swagger-ui .opblock.opblock-delete .opblock-summary{border-color:#f93e3e}.swagger-ui .opblock.opblock-delete .tab-header .tab-item.active h4 span:after{background:#f93e3e}.swagger-ui .opblock.opblock-get{background:rgba(97,175,254,.1);border-color:#61affe}.swagger-ui .opblock.opblock-get .opblock-summary-method{background:#61affe}.swagger-ui .opblock.opblock-get .opblock-summary{border-color:#61affe}.swagger-ui .opblock.opblock-get .tab-header .tab-item.active h4 span:after{background:#61affe}.swagger-ui .opblock.opblock-patch{background:rgba(80,227,194,.1);border-color:#50e3c2}.swagger-ui .opblock.opblock-patch .opblock-summary-method{background:#50e3c2}.swagger-ui .opblock.opblock-patch .opblock-summary{border-color:#50e3c2}.swagger-ui .opblock.opblock-patch .tab-header .tab-item.active h4 span:after{background:#50e3c2}.swagger-ui .opblock.opblock-head{background:rgba(144,18,254,.1);border-color:#9012fe}.swagger-ui .opblock.opblock-head .opblock-summary-method{background:#9012fe}.swagger-ui .opblock.opblock-head .opblock-summary{border-color:#9012fe}.swagger-ui .opblock.opblock-head .tab-header .tab-item.active h4 span:after{background:#9012fe}.swagger-ui .opblock.opblock-options{background:rgba(13,90,167,.1);border-color:#0d5aa7}.swagger-ui .opblock.opblock-options .opblock-summary-method{background:#0d5aa7}.swagger-ui .opblock.opblock-options .opblock-summary{border-color:#0d5aa7}.swagger-ui .opblock.opblock-options .tab-header .tab-item.active h4 span:after{background:#0d5aa7}.swagger-ui .opblock.opblock-deprecated{background:hsla(0,0%,92%,.1);border-color:#ebebeb;opacity:.6}.swagger-ui .opblock.opblock-deprecated .opblock-summary-method{background:#ebebeb}.swagger-ui .opblock.opblock-deprecated .opblock-summary{border-color:#ebebeb}.swagger-ui .opblock.opblock-deprecated .tab-header .tab-item.active h4 span:after{background:#ebebeb}.swagger-ui .opblock .opblock-schemes{padding:8px 20px}.swagger-ui .opblock .opblock-schemes .schemes-title{padding:0 10px 0 0}.swagger-ui .filter .operation-filter-input{border:2px solid #d8dde7;margin:20px 0;padding:10px;width:100%}.swagger-ui .download-url-wrapper .failed,.swagger-ui .filter .failed{color:red}.swagger-ui .download-url-wrapper .loading,.swagger-ui .filter .loading{color:#aaa}.swagger-ui .model-example{margin-top:1em}.swagger-ui .tab{display:flex;list-style:none;padding:0}.swagger-ui .tab li{color:#3b4151;cursor:pointer;font-family:sans-serif;font-size:12px;min-width:60px;padding:0}.swagger-ui .tab li:first-of-type{padding-left:0;padding-right:12px;position:relative}.swagger-ui .tab li:first-of-type:after{background:rgba(0,0,0,.2);content:"";height:100%;position:absolute;right:6px;top:0;width:1px}.swagger-ui .tab li.active{font-weight:700}.swagger-ui .tab li button.tablinks{background:none;border:0;color:inherit;font-family:inherit;font-weight:inherit;padding:0}.swagger-ui .opblock-description-wrapper,.swagger-ui .opblock-external-docs-wrapper,.swagger-ui .opblock-title_normal{color:#3b4151;font-family:sans-serif;font-size:12px;margin:0 0 5px;padding:15px 20px}.swagger-ui .opblock-description-wrapper h4,.swagger-ui .opblock-external-docs-wrapper h4,.swagger-ui .opblock-title_normal h4{color:#3b4151;font-family:sans-serif;font-size:12px;margin:0 0 5px}.swagger-ui .opblock-description-wrapper p,.swagger-ui .opblock-external-docs-wrapper p,.swagger-ui .opblock-title_normal p{color:#3b4151;font-family:sans-serif;font-size:14px;margin:0}.swagger-ui .opblock-external-docs-wrapper h4{padding-left:0}.swagger-ui .execute-wrapper{padding:20px;text-align:right}.swagger-ui .execute-wrapper .btn{padding:8px 40px;width:100%}.swagger-ui .body-param-options{display:flex;flex-direction:column}.swagger-ui .body-param-options .body-param-edit{padding:10px 0}.swagger-ui .body-param-options label{padding:8px 0}.swagger-ui .body-param-options label select{margin:3px 0 0}.swagger-ui .responses-inner{padding:20px}.swagger-ui .responses-inner h4,.swagger-ui .responses-inner h5{color:#3b4151;font-family:sans-serif;font-size:12px;margin:10px 0 5px}.swagger-ui .responses-inner .curl{white-space:normal}.swagger-ui .response-col_status{color:#3b4151;font-family:sans-serif;font-size:14px}.swagger-ui .response-col_status .response-undocumented{color:#909090;font-family:monospace;font-size:11px;font-weight:600}.swagger-ui .response-col_links{color:#3b4151;font-family:sans-serif;font-size:14px;max-width:40em;padding-left:2em}.swagger-ui .response-col_links .response-undocumented{color:#909090;font-family:monospace;font-size:11px;font-weight:600}.swagger-ui .response-col_links .operation-link{margin-bottom:1.5em}.swagger-ui .response-col_links .operation-link .description{margin-bottom:.5em}.swagger-ui .opblock-body .opblock-loading-animation{display:block;margin:3em auto}.swagger-ui .opblock-body pre.microlight{word-wrap:break-word;background:#333;border-radius:4px;color:#fff;font-family:monospace;font-size:12px;font-weight:600;-webkit-hyphens:auto;-ms-hyphens:auto;hyphens:auto;margin:0;padding:10px;white-space:pre-wrap;word-break:break-all;word-break:break-word}.swagger-ui .opblock-body pre.microlight .headerline{display:block}.swagger-ui .highlight-code{position:relative}.swagger-ui .highlight-code>.microlight{max-height:400px;min-height:6em;overflow-y:auto}.swagger-ui .highlight-code>.microlight code{white-space:pre-wrap!important;word-break:break-all}.swagger-ui .curl-command{position:relative}.swagger-ui .download-contents{align-items:center;background:#7d8293;border-radius:4px;bottom:10px;color:#fff;cursor:pointer;display:flex;font-family:sans-serif;font-size:14px;font-weight:600;height:30px;justify-content:center;padding:5px;position:absolute;right:10px;text-align:center}.swagger-ui .scheme-container{background:#fff;box-shadow:0 1px 2px 0 rgba(0,0,0,.15);margin:0 0 20px;padding:30px 0}.swagger-ui .scheme-container .schemes{align-items:flex-end;display:flex}.swagger-ui .scheme-container .schemes>label{color:#3b4151;display:flex;flex-direction:column;font-family:sans-serif;font-size:12px;font-weight:700;margin:-20px 15px 0 0}.swagger-ui .scheme-container .schemes>label select{min-width:130px;text-transform:uppercase}.swagger-ui .loading-container{align-items:center;display:flex;flex-direction:column;justify-content:center;margin-top:1em;min-height:1px;padding:40px 0 60px}.swagger-ui .loading-container .loading{position:relative}.swagger-ui .loading-container .loading:after{color:#3b4151;content:"loading";font-family:sans-serif;font-size:10px;font-weight:700;left:50%;position:absolute;text-transform:uppercase;top:50%;transform:translate(-50%,-50%)}.swagger-ui .loading-container .loading:before{-webkit-animation:rotation 1s linear infinite,opacity .5s;animation:rotation 1s linear infinite,opacity .5s;-webkit-backface-visibility:hidden;backface-visibility:hidden;border:2px solid rgba(85,85,85,.1);border-radius:100%;border-top-color:rgba(0,0,0,.6);content:"";display:block;height:60px;left:50%;margin:-30px;opacity:1;position:absolute;top:50%;width:60px}@-webkit-keyframes rotation{to{transform:rotate(1turn)}}@keyframes rotation{to{transform:rotate(1turn)}}.swagger-ui .response-controls{display:flex;padding-top:1em}.swagger-ui .response-control-media-type{margin-right:1em}.swagger-ui .response-control-media-type--accept-controller select{border-color:green}.swagger-ui .response-control-media-type__accept-message{color:green;font-size:.7em}.swagger-ui .response-control-examples__title,.swagger-ui .response-control-media-type__title{display:block;font-size:.7em;margin-bottom:.2em}@-webkit-keyframes blinker{50%{opacity:0}}@keyframes blinker{50%{opacity:0}}.swagger-ui .hidden{display:none}.swagger-ui .no-margin{border:none;height:auto;margin:0;padding:0}.swagger-ui .float-right{float:right}.swagger-ui .svg-assets{height:0;position:absolute;width:0}.swagger-ui section h3{color:#3b4151;font-family:sans-serif}.swagger-ui a.nostyle{display:inline}.swagger-ui a.nostyle,.swagger-ui a.nostyle:visited{color:inherit;cursor:pointer;text-decoration:inherit}.swagger-ui .fallback{color:#aaa;padding:1em}.swagger-ui .version-pragma{height:100%;padding:5em 0}.swagger-ui .version-pragma__message{display:flex;font-size:1.2em;height:100%;justify-content:center;line-height:1.5em;padding:0 .6em;text-align:center}.swagger-ui .version-pragma__message>div{flex:1;max-width:55ch}.swagger-ui .version-pragma__message code{background-color:#dedede;padding:4px 4px 2px;white-space:pre}.swagger-ui .opblock-link{font-weight:400}.swagger-ui .opblock-link.shown{font-weight:700}.swagger-ui span.token-string{color:#555}.swagger-ui span.token-not-formatted{color:#555;font-weight:700}.swagger-ui .btn{background:transparent;border:2px solid gray;border-radius:4px;box-shadow:0 1px 2px rgba(0,0,0,.1);color:#3b4151;font-family:sans-serif;font-size:14px;font-weight:700;padding:5px 23px;transition:all .3s}.swagger-ui .btn.btn-sm{font-size:12px;padding:4px 23px}.swagger-ui .btn[disabled]{cursor:not-allowed;opacity:.3}.swagger-ui .btn:hover{box-shadow:0 0 5px rgba(0,0,0,.3)}.swagger-ui .btn.cancel{background-color:transparent;border-color:#ff6060;color:#ff6060;font-family:sans-serif}.swagger-ui .btn.authorize{background-color:transparent;border-color:#49cc90;color:#49cc90;display:inline;line-height:1}.swagger-ui .btn.authorize span{float:left;padding:4px 20px 0 0}.swagger-ui .btn.authorize svg{fill:#49cc90}.swagger-ui .btn.execute{background-color:#4990e2;border-color:#4990e2;color:#fff}.swagger-ui .btn-group{display:flex;padding:30px}.swagger-ui .btn-group .btn{flex:1}.swagger-ui .btn-group .btn:first-child{border-radius:4px 0 0 4px}.swagger-ui .btn-group .btn:last-child{border-radius:0 4px 4px 0}.swagger-ui .authorization__btn{background:none;border:none;padding:0 10px}.swagger-ui .authorization__btn.locked{opacity:1}.swagger-ui .authorization__btn.unlocked{opacity:.4}.swagger-ui .model-box-control,.swagger-ui .models-control,.swagger-ui .opblock-summary-control{all:inherit;border-bottom:0;cursor:pointer;flex:1;padding:0}.swagger-ui .model-box-control:focus,.swagger-ui .models-control:focus,.swagger-ui .opblock-summary-control:focus{outline:auto}.swagger-ui .expand-methods,.swagger-ui .expand-operation{background:none;border:none}.swagger-ui .expand-methods svg,.swagger-ui .expand-operation svg{height:20px;width:20px}.swagger-ui .expand-methods{padding:0 10px}.swagger-ui .expand-methods:hover svg{fill:#404040}.swagger-ui .expand-methods svg{fill:#707070;transition:all .3s}.swagger-ui button{cursor:pointer}.swagger-ui button.invalid{-webkit-animation:shake .4s 1;animation:shake .4s 1;background:#feebeb;border-color:#f93e3e}.swagger-ui .copy-to-clipboard{align-items:center;background:#7d8293;border:none;border-radius:4px;bottom:10px;display:flex;height:30px;justify-content:center;position:absolute;right:100px;width:30px}.swagger-ui .copy-to-clipboard button{background:url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="16" height="15" aria-hidden="true"><path fill="%23fff" fill-rule="evenodd" d="M4 12h4v1H4v-1zm5-6H4v1h5V6zm2 3V7l-3 3 3 3v-2h5V9h-5zM6.5 8H4v1h2.5V8zM4 11h2.5v-1H4v1zm9 1h1v2c-.02.28-.11.52-.3.7-.19.18-.42.28-.7.3H3c-.55 0-1-.45-1-1V3c0-.55.45-1 1-1h3c0-1.11.89-2 2-2 1.11 0 2 .89 2 2h3c.55 0 1 .45 1 1v5h-1V5H3v9h10v-2zM4 4h8c0-.55-.45-1-1-1h-1c-.55 0-1-.45-1-1s-.45-1-1-1-1 .45-1 1-.45 1-1 1H5c-.55 0-1 .45-1 1z"/></svg>') 50% no-repeat;border:none;flex-grow:1;flex-shrink:1;height:25px}.swagger-ui .curl-command .copy-to-clipboard{bottom:5px;height:20px;right:10px;width:20px}.swagger-ui .curl-command .copy-to-clipboard button{height:18px}.swagger-ui select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background:#f7f7f7 url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M13.418 7.859a.695.695 0 0 1 .978 0 .68.68 0 0 1 0 .969l-3.908 3.83a.697.697 0 0 1-.979 0l-3.908-3.83a.68.68 0 0 1 0-.969.695.695 0 0 1 .978 0L10 11l3.418-3.141z"/></svg>') right 10px center no-repeat;background-size:20px;border:2px solid #41444e;border-radius:4px;box-shadow:0 1px 2px 0 rgba(0,0,0,.25);color:#3b4151;font-family:sans-serif;font-size:14px;font-weight:700;padding:5px 40px 5px 10px}.swagger-ui select[multiple]{background:#f7f7f7;margin:5px 0;padding:5px}.swagger-ui select.invalid{-webkit-animation:shake .4s 1;animation:shake .4s 1;background:#feebeb;border-color:#f93e3e}.swagger-ui .opblock-body select{min-width:230px}@media (max-width:768px){.swagger-ui .opblock-body select{min-width:180px}}.swagger-ui label{color:#3b4151;font-family:sans-serif;font-size:12px;font-weight:700;margin:0 0 5px}@media (max-width:768px){.swagger-ui input[type=email],.swagger-ui input[type=file],.swagger-ui input[type=password],.swagger-ui input[type=search],.swagger-ui input[type=text]{max-width:175px}}.swagger-ui input[type=email],.swagger-ui input[type=file],.swagger-ui input[type=password],.swagger-ui input[type=search],.swagger-ui input[type=text],.swagger-ui textarea{background:#fff;border:1px solid #d9d9d9;border-radius:4px;margin:5px 0;min-width:100px;padding:8px 10px}.swagger-ui input[type=email].invalid,.swagger-ui input[type=file].invalid,.swagger-ui input[type=password].invalid,.swagger-ui input[type=search].invalid,.swagger-ui input[type=text].invalid,.swagger-ui textarea.invalid{-webkit-animation:shake .4s 1;animation:shake .4s 1;background:#feebeb;border-color:#f93e3e}.swagger-ui input[disabled],.swagger-ui select[disabled],.swagger-ui textarea[disabled]{background-color:#fafafa;color:#888;cursor:not-allowed}.swagger-ui select[disabled]{border-color:#888}.swagger-ui textarea[disabled]{background-color:#41444e;color:#fff}@-webkit-keyframes shake{10%,90%{transform:translate3d(-1px,0,0)}20%,80%{transform:translate3d(2px,0,0)}30%,50%,70%{transform:translate3d(-4px,0,0)}40%,60%{transform:translate3d(4px,0,0)}}@keyframes shake{10%,90%{transform:translate3d(-1px,0,0)}20%,80%{transform:translate3d(2px,0,0)}30%,50%,70%{transform:translate3d(-4px,0,0)}40%,60%{transform:translate3d(4px,0,0)}}.swagger-ui textarea{background:hsla(0,0%,100%,.8);border:none;border-radius:4px;color:#3b4151;font-family:monospace;font-size:12px;font-weight:600;min-height:280px;outline:none;padding:10px;width:100%}.swagger-ui textarea:focus{border:2px solid #61affe}.swagger-ui textarea.curl{background:#41444e;border-radius:4px;color:#fff;font-family:monospace;font-size:12px;font-weight:600;margin:0;min-height:100px;padding:10px;resize:none}.swagger-ui .checkbox{color:#303030;padding:5px 0 10px;transition:opacity .5s}.swagger-ui .checkbox label{display:flex}.swagger-ui .checkbox p{color:#3b4151;font-family:monospace;font-style:italic;font-weight:400!important;font-weight:600;margin:0!important}.swagger-ui .checkbox input[type=checkbox]{display:none}.swagger-ui .checkbox input[type=checkbox]+label>.item{background:#e8e8e8;border-radius:1px;box-shadow:0 0 0 2px #e8e8e8;cursor:pointer;display:inline-block;flex:none;height:16px;margin:0 8px 0 0;padding:5px;position:relative;top:3px;width:16px}.swagger-ui .checkbox input[type=checkbox]+label>.item:active{transform:scale(.9)}.swagger-ui .checkbox input[type=checkbox]:checked+label>.item{background:#e8e8e8 url('data:image/svg+xml;charset=utf-8,<svg width="10" height="8" viewBox="3 7 10 8" xmlns="http://www.w3.org/2000/svg"><path fill="%2341474E" fill-rule="evenodd" d="M6.333 15 3 11.667l1.333-1.334 2 2L11.667 7 13 8.333z"/></svg>') 50% no-repeat}.swagger-ui .dialog-ux{bottom:0;left:0;position:fixed;right:0;top:0;z-index:9999}.swagger-ui .dialog-ux .backdrop-ux{background:rgba(0,0,0,.8);bottom:0;left:0;position:fixed;right:0;top:0}.swagger-ui .dialog-ux .modal-ux{background:#fff;border:1px solid #ebebeb;border-radius:4px;box-shadow:0 10px 30px 0 rgba(0,0,0,.2);left:50%;max-width:650px;min-width:300px;position:absolute;top:50%;transform:translate(-50%,-50%);width:100%;z-index:9999}.swagger-ui .dialog-ux .modal-ux-content{max-height:540px;overflow-y:auto;padding:20px}.swagger-ui .dialog-ux .modal-ux-content p{color:#41444e;color:#3b4151;font-family:sans-serif;font-size:12px;margin:0 0 5px}.swagger-ui .dialog-ux .modal-ux-content h4{color:#3b4151;font-family:sans-serif;font-size:18px;font-weight:600;margin:15px 0 0}.swagger-ui .dialog-ux .modal-ux-header{align-items:center;border-bottom:1px solid #ebebeb;display:flex;padding:12px 0}.swagger-ui .dialog-ux .modal-ux-header .close-modal{-webkit-appearance:none;-moz-appearance:none;appearance:none;background:none;border:none;padding:0 10px}.swagger-ui .dialog-ux .modal-ux-header h3{color:#3b4151;flex:1;font-family:sans-serif;font-size:20px;font-weight:600;margin:0;padding:0 20px}.swagger-ui .model{color:#3b4151;font-family:monospace;font-size:12px;font-weight:300;font-weight:600}.swagger-ui .model .deprecated span,.swagger-ui .model .deprecated td{color:#a0a0a0!important}.swagger-ui .model .deprecated>td:first-of-type{text-decoration:line-through}.swagger-ui .model-toggle{cursor:pointer;display:inline-block;font-size:10px;margin:auto .3em;position:relative;top:6px;transform:rotate(90deg);transform-origin:50% 50%;transition:transform .15s ease-in}.swagger-ui .model-toggle.collapsed{transform:rotate(0deg)}.swagger-ui .model-toggle:after{background:url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M10 6 8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>') 50% no-repeat;background-size:100%;content:"";display:block;height:20px;width:20px}.swagger-ui .model-jump-to-path{cursor:pointer;position:relative}.swagger-ui .model-jump-to-path .view-line-link{cursor:pointer;position:absolute;top:-.4em}.swagger-ui .model-title{position:relative}.swagger-ui .model-title:hover .model-hint{visibility:visible}.swagger-ui .model-hint{background:rgba(0,0,0,.7);border-radius:4px;color:#ebebeb;padding:.1em .5em;position:absolute;top:-1.8em;visibility:hidden;white-space:nowrap}.swagger-ui .model p{margin:0 0 1em}.swagger-ui .model .property{color:#999;font-style:italic}.swagger-ui .model .property.primitive{color:#6b6b6b}.swagger-ui table.model tr.description{color:#666;font-weight:400}.swagger-ui table.model tr.description td:first-child,.swagger-ui table.model tr.property-row.required td:first-child{font-weight:700}.swagger-ui table.model tr.property-row td{vertical-align:top}.swagger-ui table.model tr.property-row td:first-child{padding-right:.2em}.swagger-ui table.model tr.property-row .star{color:red}.swagger-ui table.model tr.extension{color:#777}.swagger-ui table.model tr.extension td:last-child{vertical-align:top}.swagger-ui section.models{border:1px solid rgba(59,65,81,.3);border-radius:4px;margin:30px 0}.swagger-ui section.models .pointer{cursor:pointer}.swagger-ui section.models.is-open{padding:0 0 20px}.swagger-ui section.models.is-open h4{border-bottom:1px solid rgba(59,65,81,.3);margin:0 0 5px}.swagger-ui section.models h4{align-items:center;color:#606060;cursor:pointer;display:flex;font-family:sans-serif;font-size:16px;margin:0;padding:10px 20px 10px 10px;transition:all .2s}.swagger-ui section.models h4 svg{transition:all .4s}.swagger-ui section.models h4 span{flex:1}.swagger-ui section.models h4:hover{background:rgba(0,0,0,.02)}.swagger-ui section.models h5{color:#707070;font-family:sans-serif;font-size:16px;margin:0 0 10px}.swagger-ui section.models .model-jump-to-path{position:relative;top:5px}.swagger-ui section.models .model-container{background:rgba(0,0,0,.05);border-radius:4px;margin:0 20px 15px;position:relative;transition:all .5s}.swagger-ui section.models .model-container:hover{background:rgba(0,0,0,.07)}.swagger-ui section.models .model-container:first-of-type{margin:20px}.swagger-ui section.models .model-container:last-of-type{margin:0 20px}.swagger-ui section.models .model-container .models-jump-to-path{opacity:.65;position:absolute;right:5px;top:8px}.swagger-ui section.models .model-box{background:none}.swagger-ui .model-box{background:rgba(0,0,0,.1);border-radius:4px;display:inline-block;padding:10px}.swagger-ui .model-box .model-jump-to-path{position:relative;top:4px}.swagger-ui .model-box.deprecated{opacity:.5}.swagger-ui .model-title{color:#505050;font-family:sans-serif;font-size:16px}.swagger-ui .model-title img{bottom:0;margin-left:1em;position:relative}.swagger-ui .model-deprecated-warning{color:#f93e3e;font-family:sans-serif;font-size:16px;font-weight:600;margin-right:1em}.swagger-ui span>span.model .brace-close{padding:0 0 0 10px}.swagger-ui .prop-name{display:inline-block;margin-right:1em}.swagger-ui .prop-type{color:#55a}.swagger-ui .prop-enum{display:block}.swagger-ui .prop-format{color:#606060}.swagger-ui .servers>label{color:#3b4151;font-family:sans-serif;font-size:12px;margin:-20px 15px 0 0}.swagger-ui .servers>label select{max-width:100%;min-width:130px}.swagger-ui .servers h4.message{padding-bottom:2em}.swagger-ui .servers table tr{width:30em}.swagger-ui .servers table td{display:inline-block;max-width:15em;padding-bottom:10px;padding-top:10px;vertical-align:middle}.swagger-ui .servers table td:first-of-type{padding-right:1em}.swagger-ui .servers table td input{height:100%;width:100%}.swagger-ui .servers .computed-url{margin:2em 0}.swagger-ui .servers .computed-url code{display:inline-block;font-size:16px;margin:0 1em;padding:4px}.swagger-ui .servers-title{font-size:12px;font-weight:700}.swagger-ui .operation-servers h4.message{margin-bottom:2em}.swagger-ui table{border-collapse:collapse;padding:0 10px;width:100%}.swagger-ui table.model tbody tr td{padding:0;vertical-align:top}.swagger-ui table.model tbody tr td:first-of-type{padding:0 0 0 2em;width:174px}.swagger-ui table.headers td{color:#3b4151;font-family:monospace;font-size:12px;font-weight:300;font-weight:600;vertical-align:middle}.swagger-ui table.headers .header-example{color:#999;font-style:italic}.swagger-ui table tbody tr td{padding:10px 0 0;vertical-align:top}.swagger-ui table tbody tr td:first-of-type{min-width:6em;padding:10px 0}.swagger-ui table thead tr td,.swagger-ui table thead tr th{border-bottom:1px solid rgba(59,65,81,.2);color:#3b4151;font-family:sans-serif;font-size:12px;font-weight:700;padding:12px 0;text-align:left}.swagger-ui .parameters-col_description{margin-bottom:2em;width:99%}.swagger-ui .parameters-col_description input[type=text]{max-width:340px;width:100%}.swagger-ui .parameters-col_description select{border-width:1px}.swagger-ui .parameter__name{color:#3b4151;font-family:sans-serif;font-size:16px;font-weight:400;margin-right:.75em}.swagger-ui .parameter__name.required{font-weight:700}.swagger-ui .parameter__name.required span{color:red}.swagger-ui .parameter__name.required:after{color:rgba(255,0,0,.6);content:"required";font-size:10px;padding:5px;position:relative;top:-6px}.swagger-ui .parameter__extension,.swagger-ui .parameter__in{color:gray;font-family:monospace;font-size:12px;font-style:italic;font-weight:600}.swagger-ui .parameter__deprecated{color:red;font-family:monospace;font-size:12px;font-style:italic;font-weight:600}.swagger-ui .parameter__empty_value_toggle{display:block;font-size:13px;padding-bottom:12px;padding-top:5px}.swagger-ui .parameter__empty_value_toggle input{margin-right:7px}.swagger-ui .parameter__empty_value_toggle.disabled{opacity:.7}.swagger-ui .table-container{padding:20px}.swagger-ui .response-col_description{width:99%}.swagger-ui .response-col_links{min-width:6em}.swagger-ui .response__extension{color:gray;font-family:monospace;font-size:12px;font-style:italic;font-weight:600}.swagger-ui .topbar{background-color:#1b1b1b;padding:10px 0}.swagger-ui .topbar .topbar-wrapper,.swagger-ui .topbar a{align-items:center;display:flex}.swagger-ui .topbar a{color:#fff;flex:1;font-family:sans-serif;font-size:1.5em;font-weight:700;max-width:300px;text-decoration:none}.swagger-ui .topbar a span{margin:0;padding:0 10px}.swagger-ui .topbar .download-url-wrapper{display:flex;flex:3;justify-content:flex-end}.swagger-ui .topbar .download-url-wrapper input[type=text]{border:2px solid #62a03f;border-radius:4px 0 0 4px;margin:0;outline:none;width:100%}.swagger-ui .topbar .download-url-wrapper .select-label{align-items:center;color:#f0f0f0;display:flex;margin:0;max-width:600px;width:100%}.swagger-ui .topbar .download-url-wrapper .select-label span{flex:1;font-size:16px;padding:0 10px 0 0;text-align:right}.swagger-ui .topbar .download-url-wrapper .select-label select{border:2px solid #62a03f;box-shadow:none;flex:2;outline:none;width:100%}.swagger-ui .topbar .download-url-wrapper .download-url-button{background:#62a03f;border:none;border-radius:0 4px 4px 0;color:#fff;font-family:sans-serif;font-size:16px;font-weight:700;padding:4px 30px}.swagger-ui .info{margin:50px 0}.swagger-ui .info.failed-config{margin-left:auto;margin-right:auto;max-width:880px;text-align:center}.swagger-ui .info hgroup.main{margin:0 0 20px}.swagger-ui .info hgroup.main a{font-size:12px}.swagger-ui .info pre{font-size:14px}.swagger-ui .info li,.swagger-ui .info p,.swagger-ui .info table{color:#3b4151;font-family:sans-serif;font-size:14px}.swagger-ui .info h1,.swagger-ui .info h2,.swagger-ui .info h3,.swagger-ui .info h4,.swagger-ui .info h5{color:#3b4151;font-family:sans-serif}.swagger-ui .info a{color:#4990e2;font-family:sans-serif;font-size:14px;transition:all .4s}.swagger-ui .info a:hover{color:#1f69c0}.swagger-ui .info>div{margin:0 0 5px}.swagger-ui .info .base-url{color:#3b4151;font-family:monospace;font-size:12px;font-weight:300!important;font-weight:600;margin:0}.swagger-ui .info .title{color:#3b4151;font-family:sans-serif;font-size:36px;margin:0}.swagger-ui .info .title small{background:#7d8492;border-radius:57px;display:inline-block;font-size:10px;margin:0 0 0 5px;padding:2px 4px;position:relative;top:-5px;vertical-align:super}.swagger-ui .info .title small.version-stamp{background-color:#89bf04}.swagger-ui .info .title small pre{color:#fff;font-family:sans-serif;margin:0;padding:0}.swagger-ui .auth-btn-wrapper{display:flex;justify-content:center;padding:10px 0}.swagger-ui .auth-btn-wrapper .btn-done{margin-right:1em}.swagger-ui .auth-wrapper{display:flex;flex:1;justify-content:flex-end}.swagger-ui .auth-wrapper .authorize{margin-right:10px;padding-right:20px}.swagger-ui .auth-container{border-bottom:1px solid #ebebeb;margin:0 0 10px;padding:10px 20px}.swagger-ui .auth-container:last-of-type{border:0;margin:0;padding:10px 20px}.swagger-ui .auth-container h4{margin:5px 0 15px!important}.swagger-ui .auth-container .wrapper{margin:0;padding:0}.swagger-ui .auth-container input[type=password],.swagger-ui .auth-container input[type=text]{min-width:230px}.swagger-ui .auth-container .errors{background-color:#fee;border-radius:4px;color:red;color:#3b4151;font-family:monospace;font-size:12px;font-weight:600;margin:1em;padding:10px}.swagger-ui .auth-container .errors b{margin-right:1em;text-transform:capitalize}.swagger-ui .scopes h2{color:#3b4151;font-family:sans-serif;font-size:14px}.swagger-ui .scopes h2 a{color:#4990e2;cursor:pointer;font-size:12px;padding-left:10px;text-decoration:underline}.swagger-ui .scope-def{padding:0 0 20px}.swagger-ui .errors-wrapper{-webkit-animation:scaleUp .5s;animation:scaleUp .5s;background:rgba(249,62,62,.1);border:2px solid #f93e3e;border-radius:4px;margin:20px;padding:10px 20px}.swagger-ui .errors-wrapper .error-wrapper{margin:0 0 10px}.swagger-ui .errors-wrapper .errors h4{color:#3b4151;font-family:monospace;font-size:14px;font-weight:600;margin:0}.swagger-ui .errors-wrapper .errors small{color:#606060}.swagger-ui .errors-wrapper .errors .message{white-space:pre-line}.swagger-ui .errors-wrapper .errors .message.thrown{max-width:100%}.swagger-ui .errors-wrapper .errors .error-line{cursor:pointer;text-decoration:underline}.swagger-ui .errors-wrapper hgroup{align-items:center;display:flex}.swagger-ui .errors-wrapper hgroup h4{color:#3b4151;flex:1;font-family:sans-serif;font-size:20px;margin:0}@-webkit-keyframes scaleUp{0%{opacity:0;transform:scale(.8)}to{opacity:1;transform:scale(1)}}@keyframes scaleUp{0%{opacity:0;transform:scale(.8)}to{opacity:1;transform:scale(1)}}.swagger-ui .Resizer.vertical.disabled{display:none}.swagger-ui .markdown p,.swagger-ui .markdown pre,.swagger-ui .renderedMarkdown p,.swagger-ui .renderedMarkdown pre{margin:1em auto;word-break:break-all;word-break:break-word}.swagger-ui .markdown pre,.swagger-ui .renderedMarkdown pre{background:none;color:#000;font-weight:400;padding:0;white-space:pre-wrap}.swagger-ui .markdown code,.swagger-ui .renderedMarkdown code{background:rgba(0,0,0,.05);border-radius:4px;color:#9012fe;font-family:monospace;font-size:14px;font-weight:600;padding:5px 7px}.swagger-ui .markdown pre>code,.swagger-ui .renderedMarkdown pre>code{display:block}
-
-/*# sourceMappingURL=swagger-ui.css.map*/
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/resources/application.yml b/spring-boot-modules/spring-boot-swagger-keycloak/src/main/resources/application.yml
index 5d3c8b3af5..7d1618b4e7 100644
--- a/spring-boot-modules/spring-boot-swagger-keycloak/src/main/resources/application.yml
+++ b/spring-boot-modules/spring-boot-swagger-keycloak/src/main/resources/application.yml
@@ -1,8 +1,19 @@
+server:
+   port: 8081
+
 keycloak:
-  auth-server-url: https://api.example.com/auth # Keycloak server url
-  realm: todos-service-realm # Keycloak Realm
-  resource: todos-service-clients # Keycloak Client
-  principal-attribute: preferred_username
-  ssl-required: external
-  credentials:
-    secret: 00000000-0000-0000-0000-000000000000
+  auth-server-url: http://localhost:8080 # Keycloak server url
+  realm: SpringBootKeycloak # Keycloak Realm
+    
+spring:
+   security:
+      oauth2:
+         resourceserver:
+            jwt.issuer-uri: http://localhost:8080/realms/SpringBootKeycloak
+
+springdoc:
+   swagger-ui:
+      oauth:
+         client-id: login-app
+
+    
diff --git a/spring-boot-modules/spring-boot-testing-2/pom.xml b/spring-boot-modules/spring-boot-testing-2/pom.xml
index 395fa27948..cf16407e76 100644
--- a/spring-boot-modules/spring-boot-testing-2/pom.xml
+++ b/spring-boot-modules/spring-boot-testing-2/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    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">
+         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>spring-boot-testing-2</artifactId>
     <name>spring-boot-testing-2</name>
@@ -66,6 +66,18 @@
             <artifactId>testcontainers</artifactId>
             <version>${testcontainers.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${testcontainers.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.redis.testcontainers</groupId>
+            <artifactId>testcontainers-redis-junit-jupiter</artifactId>
+            <version>1.4.6</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/spring-boot-modules/spring-boot-testing-2/src/test/java/com/baeldung/redistestcontainers/service/ProductServiceDynamicPropertyManualTest.java b/spring-boot-modules/spring-boot-testing-2/src/test/java/com/baeldung/redistestcontainers/service/ProductServiceDynamicPropertyManualTest.java
new file mode 100644
index 0000000000..e7bcca2620
--- /dev/null
+++ b/spring-boot-modules/spring-boot-testing-2/src/test/java/com/baeldung/redistestcontainers/service/ProductServiceDynamicPropertyManualTest.java
@@ -0,0 +1,89 @@
+package com.baeldung.redistestcontainers.service;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+
+import com.baeldung.redistestcontainers.hash.Product;
+import com.redis.testcontainers.RedisContainer;
+
+@SpringBootTest
+@Testcontainers(disabledWithoutDocker = true)
+public class ProductServiceDynamicPropertyManualTest {
+
+    @Autowired
+    private ProductService productService;
+
+    @Container
+    private static final RedisContainer REDIS_CONTAINER = new RedisContainer(DockerImageName.parse("redis:5.0.3-alpine")).withExposedPorts(6379);
+
+    @DynamicPropertySource
+    private static void registerRedisProperties(DynamicPropertyRegistry registry) {
+        registry.add("spring.redis.host", REDIS_CONTAINER::getHost);
+        registry.add("spring.redis.port", () -> REDIS_CONTAINER.getMappedPort(6379)
+            .toString());
+    }
+
+    @Test
+    void givenRedisContainerConfiguredWithDynamicProperties_whenCheckingRunningStatus_thenStatusIsRunning() {
+        assertTrue(REDIS_CONTAINER.isRunning());
+    }
+
+    @Test
+    void givenProductCreated_whenGettingProductById_thenProductExistsAndHasSameProperties() {
+        Product product = new Product("1", "Test Product", 10.0);
+        productService.createProduct(product);
+        Product productFromDb = productService.getProduct("1");
+        assertEquals("1", productFromDb.getId());
+        assertEquals("Test Product", productFromDb.getName());
+        assertEquals(10.0, productFromDb.getPrice());
+    }
+
+    @Test
+    void givenProductCreatedAndUpdated_whenGettingTheProduct_thenUpdatedProductReturned() {
+        Product product = new Product("1", "Test Product", 10.0);
+        productService.createProduct(product);
+        Product productFromDb = productService.getProduct("1");
+        assertEquals("1", productFromDb.getId());
+        assertEquals("Test Product", productFromDb.getName());
+        assertEquals(10.0, productFromDb.getPrice());
+        productFromDb.setName("Updated Product");
+        productFromDb.setPrice(20.0);
+        productService.updateProduct(productFromDb);
+        Product updatedProductFromDb = productService.getProduct("1");
+        assertEquals("Updated Product", updatedProductFromDb.getName());
+        assertEquals(20.0, updatedProductFromDb.getPrice());
+    }
+
+    @Test
+    void givenProductCreatedAndDeleted_whenGettingTheProduct_thenNoProductReturned() {
+        Product product = new Product("1", "Test Product", 10.0);
+        productService.createProduct(product);
+        Product productFromDb = productService.getProduct("1");
+        assertEquals("1", productFromDb.getId());
+        assertEquals("Test Product", productFromDb.getName());
+        assertEquals(10.0, productFromDb.getPrice());
+        productService.deleteProduct("1");
+        Product deletedProductFromDb = productService.getProduct("1");
+        assertNull(deletedProductFromDb);
+    }
+
+    @Test
+    void givenProductCreated_whenGettingProductById_thenSameProductReturned() {
+        Product product = new Product("1", "Test Product", 10.0);
+        productService.createProduct(product);
+        Product productFromDb = productService.getProduct("1");
+        assertEquals("1", productFromDb.getId());
+        assertEquals("Test Product", productFromDb.getName());
+        assertEquals(10.0, productFromDb.getPrice());
+    }
+}
diff --git a/spring-boot-modules/spring-boot-testing/pom.xml b/spring-boot-modules/spring-boot-testing/pom.xml
index fcfc2364ba..ace6307761 100644
--- a/spring-boot-modules/spring-boot-testing/pom.xml
+++ b/spring-boot-modules/spring-boot-testing/pom.xml
@@ -131,6 +131,14 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <targetBytecode>17</targetBytecode>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
             </plugin>
         </plugins>
     </build>
@@ -139,8 +147,9 @@
         <!-- The main class to start by executing java -jar -->
         <start-class>com.baeldung.boot.Application</start-class>
         <git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
-        <spock.version>1.2-groovy-2.4</spock.version>
-        <gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
+        <spock.version>2.4-M1-groovy-4.0</spock.version>
+        <gmavenplus-plugin.version>2.1.0</gmavenplus-plugin.version>
+        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
         <redis.version>0.7.2</redis.version>
         <spring-boot.version>2.5.0</spring-boot.version>
         <log4j2.version>2.17.1</log4j2.version>
diff --git a/spring-boot-modules/spring-boot-validation/README.md b/spring-boot-modules/spring-boot-validation/README.md
index 93b6e7d2d1..f20f846b60 100644
--- a/spring-boot-modules/spring-boot-validation/README.md
+++ b/spring-boot-modules/spring-boot-validation/README.md
@@ -2,3 +2,4 @@
 
 - [Spring Validation in the Service Layer](https://www.baeldung.com/spring-service-layer-validation)
 - [Validation in Spring Boot](https://www.baeldung.com/spring-boot-bean-validation)
+- [Spring Null-Safety Annotations](https://www.baeldung.com/spring-null-safety-annotations)
\ No newline at end of file
diff --git a/spring-core-2/src/main/java/com/baeldung/nullibility/Person.java b/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/nullibility/Person.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/nullibility/Person.java
rename to spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/nullibility/Person.java
diff --git a/spring-core-2/src/main/java/com/baeldung/nullibility/package-info.java b/spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/nullibility/package-info.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/nullibility/package-info.java
rename to spring-boot-modules/spring-boot-validation/src/main/java/com/baeldung/nullibility/package-info.java
diff --git a/spring-caching-2/README.md b/spring-boot-modules/spring-caching-2/README.md
similarity index 100%
rename from spring-caching-2/README.md
rename to spring-boot-modules/spring-caching-2/README.md
diff --git a/spring-caching-2/pom.xml b/spring-boot-modules/spring-caching-2/pom.xml
similarity index 91%
rename from spring-caching-2/pom.xml
rename to spring-boot-modules/spring-caching-2/pom.xml
index 0a07820fc4..6e33e42d2b 100644
--- a/spring-caching-2/pom.xml
+++ b/spring-boot-modules/spring-caching-2/pom.xml
@@ -9,10 +9,9 @@
     <packaging>jar</packaging>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2/pom.xml</relativePath>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/spring-caching-2/src/main/java/com/baeldung/caching/redis/CacheConfig.java b/spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/redis/CacheConfig.java
similarity index 100%
rename from spring-caching-2/src/main/java/com/baeldung/caching/redis/CacheConfig.java
rename to spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/redis/CacheConfig.java
diff --git a/spring-caching-2/src/main/java/com/baeldung/caching/redis/Item.java b/spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/redis/Item.java
similarity index 100%
rename from spring-caching-2/src/main/java/com/baeldung/caching/redis/Item.java
rename to spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/redis/Item.java
diff --git a/spring-caching-2/src/main/java/com/baeldung/caching/redis/ItemController.java b/spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/redis/ItemController.java
similarity index 100%
rename from spring-caching-2/src/main/java/com/baeldung/caching/redis/ItemController.java
rename to spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/redis/ItemController.java
diff --git a/spring-caching-2/src/main/java/com/baeldung/caching/redis/ItemRepository.java b/spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/redis/ItemRepository.java
similarity index 100%
rename from spring-caching-2/src/main/java/com/baeldung/caching/redis/ItemRepository.java
rename to spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/redis/ItemRepository.java
diff --git a/spring-caching-2/src/main/java/com/baeldung/caching/redis/ItemService.java b/spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/redis/ItemService.java
similarity index 100%
rename from spring-caching-2/src/main/java/com/baeldung/caching/redis/ItemService.java
rename to spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/redis/ItemService.java
diff --git a/spring-caching-2/src/main/java/com/baeldung/caching/redis/RedisCacheApplication.java b/spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/redis/RedisCacheApplication.java
similarity index 100%
rename from spring-caching-2/src/main/java/com/baeldung/caching/redis/RedisCacheApplication.java
rename to spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/redis/RedisCacheApplication.java
diff --git a/spring-caching-2/src/main/java/com/baeldung/caching/ttl/CachingTTLApplication.java b/spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/CachingTTLApplication.java
old mode 100755
new mode 100644
similarity index 100%
rename from spring-caching-2/src/main/java/com/baeldung/caching/ttl/CachingTTLApplication.java
rename to spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/CachingTTLApplication.java
diff --git a/spring-caching-2/src/main/java/com/baeldung/caching/ttl/config/SpringCachingConfig.java b/spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/config/SpringCachingConfig.java
similarity index 100%
rename from spring-caching-2/src/main/java/com/baeldung/caching/ttl/config/SpringCachingConfig.java
rename to spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/config/SpringCachingConfig.java
diff --git a/spring-caching-2/src/main/java/com/baeldung/caching/ttl/controller/HotelController.java b/spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/controller/HotelController.java
old mode 100755
new mode 100644
similarity index 100%
rename from spring-caching-2/src/main/java/com/baeldung/caching/ttl/controller/HotelController.java
rename to spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/controller/HotelController.java
diff --git a/spring-caching-2/src/main/java/com/baeldung/caching/ttl/exception/ControllerAdvisor.java b/spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/exception/ControllerAdvisor.java
similarity index 100%
rename from spring-caching-2/src/main/java/com/baeldung/caching/ttl/exception/ControllerAdvisor.java
rename to spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/exception/ControllerAdvisor.java
diff --git a/spring-caching-2/src/main/java/com/baeldung/caching/ttl/exception/ElementNotFoundException.java b/spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/exception/ElementNotFoundException.java
similarity index 100%
rename from spring-caching-2/src/main/java/com/baeldung/caching/ttl/exception/ElementNotFoundException.java
rename to spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/exception/ElementNotFoundException.java
diff --git a/spring-caching-2/src/main/java/com/baeldung/caching/ttl/model/City.java b/spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/model/City.java
similarity index 100%
rename from spring-caching-2/src/main/java/com/baeldung/caching/ttl/model/City.java
rename to spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/model/City.java
diff --git a/spring-caching-2/src/main/java/com/baeldung/caching/ttl/model/Hotel.java b/spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/model/Hotel.java
old mode 100755
new mode 100644
similarity index 100%
rename from spring-caching-2/src/main/java/com/baeldung/caching/ttl/model/Hotel.java
rename to spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/model/Hotel.java
diff --git a/spring-caching-2/src/main/java/com/baeldung/caching/ttl/repository/CityRepository.java b/spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/repository/CityRepository.java
similarity index 100%
rename from spring-caching-2/src/main/java/com/baeldung/caching/ttl/repository/CityRepository.java
rename to spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/repository/CityRepository.java
diff --git a/spring-caching-2/src/main/java/com/baeldung/caching/ttl/repository/HotelRepository.java b/spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/repository/HotelRepository.java
old mode 100755
new mode 100644
similarity index 100%
rename from spring-caching-2/src/main/java/com/baeldung/caching/ttl/repository/HotelRepository.java
rename to spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/repository/HotelRepository.java
diff --git a/spring-caching-2/src/main/java/com/baeldung/caching/ttl/service/HotelService.java b/spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/service/HotelService.java
old mode 100755
new mode 100644
similarity index 100%
rename from spring-caching-2/src/main/java/com/baeldung/caching/ttl/service/HotelService.java
rename to spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/service/HotelService.java
diff --git a/spring-caching-2/src/main/java/com/baeldung/caching/ttl/service/SpringCacheCustomizer.java b/spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/service/SpringCacheCustomizer.java
similarity index 100%
rename from spring-caching-2/src/main/java/com/baeldung/caching/ttl/service/SpringCacheCustomizer.java
rename to spring-boot-modules/spring-caching-2/src/main/java/com/baeldung/caching/ttl/service/SpringCacheCustomizer.java
diff --git a/spring-caching-2/src/main/resources/application.properties b/spring-boot-modules/spring-caching-2/src/main/resources/application.properties
similarity index 100%
rename from spring-caching-2/src/main/resources/application.properties
rename to spring-boot-modules/spring-caching-2/src/main/resources/application.properties
diff --git a/spring-caching-2/src/main/resources/data.sql b/spring-boot-modules/spring-caching-2/src/main/resources/data.sql
similarity index 100%
rename from spring-caching-2/src/main/resources/data.sql
rename to spring-boot-modules/spring-caching-2/src/main/resources/data.sql
diff --git a/spring-caching-2/src/test/java/com/baeldung/caching/redis/ItemServiceCachingIntegrationTest.java b/spring-boot-modules/spring-caching-2/src/test/java/com/baeldung/caching/redis/ItemServiceCachingIntegrationTest.java
similarity index 100%
rename from spring-caching-2/src/test/java/com/baeldung/caching/redis/ItemServiceCachingIntegrationTest.java
rename to spring-boot-modules/spring-caching-2/src/test/java/com/baeldung/caching/redis/ItemServiceCachingIntegrationTest.java
diff --git a/spring-caching-2/src/test/java/com/baeldung/caching/ttl/HotelControllerIntegrationTest.java b/spring-boot-modules/spring-caching-2/src/test/java/com/baeldung/caching/ttl/HotelControllerIntegrationTest.java
similarity index 100%
rename from spring-caching-2/src/test/java/com/baeldung/caching/ttl/HotelControllerIntegrationTest.java
rename to spring-boot-modules/spring-caching-2/src/test/java/com/baeldung/caching/ttl/HotelControllerIntegrationTest.java
diff --git a/spring-caching-2/src/test/java/com/baeldung/caching/ttl/SlowTest.java b/spring-boot-modules/spring-caching-2/src/test/java/com/baeldung/caching/ttl/SlowTest.java
similarity index 100%
rename from spring-caching-2/src/test/java/com/baeldung/caching/ttl/SlowTest.java
rename to spring-boot-modules/spring-caching-2/src/test/java/com/baeldung/caching/ttl/SlowTest.java
diff --git a/spring-caching-2/src/test/resources/application.properties b/spring-boot-modules/spring-caching-2/src/test/resources/application.properties
similarity index 100%
rename from spring-caching-2/src/test/resources/application.properties
rename to spring-boot-modules/spring-caching-2/src/test/resources/application.properties
diff --git a/spring-caching/README.md b/spring-boot-modules/spring-caching/README.md
similarity index 83%
rename from spring-caching/README.md
rename to spring-boot-modules/spring-caching/README.md
index e10d6080e8..4994c22c0b 100644
--- a/spring-caching/README.md
+++ b/spring-boot-modules/spring-caching/README.md
@@ -6,3 +6,4 @@
 - [Using Multiple Cache Managers in Spring](https://www.baeldung.com/spring-multiple-cache-managers)
 - [Testing @Cacheable on Spring Data Repositories](https://www.baeldung.com/spring-data-testing-cacheable)
 - [Spring Boot Ehcache Example](https://www.baeldung.com/spring-boot-ehcache)
+- [Get All Cached Keys with Caffeine Cache in Spring Boot](https://www.baeldung.com/spring-boot-caffeine-spring-get-all-keys)
diff --git a/spring-caching/pom.xml b/spring-boot-modules/spring-caching/pom.xml
similarity index 90%
rename from spring-caching/pom.xml
rename to spring-boot-modules/spring-caching/pom.xml
index 34c035a8ec..fa36b3af8b 100644
--- a/spring-caching/pom.xml
+++ b/spring-boot-modules/spring-caching/pom.xml
@@ -8,11 +8,10 @@
     <name>spring-caching</name>
     <packaging>war</packaging>
 
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <parent>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -65,7 +64,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.12</version>
+            <version>${lombok.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -79,6 +78,7 @@
 
     <properties>
         <ehcache.version>3.5.2</ehcache.version>
+        <lombok.version>1.18.26</lombok.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-caching/src/main/java/com/baeldung/allkeys/config/AllKeysConfig.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/allkeys/config/AllKeysConfig.java
new file mode 100644
index 0000000000..723a782a6a
--- /dev/null
+++ b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/allkeys/config/AllKeysConfig.java
@@ -0,0 +1,25 @@
+package com.baeldung.allkeys.config;
+
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.caffeine.CaffeineCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.baeldung.allkeys.service.SlowServiceWithCache;
+
+@Configuration
+@EnableCaching
+public class AllKeysConfig {
+
+    @Bean
+    SlowServiceWithCache slowServiceWithCache() {
+        return new SlowServiceWithCache();
+    }
+
+    @Bean
+    CacheManager cacheManager() {
+        return new CaffeineCacheManager();
+    }
+
+}
diff --git a/spring-boot-modules/spring-caching/src/main/java/com/baeldung/allkeys/service/SlowServiceWithCache.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/allkeys/service/SlowServiceWithCache.java
new file mode 100644
index 0000000000..74223c4231
--- /dev/null
+++ b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/allkeys/service/SlowServiceWithCache.java
@@ -0,0 +1,11 @@
+package com.baeldung.allkeys.service;
+
+import org.springframework.cache.annotation.CachePut;
+
+public class SlowServiceWithCache {
+
+    @CachePut(cacheNames = "slowServiceCache", key = "#name")
+    public String save(String name, String details) {
+        return details;
+    }
+}
diff --git a/spring-caching/src/main/java/com/baeldung/cachetest/Application.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/cachetest/Application.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/cachetest/Application.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/cachetest/Application.java
diff --git a/spring-caching/src/main/java/com/baeldung/cachetest/config/CacheConfig.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/cachetest/config/CacheConfig.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/cachetest/config/CacheConfig.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/cachetest/config/CacheConfig.java
diff --git a/spring-caching/src/main/java/com/baeldung/cachetest/config/CacheEventLogger.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/cachetest/config/CacheEventLogger.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/cachetest/config/CacheEventLogger.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/cachetest/config/CacheEventLogger.java
diff --git a/spring-caching/src/main/java/com/baeldung/cachetest/rest/NumberController.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/cachetest/rest/NumberController.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/cachetest/rest/NumberController.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/cachetest/rest/NumberController.java
diff --git a/spring-caching/src/main/java/com/baeldung/cachetest/service/NumberService.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/cachetest/service/NumberService.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/cachetest/service/NumberService.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/cachetest/service/NumberService.java
diff --git a/spring-caching/src/main/java/com/baeldung/caching/boot/CacheApplication.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/boot/CacheApplication.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/caching/boot/CacheApplication.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/boot/CacheApplication.java
diff --git a/spring-caching/src/main/java/com/baeldung/caching/boot/SimpleCacheCustomizer.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/boot/SimpleCacheCustomizer.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/caching/boot/SimpleCacheCustomizer.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/boot/SimpleCacheCustomizer.java
diff --git a/spring-caching/src/main/java/com/baeldung/caching/config/ApplicationCacheConfig.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/config/ApplicationCacheConfig.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/caching/config/ApplicationCacheConfig.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/config/ApplicationCacheConfig.java
diff --git a/spring-caching/src/main/java/com/baeldung/caching/config/CachingConfig.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/config/CachingConfig.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/caching/config/CachingConfig.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/config/CachingConfig.java
diff --git a/spring-caching/src/main/java/com/baeldung/caching/config/CustomKeyGenerator.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/config/CustomKeyGenerator.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/caching/config/CustomKeyGenerator.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/config/CustomKeyGenerator.java
diff --git a/spring-caching/src/main/java/com/baeldung/caching/eviction/controllers/CachingController.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/eviction/controllers/CachingController.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/caching/eviction/controllers/CachingController.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/eviction/controllers/CachingController.java
diff --git a/spring-caching/src/main/java/com/baeldung/caching/eviction/service/CachingService.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/eviction/service/CachingService.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/caching/eviction/service/CachingService.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/eviction/service/CachingService.java
diff --git a/spring-caching/src/main/java/com/baeldung/caching/example/AbstractService.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/example/AbstractService.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/caching/example/AbstractService.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/example/AbstractService.java
diff --git a/spring-caching/src/main/java/com/baeldung/caching/example/BookService.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/example/BookService.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/caching/example/BookService.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/example/BookService.java
diff --git a/spring-caching/src/main/java/com/baeldung/caching/example/Customer.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/example/Customer.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/caching/example/Customer.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/example/Customer.java
diff --git a/spring-caching/src/main/java/com/baeldung/caching/example/CustomerDataService.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/example/CustomerDataService.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/caching/example/CustomerDataService.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/example/CustomerDataService.java
diff --git a/spring-caching/src/main/java/com/baeldung/caching/example/CustomerServiceWithParent.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/example/CustomerServiceWithParent.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/caching/example/CustomerServiceWithParent.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/example/CustomerServiceWithParent.java
diff --git a/spring-caching/src/main/java/com/baeldung/caching/model/Book.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/model/Book.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/caching/model/Book.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/caching/model/Book.java
diff --git a/spring-caching/src/main/java/com/baeldung/ehcache/calculator/SquaredCalculator.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/ehcache/calculator/SquaredCalculator.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/ehcache/calculator/SquaredCalculator.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/ehcache/calculator/SquaredCalculator.java
diff --git a/spring-caching/src/main/java/com/baeldung/ehcache/config/CacheHelper.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/ehcache/config/CacheHelper.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/ehcache/config/CacheHelper.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/ehcache/config/CacheHelper.java
diff --git a/spring-caching/src/main/java/com/baeldung/multiplecachemanager/bo/CustomerDetailBO.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/bo/CustomerDetailBO.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/multiplecachemanager/bo/CustomerDetailBO.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/bo/CustomerDetailBO.java
diff --git a/spring-caching/src/main/java/com/baeldung/multiplecachemanager/bo/OrderDetailBO.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/bo/OrderDetailBO.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/multiplecachemanager/bo/OrderDetailBO.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/bo/OrderDetailBO.java
diff --git a/spring-caching/src/main/java/com/baeldung/multiplecachemanager/config/MultipleCacheManagerConfig.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/config/MultipleCacheManagerConfig.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/multiplecachemanager/config/MultipleCacheManagerConfig.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/config/MultipleCacheManagerConfig.java
diff --git a/spring-caching/src/main/java/com/baeldung/multiplecachemanager/config/MultipleCacheResolver.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/config/MultipleCacheResolver.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/multiplecachemanager/config/MultipleCacheResolver.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/config/MultipleCacheResolver.java
diff --git a/spring-caching/src/main/java/com/baeldung/multiplecachemanager/controller/MultipleCacheManagerController.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/controller/MultipleCacheManagerController.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/multiplecachemanager/controller/MultipleCacheManagerController.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/controller/MultipleCacheManagerController.java
diff --git a/spring-caching/src/main/java/com/baeldung/multiplecachemanager/entity/Customer.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/entity/Customer.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/multiplecachemanager/entity/Customer.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/entity/Customer.java
diff --git a/spring-caching/src/main/java/com/baeldung/multiplecachemanager/entity/Item.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/entity/Item.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/multiplecachemanager/entity/Item.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/entity/Item.java
diff --git a/spring-caching/src/main/java/com/baeldung/multiplecachemanager/entity/Order.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/entity/Order.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/multiplecachemanager/entity/Order.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/entity/Order.java
diff --git a/spring-caching/src/main/java/com/baeldung/multiplecachemanager/repository/CustomerDetailRepository.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/repository/CustomerDetailRepository.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/multiplecachemanager/repository/CustomerDetailRepository.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/repository/CustomerDetailRepository.java
diff --git a/spring-caching/src/main/java/com/baeldung/multiplecachemanager/repository/OrderDetailRepository.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/repository/OrderDetailRepository.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/multiplecachemanager/repository/OrderDetailRepository.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/multiplecachemanager/repository/OrderDetailRepository.java
diff --git a/spring-caching/src/main/java/com/baeldung/springdatacaching/model/Book.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/springdatacaching/model/Book.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/springdatacaching/model/Book.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/springdatacaching/model/Book.java
diff --git a/spring-caching/src/main/java/com/baeldung/springdatacaching/repositories/BookRepository.java b/spring-boot-modules/spring-caching/src/main/java/com/baeldung/springdatacaching/repositories/BookRepository.java
similarity index 100%
rename from spring-caching/src/main/java/com/baeldung/springdatacaching/repositories/BookRepository.java
rename to spring-boot-modules/spring-caching/src/main/java/com/baeldung/springdatacaching/repositories/BookRepository.java
diff --git a/spring-caching/src/main/resources/application.properties b/spring-boot-modules/spring-caching/src/main/resources/application.properties
similarity index 100%
rename from spring-caching/src/main/resources/application.properties
rename to spring-boot-modules/spring-caching/src/main/resources/application.properties
diff --git a/spring-caching/src/main/resources/config.xml b/spring-boot-modules/spring-caching/src/main/resources/config.xml
similarity index 100%
rename from spring-caching/src/main/resources/config.xml
rename to spring-boot-modules/spring-caching/src/main/resources/config.xml
diff --git a/spring-caching/src/main/resources/data.sql b/spring-boot-modules/spring-caching/src/main/resources/data.sql
similarity index 100%
rename from spring-caching/src/main/resources/data.sql
rename to spring-boot-modules/spring-caching/src/main/resources/data.sql
diff --git a/spring-caching/src/main/resources/ehcache.xml b/spring-boot-modules/spring-caching/src/main/resources/ehcache.xml
similarity index 100%
rename from spring-caching/src/main/resources/ehcache.xml
rename to spring-boot-modules/spring-caching/src/main/resources/ehcache.xml
diff --git a/spring-boot-modules/spring-caching/src/main/resources/logback.xml b/spring-boot-modules/spring-caching/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/spring-boot-modules/spring-caching/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/spring-caching/src/main/resources/schema.sql b/spring-boot-modules/spring-caching/src/main/resources/schema.sql
similarity index 100%
rename from spring-caching/src/main/resources/schema.sql
rename to spring-boot-modules/spring-caching/src/main/resources/schema.sql
diff --git a/spring-boot-modules/spring-caching/src/test/java/com/baeldung/caching/allkeys/boot/GetAllCacheKeysIntegrationTest.java b/spring-boot-modules/spring-caching/src/test/java/com/baeldung/caching/allkeys/boot/GetAllCacheKeysIntegrationTest.java
new file mode 100644
index 0000000000..2104eee8de
--- /dev/null
+++ b/spring-boot-modules/spring-caching/src/test/java/com/baeldung/caching/allkeys/boot/GetAllCacheKeysIntegrationTest.java
@@ -0,0 +1,44 @@
+package com.baeldung.caching.allkeys.boot;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.caffeine.CaffeineCache;
+import org.springframework.cache.caffeine.CaffeineCacheManager;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.allkeys.config.AllKeysConfig;
+import com.baeldung.allkeys.service.SlowServiceWithCache;
+import com.github.benmanes.caffeine.cache.Cache;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@ContextConfiguration(classes = AllKeysConfig.class)
+public class GetAllCacheKeysIntegrationTest {
+
+    @Autowired
+    private SlowServiceWithCache slowServiceWithCache;
+    @Autowired
+    private CacheManager cacheManager;
+
+    @Test
+    public void givenCaffeineCacheCachingSlowCalls_whenCacheManagerProperlyCasted_thenAllKeysAreAccessible() {
+        slowServiceWithCache.save("first", "some-value-first");
+        slowServiceWithCache.save("second", "other-value-second");
+
+        Cache<Object, Object> caffeine = getNativeCaffeineCacheForSlowService();
+
+        assertThat(caffeine.asMap().keySet()).containsOnly("first", "second");
+    }
+
+    private Cache<Object, Object> getNativeCaffeineCacheForSlowService() {
+        CaffeineCacheManager caffeineCacheManager = (CaffeineCacheManager) cacheManager;
+        CaffeineCache cache = (CaffeineCache) caffeineCacheManager.getCache("slowServiceCache");
+        return cache.getNativeCache();
+    }
+}
\ No newline at end of file
diff --git a/spring-caching/src/test/java/com/baeldung/caching/boot/SimpleCacheCustomizerIntegrationTest.java b/spring-boot-modules/spring-caching/src/test/java/com/baeldung/caching/boot/SimpleCacheCustomizerIntegrationTest.java
similarity index 100%
rename from spring-caching/src/test/java/com/baeldung/caching/boot/SimpleCacheCustomizerIntegrationTest.java
rename to spring-boot-modules/spring-caching/src/test/java/com/baeldung/caching/boot/SimpleCacheCustomizerIntegrationTest.java
diff --git a/spring-caching/src/test/java/com/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java b/spring-boot-modules/spring-caching/src/test/java/com/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
similarity index 100%
rename from spring-caching/src/test/java/com/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
rename to spring-boot-modules/spring-caching/src/test/java/com/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java
diff --git a/spring-caching/src/test/java/com/baeldung/caching/test/CacheManagerEvictIntegrationTest.java b/spring-boot-modules/spring-caching/src/test/java/com/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
similarity index 100%
rename from spring-caching/src/test/java/com/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
rename to spring-boot-modules/spring-caching/src/test/java/com/baeldung/caching/test/CacheManagerEvictIntegrationTest.java
diff --git a/spring-caching/src/test/java/com/baeldung/caching/test/SpringCachingIntegrationTest.java b/spring-boot-modules/spring-caching/src/test/java/com/baeldung/caching/test/SpringCachingIntegrationTest.java
similarity index 100%
rename from spring-caching/src/test/java/com/baeldung/caching/test/SpringCachingIntegrationTest.java
rename to spring-boot-modules/spring-caching/src/test/java/com/baeldung/caching/test/SpringCachingIntegrationTest.java
diff --git a/spring-caching/src/test/java/com/baeldung/ehcache/SquareCalculatorUnitTest.java b/spring-boot-modules/spring-caching/src/test/java/com/baeldung/ehcache/SquareCalculatorUnitTest.java
similarity index 100%
rename from spring-caching/src/test/java/com/baeldung/ehcache/SquareCalculatorUnitTest.java
rename to spring-boot-modules/spring-caching/src/test/java/com/baeldung/ehcache/SquareCalculatorUnitTest.java
diff --git a/spring-caching/src/test/java/com/baeldung/multiplecachemanager/MultipleCacheManagerIntegrationTest.java b/spring-boot-modules/spring-caching/src/test/java/com/baeldung/multiplecachemanager/MultipleCacheManagerIntegrationTest.java
similarity index 100%
rename from spring-caching/src/test/java/com/baeldung/multiplecachemanager/MultipleCacheManagerIntegrationTest.java
rename to spring-boot-modules/spring-caching/src/test/java/com/baeldung/multiplecachemanager/MultipleCacheManagerIntegrationTest.java
diff --git a/spring-caching/src/test/java/com/baeldung/springdatacaching/repositories/BookRepositoryCachingIntegrationTest.java b/spring-boot-modules/spring-caching/src/test/java/com/baeldung/springdatacaching/repositories/BookRepositoryCachingIntegrationTest.java
similarity index 100%
rename from spring-caching/src/test/java/com/baeldung/springdatacaching/repositories/BookRepositoryCachingIntegrationTest.java
rename to spring-boot-modules/spring-caching/src/test/java/com/baeldung/springdatacaching/repositories/BookRepositoryCachingIntegrationTest.java
diff --git a/spring-caching/src/test/java/com/baeldung/springdatacaching/repositories/BookRepositoryIntegrationTest.java b/spring-boot-modules/spring-caching/src/test/java/com/baeldung/springdatacaching/repositories/BookRepositoryIntegrationTest.java
similarity index 100%
rename from spring-caching/src/test/java/com/baeldung/springdatacaching/repositories/BookRepositoryIntegrationTest.java
rename to spring-boot-modules/spring-caching/src/test/java/com/baeldung/springdatacaching/repositories/BookRepositoryIntegrationTest.java
diff --git a/spring-boot-rest/pom.xml b/spring-boot-rest/pom.xml
index f81286adb6..46563b725f 100644
--- a/spring-boot-rest/pom.xml
+++ b/spring-boot-rest/pom.xml
@@ -20,6 +20,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                  <artifactId>tomcat-embed-el</artifactId>
+                  <groupId>org.apache.tomcat.embed</groupId>
+                </exclusion>
+             </exclusions>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -42,37 +48,106 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <exclusions>
+                <exclusion>
+                  <artifactId>jakarta.xml.bind-api</artifactId>
+                  <groupId>jakarta.xml.bind</groupId>
+                </exclusion>
+                <exclusion>
+                  <artifactId>txw2</artifactId>
+                  <groupId>org.glassfish.jaxb</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-rest</artifactId>
+            <exclusions>
+                <exclusion>
+                  <artifactId>spring-boot-starter-web</artifactId>
+                  <groupId>org.springframework.boot</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- Spring HATEOAS -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-hateoas</artifactId>
+            <exclusions>
+                <exclusion>
+                  <artifactId>spring-boot-starter-web</artifactId>
+                  <groupId>org.springframework.boot</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- util -->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
+            <exclusions>
+                <exclusion>
+                  <artifactId>listenablefuture</artifactId>
+                  <groupId>com.google.guava</groupId>
+                </exclusion>
+                <exclusion>
+                  <artifactId>jsr305</artifactId>
+                  <groupId>com.google.code.findbugs</groupId>
+                </exclusion>
+                <exclusion>
+                  <artifactId>error_prone_annotations</artifactId>
+                  <groupId>com.google.errorprone</groupId>
+                </exclusion>
+                <exclusion>
+                  <artifactId>j2objc-annotations</artifactId>
+                  <groupId>com.google.j2objc</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                  <artifactId>jakarta.xml.bind-api</artifactId>
+                  <groupId>jakarta.xml.bind</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                  <artifactId>commons-logging</artifactId>
+                  <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.modelmapper</groupId>
             <artifactId>modelmapper</artifactId>
             <version>${modelmapper.version}</version>
         </dependency>
+        <dependency>
+          <groupId>io.rest-assured</groupId>
+          <artifactId>rest-assured</artifactId>
+          <version>3.3.0</version>
+          <scope>provided</scope>
+          <exclusions>
+            <exclusion>
+              <artifactId>hamcrest-library</artifactId>
+              <groupId>org.hamcrest</groupId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${jaxb-runtime.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -88,6 +163,7 @@
         <start-class>com.baeldung.SpringBootRestApplication</start-class>
         <xstream.version>1.4.11.1</xstream.version>
         <modelmapper.version>3.1.0</modelmapper.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
+        <jaxb-runtime.version>2.3.7</jaxb-runtime.version>
     </properties>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-boot-rest/src/main/java/com/baeldung/springpagination/repository/PostRepository.java b/spring-boot-rest/src/main/java/com/baeldung/springpagination/repository/PostRepository.java
index acdc01df94..62f05f8262 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/springpagination/repository/PostRepository.java
+++ b/spring-boot-rest/src/main/java/com/baeldung/springpagination/repository/PostRepository.java
@@ -10,7 +10,7 @@ import org.springframework.data.repository.query.Param;
 import com.baeldung.springpagination.model.Post;
 import com.baeldung.springpagination.model.User;
 
-public interface PostRepository extends JpaRepository<Post, Long>, PagingAndSortingRepository<Post, Long> {
+public interface PostRepository extends JpaRepository<Post, Long> {
 
     @Query("select u from Post u where u.userName=:userName")
     Page<Post> findByUser(@Param("userName") String userName, Pageable pageReq);
diff --git a/spring-cloud-modules/pom.xml b/spring-cloud-modules/pom.xml
index 43e2687d74..dafc5b628e 100644
--- a/spring-cloud-modules/pom.xml
+++ b/spring-cloud-modules/pom.xml
@@ -54,8 +54,8 @@
         <module>spring-cloud-bus</module>
         <module>spring-cloud-data-flow</module>
         <module>spring-cloud-sleuth</module>
-        <module>spring-cloud-openfeign-2</module>
-	<module>spring-cloud-open-telemetry</module>
+        <module>spring-cloud-open-telemetry</module>
+        <module>spring-cloud-azure</module>
     </modules>
 
     <build>
diff --git a/spring-cloud-modules/spring-cloud-azure/README.md b/spring-cloud-modules/spring-cloud-azure/README.md
new file mode 100644
index 0000000000..7f0e9815ae
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-azure/README.md
@@ -0,0 +1,13 @@
+# Spring Cloud Azure
+
+# Relevant Articles
+- [A Guide to Spring Cloud Azure Key Vault](https://www.baeldung.com/spring-cloud-azure-key-vault)
+# Azure KeyVault: 
+In order to create the secrets, follow these steps: 
+- create an Azure account 
+- install the Azure Cli an run the following commands
+- login on Azure -> _az-login_
+- create a resource group: _az group create --name spring_cloud_azure --location eastus_
+- create a keyvault storage: _az keyvault create --name new_keyvault --resource-group spring_cloud_azure --location eastus_
+- create the secrets: > az keyvault secret set --name my-database-secret --value my-database-secret-value --vault-name new_keyvault,> az keyvault secret set --name my-secret --value my-secret-value --vault-name new_keyvault
+```
diff --git a/spring-cloud-modules/spring-cloud-azure/pom.xml b/spring-cloud-modules/spring-cloud-azure/pom.xml
new file mode 100644
index 0000000000..86706c794f
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-azure/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>
+    <groupId>com.baeldung.spring.cloud</groupId>
+    <artifactId>spring-cloud-azure</artifactId>
+    <name>spring-cloud-azure</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+    <packaging>jar</packaging>
+    <description>Spring Cloud Azure Examples</description>
+    <version>1.0.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>2.7.8</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud-dependencies.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>com.azure.spring</groupId>
+            <artifactId>spring-cloud-azure-starter-keyvault-secrets</artifactId>
+            <version>${azure-key-vault-extension-version}</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <spring-cloud-dependencies.version>2021.0.3</spring-cloud-dependencies.version>
+        <azure-key-vault-extension-version>4.0.0</azure-key-vault-extension-version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-azure/src/main/java/com/baeldung/spring/cloud/azure/keyvault/Application.java b/spring-cloud-modules/spring-cloud-azure/src/main/java/com/baeldung/spring/cloud/azure/keyvault/Application.java
new file mode 100644
index 0000000000..8a44a502de
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-azure/src/main/java/com/baeldung/spring/cloud/azure/keyvault/Application.java
@@ -0,0 +1,36 @@
+package com.baeldung.spring.cloud.azure.keyvault;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import com.azure.security.keyvault.secrets.models.KeyVaultSecret;
+import com.baeldung.spring.cloud.azure.keyvault.service.KeyVaultClient;
+import com.baeldung.spring.cloud.azure.keyvault.service.KeyVaultAutoconfiguredClient;
+
+@SpringBootApplication
+public class Application implements CommandLineRunner {
+
+    @Value("${database.secret.value}")
+    private String mySecret;
+
+    private final KeyVaultClient keyVaultClient;
+
+    public Application(@Qualifier(value = "KeyVaultAutoconfiguredClient") KeyVaultAutoconfiguredClient keyVaultAutoconfiguredClient) {
+        this.keyVaultClient = keyVaultAutoconfiguredClient;
+    }
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class);
+
+    }
+
+    @Override
+    public void run(String... args) throws Exception {
+        //KeyVaultSecret keyVaultSecret = keyVaultClient.getSecret("my-secret");
+        //System.out.println("Hey, our secret is here ->" + keyVaultSecret.getValue());
+        //System.out.println("Hey, our secret is here from application properties file ->" + mySecret);
+    }
+}
diff --git a/spring-cloud-modules/spring-cloud-azure/src/main/java/com/baeldung/spring/cloud/azure/keyvault/data/KeyVaultProperties.java b/spring-cloud-modules/spring-cloud-azure/src/main/java/com/baeldung/spring/cloud/azure/keyvault/data/KeyVaultProperties.java
new file mode 100644
index 0000000000..edd7c01416
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-azure/src/main/java/com/baeldung/spring/cloud/azure/keyvault/data/KeyVaultProperties.java
@@ -0,0 +1,52 @@
+package com.baeldung.spring.cloud.azure.keyvault.data;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.ConstructorBinding;
+
+@ConfigurationProperties("azure.keyvault")
+@ConstructorBinding
+public class KeyVaultProperties {
+    private String vaultUrl;
+    private String tenantId;
+    private String clientId;
+    private String clientSecret;
+
+    public KeyVaultProperties(String vaultUrl, String tenantId, String clientId, String clientSecret) {
+        this.vaultUrl = vaultUrl;
+        this.tenantId = tenantId;
+        this.clientId = clientId;
+        this.clientSecret = clientSecret;
+    }
+
+    public String getVaultUrl() {
+        return vaultUrl;
+    }
+
+    public void setVaultUrl(String vaultUrl) {
+        this.vaultUrl = vaultUrl;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+    public String getClientSecret() {
+        return clientSecret;
+    }
+
+    public void setClientSecret(String clientSecret) {
+        this.clientSecret = clientSecret;
+    }
+}
diff --git a/spring-cloud-modules/spring-cloud-azure/src/main/java/com/baeldung/spring/cloud/azure/keyvault/service/KeyVaultAutoconfiguredClient.java b/spring-cloud-modules/spring-cloud-azure/src/main/java/com/baeldung/spring/cloud/azure/keyvault/service/KeyVaultAutoconfiguredClient.java
new file mode 100644
index 0000000000..392c15c6b4
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-azure/src/main/java/com/baeldung/spring/cloud/azure/keyvault/service/KeyVaultAutoconfiguredClient.java
@@ -0,0 +1,19 @@
+package com.baeldung.spring.cloud.azure.keyvault.service;
+
+import org.springframework.stereotype.Component;
+
+import com.azure.security.keyvault.secrets.SecretClient;
+
+@Component("KeyVaultAutoconfiguredClient")
+public class KeyVaultAutoconfiguredClient implements KeyVaultClient {
+    private final SecretClient secretClient;
+
+    public KeyVaultAutoconfiguredClient(SecretClient secretClient) {
+        this.secretClient = secretClient;
+    }
+
+    @Override
+    public SecretClient getSecretClient() {
+        return secretClient;
+    }
+}
diff --git a/spring-cloud-modules/spring-cloud-azure/src/main/java/com/baeldung/spring/cloud/azure/keyvault/service/KeyVaultClient.java b/spring-cloud-modules/spring-cloud-azure/src/main/java/com/baeldung/spring/cloud/azure/keyvault/service/KeyVaultClient.java
new file mode 100644
index 0000000000..4f4148250e
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-azure/src/main/java/com/baeldung/spring/cloud/azure/keyvault/service/KeyVaultClient.java
@@ -0,0 +1,21 @@
+package com.baeldung.spring.cloud.azure.keyvault.service;
+
+import java.util.NoSuchElementException;
+
+import com.azure.security.keyvault.secrets.SecretClient;
+import com.azure.security.keyvault.secrets.models.KeyVaultSecret;
+
+public interface KeyVaultClient {
+
+    SecretClient getSecretClient();
+
+    default KeyVaultSecret getSecret(String key) {
+        KeyVaultSecret secret;
+        try {
+            secret = getSecretClient().getSecret(key);
+        } catch (Exception ex) {
+            throw new NoSuchElementException();
+        }
+        return secret;
+    }
+}
diff --git a/spring-cloud-modules/spring-cloud-azure/src/main/java/com/baeldung/spring/cloud/azure/keyvault/service/KeyVaultManuallyConfiguredClient.java b/spring-cloud-modules/spring-cloud-azure/src/main/java/com/baeldung/spring/cloud/azure/keyvault/service/KeyVaultManuallyConfiguredClient.java
new file mode 100644
index 0000000000..33a85f6bb9
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-azure/src/main/java/com/baeldung/spring/cloud/azure/keyvault/service/KeyVaultManuallyConfiguredClient.java
@@ -0,0 +1,31 @@
+package com.baeldung.spring.cloud.azure.keyvault.service;
+
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import com.azure.identity.ClientSecretCredentialBuilder;
+import com.azure.security.keyvault.secrets.SecretClient;
+import com.azure.security.keyvault.secrets.SecretClientBuilder;
+import com.baeldung.spring.cloud.azure.keyvault.data.KeyVaultProperties;
+
+@EnableConfigurationProperties(KeyVaultProperties.class)
+@Component("KeyVaultManuallyConfiguredClient")
+public class KeyVaultManuallyConfiguredClient implements KeyVaultClient {
+
+    private KeyVaultProperties keyVaultProperties;
+
+    private SecretClient secretClient;
+
+    @Override
+    public SecretClient getSecretClient() {
+        if (secretClient == null) {
+            secretClient = new SecretClientBuilder().vaultUrl(keyVaultProperties.getVaultUrl())
+              .credential(new ClientSecretCredentialBuilder().tenantId(keyVaultProperties.getTenantId())
+                .clientId(keyVaultProperties.getClientId())
+                .clientSecret(keyVaultProperties.getClientSecret())
+                .build())
+              .buildClient();
+        }
+        return secretClient;
+    }
+}
diff --git a/spring-cloud-modules/spring-cloud-azure/src/main/resources/application.yaml b/spring-cloud-modules/spring-cloud-azure/src/main/resources/application.yaml
new file mode 100644
index 0000000000..4bea8d789b
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-azure/src/main/resources/application.yaml
@@ -0,0 +1,21 @@
+spring:
+  cloud:
+    azure:
+      compatibility-verifier:
+        enabled: false
+      keyvault:
+        secret:
+          property-sources[0]:
+            name: key-vault-property-source-1
+            endpoint: https://spring-cloud-azure.vault.azure.net/
+          property-source-enabled: true
+          endpoint: https://spring-cloud-azure.vault.azure.net/
+azure:
+  keyvault:
+    vaultUrl: myVaultUrl
+    tenantId: myTenantId
+    clientId: myClientId
+    clientSecret: myClientSecret
+database:
+  secret:
+    value: ${my-database-secret}
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-azure/src/test/java/com/baeldung/spring/cloud/azure/keyvault/KeyVaultAutoconfiguredClientIntegrationTest.java b/spring-cloud-modules/spring-cloud-azure/src/test/java/com/baeldung/spring/cloud/azure/keyvault/KeyVaultAutoconfiguredClientIntegrationTest.java
new file mode 100644
index 0000000000..d480bc33d4
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-azure/src/test/java/com/baeldung/spring/cloud/azure/keyvault/KeyVaultAutoconfiguredClientIntegrationTest.java
@@ -0,0 +1,26 @@
+package com.baeldung.spring.cloud.azure.keyvault;
+
+import java.util.NoSuchElementException;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import com.baeldung.spring.cloud.azure.keyvault.service.KeyVaultAutoconfiguredClient;
+
+@SpringBootTest(classes = Application.class)
+public class KeyVaultAutoconfiguredClientIntegrationTest {
+
+    @Autowired
+    @Qualifier(value = "KeyVaultAutoconfiguredClient")
+    private KeyVaultAutoconfiguredClient keyVaultAutoconfiguredClient;
+
+    @Test
+    void whenANotExistingKeyIsProvided_thenShouldReturnAnError() {
+        String secretKey = "mySecret";
+        Assertions.assertThrows(NoSuchElementException.class, () -> keyVaultAutoconfiguredClient.getSecret(secretKey));
+    }
+
+}
diff --git a/spring-cloud-modules/spring-cloud-azure/src/test/resources/application.yaml b/spring-cloud-modules/spring-cloud-azure/src/test/resources/application.yaml
new file mode 100644
index 0000000000..88c54b32eb
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-azure/src/test/resources/application.yaml
@@ -0,0 +1,21 @@
+spring:
+  cloud:
+    azure:
+      compatibility-verifier:
+        enabled: false
+      keyvault:
+        secret:
+          endpoint: https://spring-cloud-azure.vault.azure.net/
+          property-source-enabled: true
+          property-sources:
+            name: key-vault-property-source-1
+            endpoint: https://spring-cloud-azure.vault.azure.net/
+azure:
+  keyvault:
+    vaultUrl: myVaultUrl
+    tenantId: myTenantId
+    clientId: myClientId
+    clientSecret: myClientSecret
+database:
+  secret:
+    value: my-database-secret
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java
index 79785a3f20..8fc75e1ff6 100644
--- a/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java
+++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java
@@ -1,7 +1,5 @@
 package com.baeldung.spring.cloud.bootstrap.gateway;
 
-import com.baeldung.spring.cloud.bootstrap.gateway.client.book.BooksClient;
-import com.baeldung.spring.cloud.bootstrap.gateway.client.rating.RatingsClient;
 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.EurekaClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,8 +17,6 @@ import org.springframework.cloud.sleuth.zipkin.HttpZipkinSpanReporter;
 import org.springframework.cloud.sleuth.zipkin.ZipkinProperties;
 import org.springframework.cloud.sleuth.zipkin.ZipkinSpanReporter;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.FilterType;
 import org.springframework.web.client.RestTemplate;
 import zipkin.Span;
 
@@ -69,11 +65,10 @@ public class GatewayApplication {
             @Override
             public void report(Span span) {
                 InstanceInfo instance = eurekaClient.getNextServerFromEureka("zipkin", false);
-                if (!(baseUrl != null && instance.getHomePageUrl().equals(baseUrl))) {
+                if (baseUrl == null || !instance.getHomePageUrl().equals(baseUrl)) {
                     baseUrl = instance.getHomePageUrl();
-                    delegate = new HttpZipkinSpanReporter(new RestTemplate(), baseUrl, zipkinProperties.getFlushInterval(), spanMetricReporter);
-                    if (!span.name.matches(skipPattern)) delegate.report(span);
                 }
+                delegate = new HttpZipkinSpanReporter(new RestTemplate(), baseUrl, zipkinProperties.getFlushInterval(), spanMetricReporter);
                 if (!span.name.matches(skipPattern)) delegate.report(span);
             }
         };
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java
index 91fd23e32d..d787b5e407 100644
--- a/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java
+++ b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java
@@ -42,11 +42,11 @@ public class BookServiceApplication {
             @Override
             public void report(Span span) {
                 InstanceInfo instance = eurekaClient.getNextServerFromEureka("zipkin", false);
-                if (!(baseUrl != null && instance.getHomePageUrl().equals(baseUrl))) {
+                if (baseUrl == null || !instance.getHomePageUrl().equals(baseUrl)) {
                     baseUrl = instance.getHomePageUrl();
-                    delegate = new HttpZipkinSpanReporter(new RestTemplate(), baseUrl, zipkinProperties.getFlushInterval(), spanMetricReporter);
-                    if (!span.name.matches(skipPattern)) delegate.report(span);
                 }
+                delegate = new HttpZipkinSpanReporter(new RestTemplate(), baseUrl, zipkinProperties.getFlushInterval(), spanMetricReporter);
+                if (!span.name.matches(skipPattern)) delegate.report(span);
             }
         };
     }
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java
index 8dacbaa79d..5a94f19472 100644
--- a/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java
+++ b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java
@@ -51,11 +51,10 @@ public class RatingServiceApplication {
             @Override
             public void report(Span span) {
                 InstanceInfo instance = eurekaClient.getNextServerFromEureka("zipkin", false);
-                if (!(baseUrl != null && instance.getHomePageUrl().equals(baseUrl))) {
+                if (baseUrl == null || !instance.getHomePageUrl().equals(baseUrl)) {
                     baseUrl = instance.getHomePageUrl();
-                    delegate = new HttpZipkinSpanReporter(new RestTemplate(), baseUrl, zipkinProperties.getFlushInterval(), spanMetricReporter);
-                    if (!span.name.matches(skipPattern)) delegate.report(span);
                 }
+                delegate = new HttpZipkinSpanReporter(new RestTemplate(), baseUrl, zipkinProperties.getFlushInterval(), spanMetricReporter);
                 if (!span.name.matches(skipPattern)) delegate.report(span);
             }
         };
diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/Dockerfile b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/Dockerfile
index bd8cf2918f..3b74dd73df 100644
--- a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/Dockerfile
+++ b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/Dockerfile
@@ -1,5 +1,5 @@
 FROM openjdk:8-jdk-alpine
 VOLUME /tmp
-COPY target/client-service-1.0-SNAPSHOT.jar app.jar
+COPY target/client-service-1.0.0-SNAPSHOT.jar app.jar
 ENV JAVA_OPTS=""
 ENTRYPOINT exec java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9999 -jar /app.jar
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/Dockerfile b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/Dockerfile
index 30b66d5eff..b2688cbade 100644
--- a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/Dockerfile
+++ b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/Dockerfile
@@ -1,5 +1,5 @@
 FROM openjdk:8-jdk-alpine
 VOLUME /tmp
-COPY target/travel-agency-service-1.0-SNAPSHOT.jar app.jar
+COPY target/travel-agency-service-1.0.0-SNAPSHOT.jar app.jar
 ENV JAVA_OPTS=""
 ENTRYPOINT exec java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9999 -jar /app.jar
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-open-telemetry/docker-compose.yml b/spring-cloud-modules/spring-cloud-open-telemetry/docker-compose.yml
index 8a6833095c..7ee2f67c0f 100644
--- a/spring-cloud-modules/spring-cloud-open-telemetry/docker-compose.yml
+++ b/spring-cloud-modules/spring-cloud-open-telemetry/docker-compose.yml
@@ -20,7 +20,7 @@ services:
       - "14250"
 
   collector:
-    image: otel/opentelemetry-collector:0.47.0
+    image: otel/opentelemetry-collector:0.72.0
     command: [ "--config=/etc/otel-collector-config.yml" ]
     volumes:
       - ./otel-config.yml:/etc/otel-collector-config.yml
diff --git a/spring-cloud-modules/spring-cloud-open-telemetry/otel-config.yml b/spring-cloud-modules/spring-cloud-open-telemetry/otel-config.yml
index 886c10a1c3..4402603a85 100644
--- a/spring-cloud-modules/spring-cloud-open-telemetry/otel-config.yml
+++ b/spring-cloud-modules/spring-cloud-open-telemetry/otel-config.yml
@@ -9,7 +9,7 @@ processors:
 
 exporters:
   logging:
-    logLevel: debug
+    loglevel: debug
   jaeger:
     endpoint: jaeger-service:14250
     tls:
diff --git a/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/Dockerfile b/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/Dockerfile
index 8bae52cec4..50cd35ed84 100644
--- a/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/Dockerfile
+++ b/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/Dockerfile
@@ -2,6 +2,6 @@ FROM adoptopenjdk/openjdk11:alpine
 
 COPY target/spring-cloud-open-telemetry1-1.0.0-SNAPSHOT.jar spring-cloud-open-telemetry.jar
 
-EXPOSE 8081
+EXPOSE 8080
 
 ENTRYPOINT ["java","-jar","/spring-cloud-open-telemetry.jar"]
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/pom.xml b/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/pom.xml
index 5011590e73..3003113085 100644
--- a/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/pom.xml
+++ b/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry1/pom.xml
@@ -62,12 +62,8 @@
         </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-exporter-otlp-trace</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-okhttp</artifactId>
-            <version>${grpc-okhttp.version}</version>
+            <artifactId>opentelemetry-exporter-otlp</artifactId>
+            <version>${otel-exporter-otlp.version}</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -93,24 +89,11 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <url>https://repo.spring.io/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <properties>
-        <spring-boot-dependencies.version>2.5.7</spring-boot-dependencies.version>
-        <release.train.version>2020.0.4</release.train.version>
-        <spring-cloud-sleuth-otel.version>1.0.0-M12</spring-cloud-sleuth-otel.version>
-        <grpc-okhttp.version>1.42.1</grpc-okhttp.version>
+        <spring-boot-dependencies.version>2.7.9</spring-boot-dependencies.version>
+        <release.train.version>2021.0.5</release.train.version>
+        <spring-cloud-sleuth-otel.version>1.1.2</spring-cloud-sleuth-otel.version>
+        <otel-exporter-otlp.version>1.23.1</otel-exporter-otlp.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry2/pom.xml b/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry2/pom.xml
index 2d7ac8204e..4f56cc717e 100644
--- a/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry2/pom.xml
+++ b/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry2/pom.xml
@@ -61,12 +61,8 @@
         </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-exporter-otlp-trace</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-okhttp</artifactId>
-            <version>${grpc-okhttp.version}</version>
+            <artifactId>opentelemetry-exporter-otlp</artifactId>
+            <version>${otel-exporter-otlp.version}</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -92,24 +88,11 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <url>https://repo.spring.io/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <properties>
-        <spring-boot-dependencies.version>2.5.7</spring-boot-dependencies.version>
-        <release.train.version>2020.0.4</release.train.version>
-        <spring-cloud-sleuth-otel.version>1.0.0-M12</spring-cloud-sleuth-otel.version>
-        <grpc-okhttp.version>1.42.1</grpc-okhttp.version>
+        <spring-boot-dependencies.version>2.7.9</spring-boot-dependencies.version>
+        <release.train.version>2021.0.5</release.train.version>
+        <spring-cloud-sleuth-otel.version>1.1.2</spring-cloud-sleuth-otel.version>
+        <otel-exporter-otlp.version>1.23.1</otel-exporter-otlp.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry2/src/main/java/com/baeldung/opentelemetry/exception/ProductControllerAdvice.java b/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry2/src/main/java/com/baeldung/opentelemetry/exception/PriceControllerAdvice.java
similarity index 93%
rename from spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry2/src/main/java/com/baeldung/opentelemetry/exception/ProductControllerAdvice.java
rename to spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry2/src/main/java/com/baeldung/opentelemetry/exception/PriceControllerAdvice.java
index fe7789ecf5..4d01ab0f6d 100644
--- a/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry2/src/main/java/com/baeldung/opentelemetry/exception/ProductControllerAdvice.java
+++ b/spring-cloud-modules/spring-cloud-open-telemetry/spring-cloud-open-telemetry2/src/main/java/com/baeldung/opentelemetry/exception/PriceControllerAdvice.java
@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 @RestControllerAdvice
-public class ProductControllerAdvice {
+public class PriceControllerAdvice {
 
     @ExceptionHandler(PriceNotFoundException.class)
     public ResponseEntity<Object> handlePriceNotFoundException(PriceNotFoundException exception) {
diff --git a/spring-cloud-modules/spring-cloud-openfeign-2/README.md b/spring-cloud-modules/spring-cloud-openfeign-2/README.md
deleted file mode 100644
index bc306e2302..0000000000
--- a/spring-cloud-modules/spring-cloud-openfeign-2/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### Relevant Articles:
-
-- [Feign Client Exception Handling](https://www.baeldung.com/java-feign-client-exception-handling)
diff --git a/spring-cloud-modules/spring-cloud-openfeign-2/pom.xml b/spring-cloud-modules/spring-cloud-openfeign-2/pom.xml
deleted file mode 100644
index 43cc7c6c50..0000000000
--- a/spring-cloud-modules/spring-cloud-openfeign-2/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
-    <groupId>com.baeldung.cloud</groupId>
-    <artifactId>spring-cloud-openfeign-2</artifactId>
-    <name>spring-cloud-openfeign-2</name>
-    <description>OpenFeign project for Spring Boot</description>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
-    </parent>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-okhttp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.github.openfeign.form</groupId>
-            <artifactId>feign-form</artifactId>
-            <version>${feign-form.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.github.openfeign.form</groupId>
-            <artifactId>feign-form-spring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <spring-cloud.version>2021.0.3</spring-cloud.version>
-        <feign-form.version>3.8.0</feign-form.version>
-    </properties>
-
-</project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/ExampleApplication.java b/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/ExampleApplication.java
deleted file mode 100644
index c7f07f6667..0000000000
--- a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/ExampleApplication.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.baeldung.cloud.openfeign;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-
-@SpringBootApplication
-@EnableFeignClients
-public class ExampleApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(ExampleApplication.class, args);
-    }
-
-}
-
diff --git a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/exception/BadRequestException.java b/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/exception/BadRequestException.java
deleted file mode 100644
index 7c2daf43fe..0000000000
--- a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/exception/BadRequestException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.baeldung.cloud.openfeign.exception;
-
-public class BadRequestException extends Exception {
-
-    public BadRequestException() {
-    }
-
-    public BadRequestException(String message) {
-        super(message);
-    }
-
-    public BadRequestException(Throwable cause) {
-        super(cause);
-    }
-
-    @Override
-    public String toString() {
-        return "BadRequestException: " + getMessage();
-    }
-
-}
diff --git a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/exception/NotFoundException.java b/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/exception/NotFoundException.java
deleted file mode 100644
index 19f6204b86..0000000000
--- a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/exception/NotFoundException.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.baeldung.cloud.openfeign.exception;
-
-public class NotFoundException extends Exception {
-
-    public NotFoundException(String message) {
-        super(message);
-    }
-
-    public NotFoundException(Throwable cause) {
-        super(cause);
-    }
-
-    @Override
-    public String toString() {
-        return "NotFoundException: " + getMessage();
-    }
-
-}
diff --git a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/FeignSupportConfig.java b/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/FeignSupportConfig.java
deleted file mode 100644
index 802077a3d7..0000000000
--- a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/FeignSupportConfig.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.baeldung.cloud.openfeign.fileupload.config;
-
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.cloud.openfeign.support.SpringEncoder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.web.client.RestTemplate;
-
-import feign.codec.Encoder;
-import feign.codec.ErrorDecoder;
-import feign.form.spring.SpringFormEncoder;
-
-public class FeignSupportConfig {
-    @Bean
-    public Encoder multipartFormEncoder() {
-        return new SpringFormEncoder(new SpringEncoder(new ObjectFactory<HttpMessageConverters>() {
-            @Override
-            public HttpMessageConverters getObject() {
-                return new HttpMessageConverters(new RestTemplate().getMessageConverters());
-            }
-        }));
-    }
-
-    @Bean
-    public ErrorDecoder errorDecoder() {
-        return new RetreiveMessageErrorDecoder();
-    }
-}
diff --git a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-openfeign-2/src/main/resources/application.properties
deleted file mode 100644
index 7188b74c9b..0000000000
--- a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/resources/application.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-server.port=8085
-spring.main.allow-bean-definition-overriding=true
-spring.application.name= openfeign
-logging.level.com.baeldung.cloud.openfeign.client: DEBUG
-feign.hystrix.enabled=true
-
-spring.security.oauth2.client.registration.keycloak.authorization-grant-type=client_credentials
-spring.security.oauth2.client.registration.keycloak.client-id=payment-app
-spring.security.oauth2.client.registration.keycloak.client-secret=863e9de4-33d4-4471-b35e-f8d2434385bb
-spring.security.oauth2.client.provider.keycloak.token-uri=http://localhost:8083/auth/realms/master/protocol/openid-connect/token
diff --git a/spring-cloud-modules/spring-cloud-openfeign-2/src/test/java/com/baeldung/cloud/openfeign/SpringContextTest.java b/spring-cloud-modules/spring-cloud-openfeign-2/src/test/java/com/baeldung/cloud/openfeign/SpringContextTest.java
deleted file mode 100644
index 4bf35f74f4..0000000000
--- a/spring-cloud-modules/spring-cloud-openfeign-2/src/test/java/com/baeldung/cloud/openfeign/SpringContextTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.baeldung.cloud.openfeign;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = ExampleApplication.class)
-public class SpringContextTest {
-    
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}
diff --git a/spring-cloud-modules/spring-cloud-openfeign/README.md b/spring-cloud-modules/spring-cloud-openfeign/README.md
index c291e60aa6..edda9a8f80 100644
--- a/spring-cloud-modules/spring-cloud-openfeign/README.md
+++ b/spring-cloud-modules/spring-cloud-openfeign/README.md
@@ -4,3 +4,11 @@
 - [Differences Between Netflix Feign and OpenFeign](https://www.baeldung.com/netflix-feign-vs-openfeign)
 - [Provide an OAuth2 Token to a Feign Client](https://www.baeldung.com/spring-cloud-feign-oauth-token)
 - [Propagating Exceptions With OpenFeign and Spring](https://www.baeldung.com/spring-openfeign-propagate-exception)
+- [Feign Client Exception Handling](https://www.baeldung.com/java-feign-client-exception-handling)
+- [File Upload With Open Feign](https://www.baeldung.com/java-feign-file-upload)
+- [Feign Logging Configuration](https://www.baeldung.com/java-feign-logging)
+- [Retrieve Original Message From Feign ErrorDecoder](https://www.baeldung.com/feign-retrieve-original-message)
+- [RequestLine with Feign Client](https://www.baeldung.com/feign-requestline)
+- [Propagating Exceptions With OpenFeign and Spring](https://www.baeldung.com/spring-openfeign-propagate-exception)
+- [Post form-url-encoded Data with Spring Cloud Feign](https://www.baeldung.com/spring-cloud-post-form-url-encoded-data)
+- [Configuring Spring Cloud FeignClient URL](https://www.baeldung.com/spring-cloud-feignclient-url)
diff --git a/spring-cloud-modules/spring-cloud-openfeign/pom.xml b/spring-cloud-modules/spring-cloud-openfeign/pom.xml
index 88ad38517b..465be6b74f 100644
--- a/spring-cloud-modules/spring-cloud-openfeign/pom.xml
+++ b/spring-cloud-modules/spring-cloud-openfeign/pom.xml
@@ -61,10 +61,23 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock-jre8</artifactId>
+            <version>${wire.mock.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <properties>
         <spring-cloud.version>2021.0.3</spring-cloud.version>
+        <wire.mock.version>2.33.2</wire.mock.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/AlbumClient.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/AlbumClient.java
new file mode 100644
index 0000000000..b1db2dbcab
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/AlbumClient.java
@@ -0,0 +1,15 @@
+package com.baeldung.cloud.openfeign.client;
+
+import com.baeldung.cloud.openfeign.model.Album;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+@FeignClient(name = "albumClient", url = "https://jsonplaceholder.typicode.com/albums/")
+public interface AlbumClient {
+    @GetMapping(value = "/{id}")
+    Album getAlbumById(@PathVariable(value = "id") Integer id);
+
+    @GetMapping(value = "/{id}")
+    Album getAlbumByIdAndDynamicUrl(@PathVariable(name = "id") Integer id);
+}
diff --git a/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/FormClient.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/FormClient.java
new file mode 100644
index 0000000000..f127ec3b8b
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/FormClient.java
@@ -0,0 +1,37 @@
+package com.baeldung.cloud.openfeign.client;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.support.SpringEncoder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.baeldung.cloud.openfeign.defaulterrorhandling.model.FormData;
+
+import feign.codec.Encoder;
+import feign.form.spring.SpringFormEncoder;
+
+@FeignClient(name = "form-client", url = "http://localhost:8085/api", configuration = FormFeignEncoderConfig.class)
+public interface FormClient {
+
+    @PostMapping(value = "/form", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    void postFormData(@RequestBody FormData data);
+
+    @PostMapping(value = "/form/map", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    void postFormMapData(Map<String, ?> data);
+
+}
+
+class FormFeignEncoderConfig {
+
+    @Bean
+    public Encoder encoder(ObjectFactory<HttpMessageConverters> converters) {
+        return new SpringFormEncoder(new SpringEncoder(converters));
+    }
+
+}
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/PostClient.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/PostClient.java
new file mode 100644
index 0000000000..e8e773b6a1
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/PostClient.java
@@ -0,0 +1,12 @@
+package com.baeldung.cloud.openfeign.client;
+
+import com.baeldung.cloud.openfeign.model.Post;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+@FeignClient(name = "postClient", url = "${spring.cloud.openfeign.client.config.postClient.url}")
+public interface PostClient {
+    @GetMapping(value = "/{id}")
+    Post getPostById(@PathVariable(value = "id") Integer id);
+}
diff --git a/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/TodoClient.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/TodoClient.java
new file mode 100644
index 0000000000..c768ef6b5f
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/TodoClient.java
@@ -0,0 +1,13 @@
+package com.baeldung.cloud.openfeign.client;
+
+import com.baeldung.cloud.openfeign.model.Todo;
+import feign.RequestLine;
+import org.springframework.cloud.openfeign.FeignClient;
+
+import java.net.URI;
+
+@FeignClient(name = "todoClient")
+public interface TodoClient {
+    @RequestLine(value = "GET")
+    Todo getTodoById(URI uri);
+}
diff --git a/feign/src/main/java/com/baeldung/core/client/UserClient.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/UserClient.java
similarity index 75%
rename from feign/src/main/java/com/baeldung/core/client/UserClient.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/UserClient.java
index a16f924ad5..a9b78e5db8 100644
--- a/feign/src/main/java/com/baeldung/core/client/UserClient.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/UserClient.java
@@ -1,9 +1,9 @@
-package com.baeldung.core.client;
+package com.baeldung.cloud.openfeign.client;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
-import com.baeldung.core.config.FeignConfig;
+import com.baeldung.cloud.openfeign.config.FeignConfig;
 
 @FeignClient(name = "user-client", url="https://jsonplaceholder.typicode.com", configuration = FeignConfig.class)
 public interface UserClient {
diff --git a/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/DynamicUrlInterceptor.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/DynamicUrlInterceptor.java
new file mode 100644
index 0000000000..286426edb3
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/DynamicUrlInterceptor.java
@@ -0,0 +1,23 @@
+package com.baeldung.cloud.openfeign.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+
+import java.util.function.Supplier;
+
+public class DynamicUrlInterceptor implements RequestInterceptor {
+
+    private final Supplier<String> urlSupplier;
+
+    public DynamicUrlInterceptor(Supplier<String> urlSupplier) {
+        this.urlSupplier = urlSupplier;
+    }
+
+    @Override
+    public void apply(RequestTemplate template) {
+        String url = urlSupplier.get();
+        if (url != null) {
+            template.target(url);
+        }
+    }
+}
diff --git a/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/FeignConfig.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/FeignConfig.java
new file mode 100644
index 0000000000..005084899b
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/FeignConfig.java
@@ -0,0 +1,13 @@
+package com.baeldung.cloud.openfeign.config;
+
+import org.springframework.context.annotation.Bean;
+
+import feign.Logger;
+
+public class FeignConfig {
+
+	@Bean
+	Logger.Level feignLoggerLevel() {
+		return Logger.Level.FULL;
+	}
+}
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/controller/ConfigureFeignUrlController.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/controller/ConfigureFeignUrlController.java
new file mode 100644
index 0000000000..ca49bca605
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/controller/ConfigureFeignUrlController.java
@@ -0,0 +1,82 @@
+package com.baeldung.cloud.openfeign.controller;
+
+import com.baeldung.cloud.openfeign.config.DynamicUrlInterceptor;
+import com.baeldung.cloud.openfeign.client.AlbumClient;
+import com.baeldung.cloud.openfeign.client.PostClient;
+import com.baeldung.cloud.openfeign.client.TodoClient;
+import com.baeldung.cloud.openfeign.model.Album;
+import com.baeldung.cloud.openfeign.model.Post;
+import com.baeldung.cloud.openfeign.model.Todo;
+import feign.Feign;
+import feign.Target;
+import feign.codec.Decoder;
+import feign.codec.Encoder;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.FeignClientsConfiguration;
+import org.springframework.cloud.openfeign.support.HttpMessageConverterCustomizer;
+import org.springframework.cloud.openfeign.support.SpringDecoder;
+import org.springframework.cloud.openfeign.support.SpringEncoder;
+import org.springframework.cloud.openfeign.support.SpringMvcContract;
+import org.springframework.context.annotation.Import;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.net.URI;
+
+@RestController
+@Import(FeignClientsConfiguration.class)
+public class ConfigureFeignUrlController {
+    private final AlbumClient albumClient;
+
+    private final PostClient postClient;
+
+    private final TodoClient todoClient;
+
+    private final ObjectFactory<HttpMessageConverters> messageConverters;
+
+    private final ObjectProvider<HttpMessageConverterCustomizer> customizers;
+
+    public ConfigureFeignUrlController(AlbumClient albumClient,
+                                       PostClient postClient,
+                                       Decoder decoder,
+                                       Encoder encoder,
+                                       ObjectFactory<HttpMessageConverters> messageConverters, ObjectProvider<HttpMessageConverterCustomizer> customizers) {
+        this.albumClient = albumClient;
+        this.postClient = postClient;
+        this.messageConverters = messageConverters;
+        this.customizers = customizers;
+        this.todoClient = Feign.builder().encoder(encoder).decoder(decoder).target(Target.EmptyTarget.create(TodoClient.class));
+    }
+
+    @GetMapping(value = "albums/{id}")
+    public Album getAlbumById(@PathVariable(value = "id") Integer id) {
+        return albumClient.getAlbumById(id);
+    }
+
+    @GetMapping(value = "posts/{id}")
+    public Post getPostById(@PathVariable(value = "id") Integer id) {
+        return postClient.getPostById(id);
+    }
+
+    @GetMapping(value = "todos/{id}")
+    public Todo getTodoById(@PathVariable(value = "id") Integer id) {
+        return todoClient.getTodoById(URI.create("https://jsonplaceholder.typicode.com/todos/" + id));
+    }
+
+    @GetMapping(value = "/dynamicAlbums/{id}")
+    public Album getAlbumByIdAndDynamicUrl(@PathVariable(value = "id") Integer id) {
+        AlbumClient client = Feign.builder()
+                .requestInterceptor(new DynamicUrlInterceptor(() -> "https://jsonplaceholder.typicode.com/albums/"))
+                .contract(new SpringMvcContract())
+                .encoder(new SpringEncoder(messageConverters))
+                .decoder(new SpringDecoder(messageConverters, customizers))
+                .target(Target.EmptyTarget.create(AlbumClient.class));
+
+        return client.getAlbumByIdAndDynamicUrl(id);
+    }
+}
+
+
diff --git a/feign/src/main/java/com/baeldung/core/customizederrorhandling/client/ProductClient.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/client/ProductClient.java
similarity index 63%
rename from feign/src/main/java/com/baeldung/core/customizederrorhandling/client/ProductClient.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/client/ProductClient.java
index 113051722b..470dd5c929 100644
--- a/feign/src/main/java/com/baeldung/core/customizederrorhandling/client/ProductClient.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/client/ProductClient.java
@@ -1,14 +1,14 @@
-package com.baeldung.core.customizederrorhandling.client;
+package com.baeldung.cloud.openfeign.customizederrorhandling.client;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.baeldung.core.customizederrorhandling.config.FeignConfig;
-import com.baeldung.core.defaulterrorhandling.model.Product;
+import com.baeldung.cloud.openfeign.customizederrorhandling.config.FeignConfig;
+import com.baeldung.cloud.openfeign.defaulterrorhandling.model.Product;
 
-@FeignClient(name = "product-client-2", url = "http://localhost:8081/product/", configuration = FeignConfig.class)
+@FeignClient(name = "product-client-2", url = "http://localhost:8088/product/", configuration = FeignConfig.class)
 public interface ProductClient {
 
     @RequestMapping(value = "{id}", method = RequestMethod.GET)
diff --git a/feign/src/main/java/com/baeldung/core/customizederrorhandling/config/CustomErrorDecoder.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/config/CustomErrorDecoder.java
similarity index 65%
rename from feign/src/main/java/com/baeldung/core/customizederrorhandling/config/CustomErrorDecoder.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/config/CustomErrorDecoder.java
index 5466b61b3a..13e3a55dd7 100644
--- a/feign/src/main/java/com/baeldung/core/customizederrorhandling/config/CustomErrorDecoder.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/config/CustomErrorDecoder.java
@@ -1,8 +1,9 @@
-package com.baeldung.core.customizederrorhandling.config;
+package com.baeldung.cloud.openfeign.customizederrorhandling.config;
 
-import com.baeldung.core.customizederrorhandling.exception.ProductNotFoundException;
-import com.baeldung.core.customizederrorhandling.exception.ProductServiceNotAvailableException;
-import com.baeldung.core.exception.BadRequestException;
+
+import com.baeldung.cloud.openfeign.customizederrorhandling.exception.ProductNotFoundException;
+import com.baeldung.cloud.openfeign.customizederrorhandling.exception.ProductServiceNotAvailableException;
+import com.baeldung.cloud.openfeign.exception.BadRequestException;
 
 import feign.Response;
 import feign.codec.ErrorDecoder;
diff --git a/feign/src/main/java/com/baeldung/core/customizederrorhandling/config/FeignConfig.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/config/FeignConfig.java
similarity index 82%
rename from feign/src/main/java/com/baeldung/core/customizederrorhandling/config/FeignConfig.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/config/FeignConfig.java
index 980b8b5b38..f013f48b64 100644
--- a/feign/src/main/java/com/baeldung/core/customizederrorhandling/config/FeignConfig.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/config/FeignConfig.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.customizederrorhandling.config;
+package com.baeldung.cloud.openfeign.customizederrorhandling.config;
 
 import org.springframework.context.annotation.Bean;
 
diff --git a/feign/src/main/java/com/baeldung/core/customizederrorhandling/controller/ProductController.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/controller/ProductController.java
similarity index 76%
rename from feign/src/main/java/com/baeldung/core/customizederrorhandling/controller/ProductController.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/controller/ProductController.java
index 6d6f784e66..53458151f8 100644
--- a/feign/src/main/java/com/baeldung/core/customizederrorhandling/controller/ProductController.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/controller/ProductController.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.customizederrorhandling.controller;
+package com.baeldung.cloud.openfeign.customizederrorhandling.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -6,8 +6,8 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.baeldung.core.customizederrorhandling.client.ProductClient;
-import com.baeldung.core.defaulterrorhandling.model.Product;
+import com.baeldung.cloud.openfeign.customizederrorhandling.client.ProductClient;
+import com.baeldung.cloud.openfeign.defaulterrorhandling.model.Product;
 
 @RestController("product_controller2")
 @RequestMapping(value = "myapp2")
diff --git a/feign/src/main/java/com/baeldung/core/customizederrorhandling/exception/ErrorResponse.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/exception/ErrorResponse.java
similarity index 94%
rename from feign/src/main/java/com/baeldung/core/customizederrorhandling/exception/ErrorResponse.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/exception/ErrorResponse.java
index 6e739e5e40..d7ec783a8b 100644
--- a/feign/src/main/java/com/baeldung/core/customizederrorhandling/exception/ErrorResponse.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/exception/ErrorResponse.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.customizederrorhandling.exception;
+package com.baeldung.cloud.openfeign.customizederrorhandling.exception;
 
 import java.util.Date;
 
diff --git a/feign/src/main/java/com/baeldung/core/customizederrorhandling/exception/ProductExceptionHandler.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/exception/ProductExceptionHandler.java
similarity index 95%
rename from feign/src/main/java/com/baeldung/core/customizederrorhandling/exception/ProductExceptionHandler.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/exception/ProductExceptionHandler.java
index c83d917570..80191ce427 100644
--- a/feign/src/main/java/com/baeldung/core/customizederrorhandling/exception/ProductExceptionHandler.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/exception/ProductExceptionHandler.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.customizederrorhandling.exception;
+package com.baeldung.cloud.openfeign.customizederrorhandling.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/feign/src/main/java/com/baeldung/core/customizederrorhandling/exception/ProductNotFoundException.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/exception/ProductNotFoundException.java
similarity index 68%
rename from feign/src/main/java/com/baeldung/core/customizederrorhandling/exception/ProductNotFoundException.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/exception/ProductNotFoundException.java
index fa993ce700..337cb89f7b 100644
--- a/feign/src/main/java/com/baeldung/core/customizederrorhandling/exception/ProductNotFoundException.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/exception/ProductNotFoundException.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.customizederrorhandling.exception;
+package com.baeldung.cloud.openfeign.customizederrorhandling.exception;
 
 public class ProductNotFoundException extends RuntimeException {
 
diff --git a/feign/src/main/java/com/baeldung/core/customizederrorhandling/exception/ProductServiceNotAvailableException.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/exception/ProductServiceNotAvailableException.java
similarity index 70%
rename from feign/src/main/java/com/baeldung/core/customizederrorhandling/exception/ProductServiceNotAvailableException.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/exception/ProductServiceNotAvailableException.java
index 887d2cd91d..ce30f8c310 100644
--- a/feign/src/main/java/com/baeldung/core/customizederrorhandling/exception/ProductServiceNotAvailableException.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/customizederrorhandling/exception/ProductServiceNotAvailableException.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.customizederrorhandling.exception;
+package com.baeldung.cloud.openfeign.customizederrorhandling.exception;
 
 public class ProductServiceNotAvailableException extends RuntimeException {
 
diff --git a/feign/src/main/java/com/baeldung/core/defaulterrorhandling/client/ProductClient.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/defaulterrorhandling/client/ProductClient.java
similarity index 71%
rename from feign/src/main/java/com/baeldung/core/defaulterrorhandling/client/ProductClient.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/defaulterrorhandling/client/ProductClient.java
index 4eb435331d..2927024668 100644
--- a/feign/src/main/java/com/baeldung/core/defaulterrorhandling/client/ProductClient.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/defaulterrorhandling/client/ProductClient.java
@@ -1,12 +1,12 @@
-package com.baeldung.core.defaulterrorhandling.client;
+package com.baeldung.cloud.openfeign.defaulterrorhandling.client;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.baeldung.core.defaulterrorhandling.config.FeignConfig;
-import com.baeldung.core.defaulterrorhandling.model.Product;
+import com.baeldung.cloud.openfeign.defaulterrorhandling.config.FeignConfig;
+import com.baeldung.cloud.openfeign.defaulterrorhandling.model.Product;
 
 @FeignClient(name = "product-client", url = "http://localhost:8084/product/", configuration = FeignConfig.class)
 public interface ProductClient {
diff --git a/feign/src/main/java/com/baeldung/core/defaulterrorhandling/config/FeignConfig.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/defaulterrorhandling/config/FeignConfig.java
similarity index 74%
rename from feign/src/main/java/com/baeldung/core/defaulterrorhandling/config/FeignConfig.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/defaulterrorhandling/config/FeignConfig.java
index cef8cbb6d9..e10c33e311 100644
--- a/feign/src/main/java/com/baeldung/core/defaulterrorhandling/config/FeignConfig.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/defaulterrorhandling/config/FeignConfig.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.defaulterrorhandling.config;
+package com.baeldung.cloud.openfeign.defaulterrorhandling.config;
 
 import org.springframework.context.annotation.Bean;
 
diff --git a/feign/src/main/java/com/baeldung/core/defaulterrorhandling/controller/ProductController.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/defaulterrorhandling/controller/ProductController.java
similarity index 76%
rename from feign/src/main/java/com/baeldung/core/defaulterrorhandling/controller/ProductController.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/defaulterrorhandling/controller/ProductController.java
index 80f571f29a..b9fe879fbd 100644
--- a/feign/src/main/java/com/baeldung/core/defaulterrorhandling/controller/ProductController.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/defaulterrorhandling/controller/ProductController.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.defaulterrorhandling.controller;
+package com.baeldung.cloud.openfeign.defaulterrorhandling.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -6,8 +6,8 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.baeldung.core.defaulterrorhandling.client.ProductClient;
-import com.baeldung.core.defaulterrorhandling.model.Product;
+import com.baeldung.cloud.openfeign.defaulterrorhandling.client.ProductClient;
+import com.baeldung.cloud.openfeign.defaulterrorhandling.model.Product;
 
 @RestController("product_controller1")
 @RequestMapping(value ="myapp1")
diff --git a/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/defaulterrorhandling/model/FormData.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/defaulterrorhandling/model/FormData.java
new file mode 100644
index 0000000000..4b03a3e410
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/defaulterrorhandling/model/FormData.java
@@ -0,0 +1,12 @@
+package com.baeldung.cloud.openfeign.defaulterrorhandling.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class FormData {
+
+    int id;
+    String name;
+}
diff --git a/feign/src/main/java/com/baeldung/core/defaulterrorhandling/model/Product.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/defaulterrorhandling/model/Product.java
similarity index 82%
rename from feign/src/main/java/com/baeldung/core/defaulterrorhandling/model/Product.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/defaulterrorhandling/model/Product.java
index 35d860332e..25a1662c99 100644
--- a/feign/src/main/java/com/baeldung/core/defaulterrorhandling/model/Product.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/defaulterrorhandling/model/Product.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.defaulterrorhandling.model;
+package com.baeldung.cloud.openfeign.defaulterrorhandling.model;
 
 public class Product {
 
diff --git a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/ExceptionMessage.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/ExceptionMessage.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/ExceptionMessage.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/ExceptionMessage.java
diff --git a/feign/src/main/java/com/baeldung/core/fileupload/config/FeignSupportConfig.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/FeignSupportConfig.java
similarity index 92%
rename from feign/src/main/java/com/baeldung/core/fileupload/config/FeignSupportConfig.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/FeignSupportConfig.java
index c8c9eb1acc..bedcd32569 100644
--- a/feign/src/main/java/com/baeldung/core/fileupload/config/FeignSupportConfig.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/FeignSupportConfig.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.fileupload.config;
+package com.baeldung.cloud.openfeign.fileupload.config;
 
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
diff --git a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/RetreiveMessageErrorDecoder.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/RetreiveMessageErrorDecoder.java
similarity index 96%
rename from spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/RetreiveMessageErrorDecoder.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/RetreiveMessageErrorDecoder.java
index 5ebd7b6887..4324467712 100644
--- a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/RetreiveMessageErrorDecoder.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/RetreiveMessageErrorDecoder.java
@@ -12,9 +12,10 @@ import feign.codec.ErrorDecoder;
 
 public class RetreiveMessageErrorDecoder implements ErrorDecoder {
     private final ErrorDecoder errorDecoder = new Default();
+
     @Override
     public Exception decode(String methodKey, Response response) {
-        ExceptionMessage message = null;
+        ExceptionMessage message;
         try (InputStream bodyIs = response.body()
             .asInputStream()) {
             ObjectMapper mapper = new ObjectMapper();
diff --git a/feign/src/main/java/com/baeldung/core/fileupload/controller/FileController.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/controller/FileController.java
similarity index 78%
rename from feign/src/main/java/com/baeldung/core/fileupload/controller/FileController.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/controller/FileController.java
index 7ba4746979..5c6d6076b8 100644
--- a/feign/src/main/java/com/baeldung/core/fileupload/controller/FileController.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/controller/FileController.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.fileupload.controller;
+package com.baeldung.cloud.openfeign.fileupload.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.baeldung.core.fileupload.service.UploadService;
+import com.baeldung.cloud.openfeign.fileupload.service.UploadService;
 
 @RestController
 public class FileController {
@@ -16,7 +16,7 @@ public class FileController {
     
     @PostMapping(value = "/upload")
     public String handleFileUpload(@RequestPart(value = "file") MultipartFile file) {
-        return service.uploadFile(file);
+        return service.uploadFileWithFallbackFactory(file);
     }
     
     @PostMapping(value = "/upload-mannual-client")
@@ -27,7 +27,7 @@ public class FileController {
     
     @PostMapping(value = "/upload-error")
     public String handleFileUploadError(@RequestPart(value = "file") MultipartFile file) {
-        return service.uploadFile(file);
+        return service.uploadFileWithFallbackFactory(file);
     }
     
 }
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/FileUploadClientFallbackFactory.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/FileUploadClientFallbackFactory.java
similarity index 52%
rename from spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/FileUploadClientFallbackFactory.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/FileUploadClientFallbackFactory.java
index 105be15192..9b717d17f1 100644
--- a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/FileUploadClientFallbackFactory.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/FileUploadClientFallbackFactory.java
@@ -11,20 +11,17 @@ import com.baeldung.cloud.openfeign.exception.NotFoundException;
 public class FileUploadClientFallbackFactory implements FallbackFactory<FileUploadClientWithFallbackFactory> {
     @Override
     public FileUploadClientWithFallbackFactory create(Throwable cause) {
-        return new FileUploadClientWithFallbackFactory() {
-            @Override
-            public String fileUpload(MultipartFile file) {
-                if (cause instanceof BadRequestException) {
-                    return "Bad Request!!!";
-                }
-                if (cause instanceof NotFoundException) {
-                    return "Not Found!!!";
-                }
-                if (cause instanceof Exception) {
-                    return "Exception!!!";
-                }
-                return "Successfully Uploaded file!!!";
+        return file -> {
+            if (cause instanceof BadRequestException) {
+                return "Bad Request!!!";
             }
+            if (cause instanceof NotFoundException) {
+                return "Not Found!!!";
+            }
+            if (cause instanceof Exception) {
+                return "Exception!!!";
+            }
+            return "Successfully Uploaded file!!!";
         };
     }
 }
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/FileUploadClientWithFallBack.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/FileUploadClientWithFallBack.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/FileUploadClientWithFallBack.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/FileUploadClientWithFallBack.java
diff --git a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/FileUploadClientWithFallbackFactory.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/FileUploadClientWithFallbackFactory.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/FileUploadClientWithFallbackFactory.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/FileUploadClientWithFallbackFactory.java
diff --git a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/FileUploadClientWithFallbackImpl.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/FileUploadClientWithFallbackImpl.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/FileUploadClientWithFallbackImpl.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/FileUploadClientWithFallbackImpl.java
diff --git a/feign/src/main/java/com/baeldung/core/fileupload/service/UploadClient.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadClient.java
similarity index 85%
rename from feign/src/main/java/com/baeldung/core/fileupload/service/UploadClient.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadClient.java
index 37b059d642..8f3ef7e421 100644
--- a/feign/src/main/java/com/baeldung/core/fileupload/service/UploadClient.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadClient.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.fileupload.service;
+package com.baeldung.cloud.openfeign.fileupload.service;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.baeldung.core.fileupload.config.FeignSupportConfig;
+import com.baeldung.cloud.openfeign.fileupload.config.FeignSupportConfig;
 
 @FeignClient(name = "file", url = "http://localhost:8081", configuration = FeignSupportConfig.class)
 public interface UploadClient {
diff --git a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadResource.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadResource.java
similarity index 90%
rename from spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadResource.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadResource.java
index 2d5090897d..26e658a7f0 100644
--- a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadResource.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadResource.java
@@ -9,7 +9,7 @@ import feign.Response;
 
 public interface UploadResource {
     
-    @RequestLine("POST /upload-error")
+    @RequestLine("POST /upload-file")
     @Headers("Content-Type: multipart/form-data")
     Response uploadFile(@Param("file") MultipartFile file);
     
diff --git a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadService.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadService.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-openfeign-2/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadService.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadService.java
diff --git a/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Album.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Album.java
new file mode 100644
index 0000000000..ae9c01f3b1
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Album.java
@@ -0,0 +1,32 @@
+package com.baeldung.cloud.openfeign.model;
+
+public class Album {
+
+    private Integer id;
+    private Integer userId;
+    private String title;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+}
diff --git a/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Todo.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Todo.java
new file mode 100644
index 0000000000..887a3496c5
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Todo.java
@@ -0,0 +1,40 @@
+package com.baeldung.cloud.openfeign.model;
+
+public class Todo {
+    private Integer id;
+    private Integer userId;
+    private String title;
+    private Boolean completed;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Boolean getCompleted() {
+        return completed;
+    }
+
+    public void setCompleted(Boolean completed) {
+        this.completed = completed;
+    }
+}
diff --git a/spring-cloud-modules/spring-cloud-openfeign/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-openfeign/src/main/resources/application.properties
index a0d9d89934..f4ea32483d 100644
--- a/spring-cloud-modules/spring-cloud-openfeign/src/main/resources/application.properties
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/main/resources/application.properties
@@ -8,3 +8,5 @@ spring.security.oauth2.client.registration.keycloak.authorization-grant-type=cli
 spring.security.oauth2.client.registration.keycloak.client-id=payment-app
 spring.security.oauth2.client.registration.keycloak.client-secret=863e9de4-33d4-4471-b35e-f8d2434385bb
 spring.security.oauth2.client.provider.keycloak.token-uri=http://localhost:8083/auth/realms/master/protocol/openid-connect/token
+
+spring.cloud.openfeign.client.config.postClient.url=https://jsonplaceholder.typicode.com/posts/
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-openfeign-2/src/main/resources/fileupload.txt b/spring-cloud-modules/spring-cloud-openfeign/src/main/resources/fileupload.txt
similarity index 100%
rename from spring-cloud-modules/spring-cloud-openfeign-2/src/main/resources/fileupload.txt
rename to spring-cloud-modules/spring-cloud-openfeign/src/main/resources/fileupload.txt
diff --git a/spring-cloud-modules/spring-cloud-openfeign-2/src/test/java/com/baeldung/cloud/openfeign/OpenFeignFileUploadLiveTest.java b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignFileUploadLiveTest.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-openfeign-2/src/test/java/com/baeldung/cloud/openfeign/OpenFeignFileUploadLiveTest.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignFileUploadLiveTest.java
diff --git a/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/client/FormClientUnitTest.java b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/client/FormClientUnitTest.java
new file mode 100644
index 0000000000..f374e8e0bd
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/client/FormClientUnitTest.java
@@ -0,0 +1,78 @@
+package com.baeldung.cloud.openfeign.client;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.HttpStatus;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import com.baeldung.cloud.openfeign.defaulterrorhandling.model.FormData;
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+
+import lombok.extern.slf4j.Slf4j;
+
+@ExtendWith(SpringExtension.class)
+@SpringBootTest
+@Slf4j
+class FormClientUnitTest {
+
+    private static WireMockServer wireMockServer;
+
+    @Autowired
+    FormClient formClient;
+
+    @BeforeAll
+    public static void startWireMockServer() {
+        wireMockServer = new WireMockServer(8085);
+        configureFor("localhost", 8085);
+        wireMockServer.start();
+
+    }
+
+    @AfterAll
+    public static void stopWireMockServer() {
+        wireMockServer.stop();
+    }
+
+    @Test
+    public void givenFormData_whenPostFormDataCalled_thenReturnSuccess() {
+        FormData formData = new FormData(1, "baeldung");
+        stubFor(WireMock.post(urlEqualTo("/api/form"))
+          .willReturn(aResponse().withStatus(HttpStatus.OK.value())));
+
+        formClient.postFormData(formData);
+        wireMockServer.verify(postRequestedFor(urlPathEqualTo("/api/form"))
+          .withHeader("Content-Type", equalTo("application/x-www-form-urlencoded; charset=UTF-8"))
+          .withRequestBody(equalTo("name=baeldung&id=1")));
+    }
+
+    @Test
+    public void givenFormMap_whenPostFormMapDataCalled_thenReturnSuccess() {
+        Map<String, String> mapData = new HashMap<>();
+        mapData.put("name", "baeldung");
+        mapData.put("id", "1");
+        stubFor(WireMock.post(urlEqualTo("/api/form/map"))
+          .willReturn(aResponse().withStatus(HttpStatus.OK.value())));
+
+        formClient.postFormMapData(mapData);
+        wireMockServer.verify(postRequestedFor(urlPathEqualTo("/api/form/map"))
+          .withHeader("Content-Type", equalTo("application/x-www-form-urlencoded; charset=UTF-8"))
+          .withRequestBody(equalTo("name=baeldung&id=1")));
+    }
+
+}
\ No newline at end of file
diff --git a/feign/src/test/java/com/baeldung/core/customizederrorhandling/client/ProductClientUnitTest.java b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/customizederrorhandling/client/ProductClientUnitTest.java
similarity index 81%
rename from feign/src/test/java/com/baeldung/core/customizederrorhandling/client/ProductClientUnitTest.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/customizederrorhandling/client/ProductClientUnitTest.java
index ed5f18eb3f..385ce900f5 100644
--- a/feign/src/test/java/com/baeldung/core/customizederrorhandling/client/ProductClientUnitTest.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/customizederrorhandling/client/ProductClientUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.customizederrorhandling.client;
+package com.baeldung.cloud.openfeign.customizederrorhandling.client;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
@@ -15,9 +15,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.baeldung.core.ExampleApplication;
-import com.baeldung.core.customizederrorhandling.exception.ProductNotFoundException;
-import com.baeldung.core.customizederrorhandling.exception.ProductServiceNotAvailableException;
+import com.baeldung.cloud.openfeign.ExampleApplication;
+import com.baeldung.cloud.openfeign.customizederrorhandling.exception.ProductNotFoundException;
+import com.baeldung.cloud.openfeign.customizederrorhandling.exception.ProductServiceNotAvailableException;
 import com.github.tomakehurst.wiremock.WireMockServer;
 
 @RunWith(SpringRunner.class)
@@ -31,8 +31,8 @@ public class ProductClientUnitTest {
 
     @Before
     public void startWireMockServer() {
-        wireMockServer = new WireMockServer(8081);
-        configureFor("localhost", 8081);
+        wireMockServer = new WireMockServer(8088);
+        configureFor("localhost", 8088);
         wireMockServer.start();
     }
 
diff --git a/feign/src/test/java/com/baeldung/core/customizederrorhandling/controller/ProductControllerUnitTest.java b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/customizederrorhandling/controller/ProductControllerUnitTest.java
similarity index 92%
rename from feign/src/test/java/com/baeldung/core/customizederrorhandling/controller/ProductControllerUnitTest.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/customizederrorhandling/controller/ProductControllerUnitTest.java
index 04fd68d3e4..3d103d1333 100644
--- a/feign/src/test/java/com/baeldung/core/customizederrorhandling/controller/ProductControllerUnitTest.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/customizederrorhandling/controller/ProductControllerUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.customizederrorhandling.controller;
+package com.baeldung.cloud.openfeign.customizederrorhandling.controller;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
@@ -21,8 +21,8 @@ import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
-import com.baeldung.core.customizederrorhandling.client.ProductClient;
-import com.baeldung.core.customizederrorhandling.exception.ErrorResponse;
+import com.baeldung.cloud.openfeign.customizederrorhandling.client.ProductClient;
+import com.baeldung.cloud.openfeign.customizederrorhandling.exception.ErrorResponse;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.client.WireMock;
@@ -46,8 +46,8 @@ public class ProductControllerUnitTest {
 
     @Before
     public void startWireMockServer() {
-        wireMockServer = new WireMockServer(8081);
-        configureFor("localhost", 8081);
+        wireMockServer = new WireMockServer(8088);
+        configureFor("localhost", 8088);
         wireMockServer.start();
     }
 
diff --git a/feign/src/test/java/com/baeldung/core/defaulterrorhandling/client/ProductClientUnitTest.java b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/defaulterrorhandling/client/ProductClientUnitTest.java
similarity index 93%
rename from feign/src/test/java/com/baeldung/core/defaulterrorhandling/client/ProductClientUnitTest.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/defaulterrorhandling/client/ProductClientUnitTest.java
index 8a9fa94074..efbe7a3771 100644
--- a/feign/src/test/java/com/baeldung/core/defaulterrorhandling/client/ProductClientUnitTest.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/defaulterrorhandling/client/ProductClientUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.defaulterrorhandling.client;
+package com.baeldung.cloud.openfeign.defaulterrorhandling.client;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
@@ -17,8 +17,8 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.baeldung.core.ExampleApplication;
-import com.baeldung.core.defaulterrorhandling.model.Product;
+import com.baeldung.cloud.openfeign.ExampleApplication;
+import com.baeldung.cloud.openfeign.defaulterrorhandling.model.Product;
 import com.github.tomakehurst.wiremock.WireMockServer;
 
 import feign.FeignException;
diff --git a/feign/src/test/java/com/baeldung/core/defaulterrorhandling/controller/ProductControllerUnitTest.java b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/defaulterrorhandling/controller/ProductControllerUnitTest.java
similarity index 95%
rename from feign/src/test/java/com/baeldung/core/defaulterrorhandling/controller/ProductControllerUnitTest.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/defaulterrorhandling/controller/ProductControllerUnitTest.java
index 798ee9035c..7271aa2672 100644
--- a/feign/src/test/java/com/baeldung/core/defaulterrorhandling/controller/ProductControllerUnitTest.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/defaulterrorhandling/controller/ProductControllerUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.defaulterrorhandling.controller;
+package com.baeldung.cloud.openfeign.defaulterrorhandling.controller;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
@@ -21,7 +21,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
-import com.baeldung.core.defaulterrorhandling.client.ProductClient;
+import com.baeldung.cloud.openfeign.defaulterrorhandling.client.ProductClient;
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.client.WireMock;
 
diff --git a/feign/src/test/java/com/baeldung/core/defaulterrorhandling/controller/TestControllerAdvice.java b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/defaulterrorhandling/controller/TestControllerAdvice.java
similarity index 88%
rename from feign/src/test/java/com/baeldung/core/defaulterrorhandling/controller/TestControllerAdvice.java
rename to spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/defaulterrorhandling/controller/TestControllerAdvice.java
index dfd82ed07d..4f06a82a35 100644
--- a/feign/src/test/java/com/baeldung/core/defaulterrorhandling/controller/TestControllerAdvice.java
+++ b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/defaulterrorhandling/controller/TestControllerAdvice.java
@@ -1,4 +1,4 @@
-package com.baeldung.core.defaulterrorhandling.controller;
+package com.baeldung.cloud.openfeign.defaulterrorhandling.controller;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/spring-core-2/.gitignore b/spring-core-2/.gitignore
deleted file mode 100644
index 83c05e60c8..0000000000
--- a/spring-core-2/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.class
-
-#folders#
-/target
-/neoDb*
-/data
-/src/main/webapp/WEB-INF/classes
-*/META-INF/*
-
-# Packaged files #
-*.jar
-*.war
-*.ear
\ No newline at end of file
diff --git a/spring-core-2/README.md b/spring-core-2/README.md
index 3c6bd05876..80ae54b2a4 100644
--- a/spring-core-2/README.md
+++ b/spring-core-2/README.md
@@ -4,11 +4,11 @@ This module contains articles about core Spring functionality
 
 ## Relevant Articles:
 
-- [Guide to Spring @Autowired](http://www.baeldung.com/spring-autowire)
-- [Spring Profiles](http://www.baeldung.com/spring-profiles)
 - [Quick Guide to Spring Bean Scopes](http://www.baeldung.com/spring-bean-scopes)
-- [@Order in Spring](http://www.baeldung.com/spring-order)
-- [Spring @Primary Annotation](http://www.baeldung.com/spring-primary)
 - [Spring Events](https://www.baeldung.com/spring-events)
-- [Spring Null-Safety Annotations](https://www.baeldung.com/spring-null-safety-annotations)
+- [Solving Spring’s “not eligible for auto-proxying” Warning](https://www.baeldung.com/spring-not-eligible-for-auto-proxying)
+- [Finding the Spring Version](https://www.baeldung.com/spring-find-version)
+- [How Does the Spring Singleton Bean Serve Concurrent Requests?](https://www.baeldung.com/spring-singleton-concurrent-requests)
+- [Reinitialize Singleton Bean in Spring Context](https://www.baeldung.com/spring-reinitialize-singleton-bean)
+- [Getting the Current ApplicationContext in Spring](https://www.baeldung.com/spring-get-current-applicationcontext)
 - More articles: [[<-- prev]](/spring-core)[[next -->]](/spring-core-3)
diff --git a/spring-core-2/pom.xml b/spring-core-2/pom.xml
index 3cd9adf451..bab47cb70c 100644
--- a/spring-core-2/pom.xml
+++ b/spring-core-2/pom.xml
@@ -15,29 +15,15 @@
         <relativePath>../parent-boot-2</relativePath>
     </parent>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${org.springframework.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-core</artifactId>
-                <version>${org.springframework.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-thymeleaf</artifactId>
-                <version>${org.springframework.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
+		<dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -129,6 +115,11 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <!-- ShedLock -->
         <dependency>
             <groupId>net.javacrumbs.shedlock</groupId>
@@ -140,6 +131,10 @@
             <artifactId>shedlock-provider-jdbc-template</artifactId>
             <version>${shedlock.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+		</dependency>
     </dependencies>
 
     <build>
@@ -162,28 +157,8 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>dev</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <spring.profiles.active>dev</spring.profiles.active>
-            </properties>
-        </profile>
-        <profile>
-            <id>prod</id>
-            <properties>
-                <spring.profiles.active>prod</spring.profiles.active>
-            </properties>
-        </profile>
-    </profiles>
-
     <properties>
         <start-class>com.baeldung.sample.App</start-class>
-        <!-- Spring -->
-        <org.springframework.version>5.3.0</org.springframework.version>
         <annotation-api.version>1.3.2</annotation-api.version>
         <!-- persistence -->
         <hibernate.version>5.2.5.Final</hibernate.version>
diff --git a/spring-core-6/src/main/java/com/baeldung/applicationcontext/ApplicationContextProvider.java b/spring-core-2/src/main/java/com/baeldung/applicationcontext/ApplicationContextProvider.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/applicationcontext/ApplicationContextProvider.java
rename to spring-core-2/src/main/java/com/baeldung/applicationcontext/ApplicationContextProvider.java
diff --git a/spring-core-6/src/main/java/com/baeldung/applicationcontext/ItemService.java b/spring-core-2/src/main/java/com/baeldung/applicationcontext/ItemService.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/applicationcontext/ItemService.java
rename to spring-core-2/src/main/java/com/baeldung/applicationcontext/ItemService.java
diff --git a/spring-core-6/src/main/java/com/baeldung/applicationcontext/MyBean.java b/spring-core-2/src/main/java/com/baeldung/applicationcontext/MyBean.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/applicationcontext/MyBean.java
rename to spring-core-2/src/main/java/com/baeldung/applicationcontext/MyBean.java
diff --git a/spring-core-5/src/main/java/com/baeldung/component/autoproxying/DataCache.java b/spring-core-2/src/main/java/com/baeldung/component/autoproxying/DataCache.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/autoproxying/DataCache.java
rename to spring-core-2/src/main/java/com/baeldung/component/autoproxying/DataCache.java
diff --git a/spring-core-5/src/main/java/com/baeldung/component/autoproxying/EligibleForAutoProxyRandomIntProcessor.java b/spring-core-2/src/main/java/com/baeldung/component/autoproxying/EligibleForAutoProxyRandomIntProcessor.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/autoproxying/EligibleForAutoProxyRandomIntProcessor.java
rename to spring-core-2/src/main/java/com/baeldung/component/autoproxying/EligibleForAutoProxyRandomIntProcessor.java
diff --git a/spring-core-5/src/main/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyRandomIntProcessor.java b/spring-core-2/src/main/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyRandomIntProcessor.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyRandomIntProcessor.java
rename to spring-core-2/src/main/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyRandomIntProcessor.java
diff --git a/spring-core-5/src/main/java/com/baeldung/component/autoproxying/RandomInt.java b/spring-core-2/src/main/java/com/baeldung/component/autoproxying/RandomInt.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/autoproxying/RandomInt.java
rename to spring-core-2/src/main/java/com/baeldung/component/autoproxying/RandomInt.java
diff --git a/spring-core-5/src/main/java/com/baeldung/component/autoproxying/RandomIntGenerator.java b/spring-core-2/src/main/java/com/baeldung/component/autoproxying/RandomIntGenerator.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/autoproxying/RandomIntGenerator.java
rename to spring-core-2/src/main/java/com/baeldung/component/autoproxying/RandomIntGenerator.java
diff --git a/spring-core-5/src/main/java/com/baeldung/concurrentrequest/ConcurrentRequestApplication.java b/spring-core-2/src/main/java/com/baeldung/concurrentrequest/ConcurrentRequestApplication.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/concurrentrequest/ConcurrentRequestApplication.java
rename to spring-core-2/src/main/java/com/baeldung/concurrentrequest/ConcurrentRequestApplication.java
diff --git a/spring-core-5/src/main/java/com/baeldung/concurrentrequest/Product.java b/spring-core-2/src/main/java/com/baeldung/concurrentrequest/Product.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/concurrentrequest/Product.java
rename to spring-core-2/src/main/java/com/baeldung/concurrentrequest/Product.java
diff --git a/spring-core-5/src/main/java/com/baeldung/concurrentrequest/ProductController.java b/spring-core-2/src/main/java/com/baeldung/concurrentrequest/ProductController.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/concurrentrequest/ProductController.java
rename to spring-core-2/src/main/java/com/baeldung/concurrentrequest/ProductController.java
diff --git a/spring-core-5/src/main/java/com/baeldung/concurrentrequest/ProductService.java b/spring-core-2/src/main/java/com/baeldung/concurrentrequest/ProductService.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/concurrentrequest/ProductService.java
rename to spring-core-2/src/main/java/com/baeldung/concurrentrequest/ProductService.java
diff --git a/spring-core-5/src/main/java/com/baeldung/concurrentrequest/Stock.java b/spring-core-2/src/main/java/com/baeldung/concurrentrequest/Stock.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/concurrentrequest/Stock.java
rename to spring-core-2/src/main/java/com/baeldung/concurrentrequest/Stock.java
diff --git a/spring-core-6/src/main/java/com/baeldung/reinitializebean/ReinitializeBeanApp.java b/spring-core-2/src/main/java/com/baeldung/reinitializebean/ReinitializeBeanApp.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/reinitializebean/ReinitializeBeanApp.java
rename to spring-core-2/src/main/java/com/baeldung/reinitializebean/ReinitializeBeanApp.java
diff --git a/spring-core-6/src/main/java/com/baeldung/reinitializebean/cache/ConfigManager.java b/spring-core-2/src/main/java/com/baeldung/reinitializebean/cache/ConfigManager.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/reinitializebean/cache/ConfigManager.java
rename to spring-core-2/src/main/java/com/baeldung/reinitializebean/cache/ConfigManager.java
diff --git a/spring-core-6/src/main/java/com/baeldung/reinitializebean/controller/ConfigController.java b/spring-core-2/src/main/java/com/baeldung/reinitializebean/controller/ConfigController.java
similarity index 100%
rename from spring-core-6/src/main/java/com/baeldung/reinitializebean/controller/ConfigController.java
rename to spring-core-2/src/main/java/com/baeldung/reinitializebean/controller/ConfigController.java
diff --git a/spring-core-5/src/main/java/com/baeldung/version/VersionObtainer.java b/spring-core-2/src/main/java/com/baeldung/version/VersionObtainer.java
similarity index 96%
rename from spring-core-5/src/main/java/com/baeldung/version/VersionObtainer.java
rename to spring-core-2/src/main/java/com/baeldung/version/VersionObtainer.java
index 392cc44a72..e0e28c6181 100644
--- a/spring-core-5/src/main/java/com/baeldung/version/VersionObtainer.java
+++ b/spring-core-2/src/main/java/com/baeldung/version/VersionObtainer.java
@@ -1,20 +1,20 @@
-package com.baeldung.version;
-
-import org.springframework.boot.system.JavaVersion;
-import org.springframework.boot.system.SystemProperties;
-import org.springframework.core.SpringVersion;
-
-public class VersionObtainer {
-
-    public String getSpringVersion() {
-        return SpringVersion.getVersion();
-    }
-    
-    public String getJavaVersion() {
-        return JavaVersion.getJavaVersion().toString();
-    }
-    
-    public String getJdkVersion() {
-        return SystemProperties.get("java.version");
-    }
-}
+package com.baeldung.version;
+
+import org.springframework.boot.system.JavaVersion;
+import org.springframework.boot.system.SystemProperties;
+import org.springframework.core.SpringVersion;
+
+public class VersionObtainer {
+
+    public String getSpringVersion() {
+        return SpringVersion.getVersion();
+    }
+    
+    public String getJavaVersion() {
+        return JavaVersion.getJavaVersion().toString();
+    }
+    
+    public String getJdkVersion() {
+        return SystemProperties.get("java.version");
+    }
+}
diff --git a/spring-core-2/src/main/resources/application.properties b/spring-core-2/src/main/resources/application.properties
index d482330b83..97916eec19 100644
--- a/spring-core-2/src/main/resources/application.properties
+++ b/spring-core-2/src/main/resources/application.properties
@@ -1,28 +1 @@
-spring.profiles.active=@spring.profiles.active@
-
-my.prop=used-always-in-all-profiles
-
-#---
-spring.config.activate.on-profile=dev
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://localhost:3306/db
-spring.datasource.username=root
-spring.datasource.password=root
-
-#---
-spring.config.activate.on-profile=production
-spring.datasource.driver-class-name=org.h2.Driver
-spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
-spring.datasource.username=sa
-spring.datasource.password=sa
-
-#---
-spring.profiles.group.production=proddb,prodquartz
-
-#---
-spring.config.activate.on-profile=proddb
-db=url_to_production_db
-
-#---
-spring.config.activate.on-profile=prodquartz
-quartz=url_to_quartz_scheduler
\ No newline at end of file
+config.file.path=./spring-core-2/src/main/resources/config.properties
\ No newline at end of file
diff --git a/spring-core-6/src/main/resources/config.properties b/spring-core-2/src/main/resources/config.properties
similarity index 100%
rename from spring-core-6/src/main/resources/config.properties
rename to spring-core-2/src/main/resources/config.properties
diff --git a/spring-core-6/src/test/java/com/baeldung/applicationcontext/ApplicationContextProviderUnitTest.java b/spring-core-2/src/test/java/com/baeldung/applicationcontext/ApplicationContextProviderUnitTest.java
similarity index 100%
rename from spring-core-6/src/test/java/com/baeldung/applicationcontext/ApplicationContextProviderUnitTest.java
rename to spring-core-2/src/test/java/com/baeldung/applicationcontext/ApplicationContextProviderUnitTest.java
diff --git a/spring-core-6/src/test/java/com/baeldung/applicationcontext/MyBeanUnitTest.java b/spring-core-2/src/test/java/com/baeldung/applicationcontext/MyBeanUnitTest.java
similarity index 100%
rename from spring-core-6/src/test/java/com/baeldung/applicationcontext/MyBeanUnitTest.java
rename to spring-core-2/src/test/java/com/baeldung/applicationcontext/MyBeanUnitTest.java
diff --git a/spring-core-6/src/test/java/com/baeldung/applicationcontext/TestContextConfig.java b/spring-core-2/src/test/java/com/baeldung/applicationcontext/TestContextConfig.java
similarity index 100%
rename from spring-core-6/src/test/java/com/baeldung/applicationcontext/TestContextConfig.java
rename to spring-core-2/src/test/java/com/baeldung/applicationcontext/TestContextConfig.java
diff --git a/spring-core-5/src/test/java/com/baeldung/component/autoproxying/EligibleForAutoProxyingIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/component/autoproxying/EligibleForAutoProxyingIntegrationTest.java
similarity index 100%
rename from spring-core-5/src/test/java/com/baeldung/component/autoproxying/EligibleForAutoProxyingIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/component/autoproxying/EligibleForAutoProxyingIntegrationTest.java
diff --git a/spring-core-5/src/test/java/com/baeldung/component/autoproxying/MemoryLogAppender.java b/spring-core-2/src/test/java/com/baeldung/component/autoproxying/MemoryLogAppender.java
similarity index 100%
rename from spring-core-5/src/test/java/com/baeldung/component/autoproxying/MemoryLogAppender.java
rename to spring-core-2/src/test/java/com/baeldung/component/autoproxying/MemoryLogAppender.java
diff --git a/spring-core-5/src/test/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyingIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyingIntegrationTest.java
similarity index 100%
rename from spring-core-5/src/test/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyingIntegrationTest.java
rename to spring-core-2/src/test/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyingIntegrationTest.java
diff --git a/spring-core-5/src/test/java/com/baeldung/concurrentrequest/ConcurrentRequestManualTest.java b/spring-core-2/src/test/java/com/baeldung/concurrentrequest/ConcurrentRequestManualTest.java
similarity index 100%
rename from spring-core-5/src/test/java/com/baeldung/concurrentrequest/ConcurrentRequestManualTest.java
rename to spring-core-2/src/test/java/com/baeldung/concurrentrequest/ConcurrentRequestManualTest.java
diff --git a/spring-core-5/src/test/java/com/baeldung/version/VersionObtainerUnitTest.java b/spring-core-2/src/test/java/com/baeldung/version/VersionObtainerUnitTest.java
similarity index 96%
rename from spring-core-5/src/test/java/com/baeldung/version/VersionObtainerUnitTest.java
rename to spring-core-2/src/test/java/com/baeldung/version/VersionObtainerUnitTest.java
index 6d77cd1403..af074d5783 100644
--- a/spring-core-5/src/test/java/com/baeldung/version/VersionObtainerUnitTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/version/VersionObtainerUnitTest.java
@@ -1,30 +1,30 @@
-package com.baeldung.version;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest(classes = VersionObtainer.class)
-public class VersionObtainerUnitTest {
-
-    public VersionObtainer version = new VersionObtainer();
-    
-    @Test
-    public void testGetSpringVersion() {
-        String res = version.getSpringVersion();
-        assertThat(res).isNotEmpty();
-    }
-
-    @Test
-    public void testGetJdkVersion() {
-        String res = version.getJdkVersion();
-        assertThat(res).isNotEmpty();
-    }
-
-    @Test
-    public void testGetJavaVersion() {
-        String res = version.getJavaVersion();
-        assertThat(res).isNotEmpty();
-    }
-}
+package com.baeldung.version;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest(classes = VersionObtainer.class)
+public class VersionObtainerUnitTest {
+
+    public VersionObtainer version = new VersionObtainer();
+    
+    @Test
+    public void testGetSpringVersion() {
+        String res = version.getSpringVersion();
+        assertThat(res).isNotEmpty();
+    }
+
+    @Test
+    public void testGetJdkVersion() {
+        String res = version.getJdkVersion();
+        assertThat(res).isNotEmpty();
+    }
+
+    @Test
+    public void testGetJavaVersion() {
+        String res = version.getJavaVersion();
+        assertThat(res).isNotEmpty();
+    }
+}
diff --git a/spring-core-3/README.md b/spring-core-3/README.md
index 7232ad71a1..ed88561e10 100644
--- a/spring-core-3/README.md
+++ b/spring-core-3/README.md
@@ -9,6 +9,6 @@ This module contains articles about core Spring functionality
 - [How to use the Spring FactoryBean?](https://www.baeldung.com/spring-factorybean)
 - [Design Patterns in the Spring Framework](https://www.baeldung.com/spring-framework-design-patterns)
 - [Difference Between BeanFactory and ApplicationContext](https://www.baeldung.com/spring-beanfactory-vs-applicationcontext)
-- [A Spring Custom Annotation for a Better DAO](http://www.baeldung.com/spring-annotation-bean-pre-processor)
 - [Custom Scope in Spring](http://www.baeldung.com/spring-custom-scope)
+- [The Spring ApplicationContext](https://www.baeldung.com/spring-application-context)
 - More articles: [[<-- prev]](/spring-core-2) [[next -->]](/spring-core-4)
diff --git a/spring-core-4/src/main/java/com/baeldung/applicationcontext/AccountConfig.java b/spring-core-3/src/main/java/com/baeldung/applicationcontext/AccountConfig.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/applicationcontext/AccountConfig.java
rename to spring-core-3/src/main/java/com/baeldung/applicationcontext/AccountConfig.java
diff --git a/spring-core-4/src/main/java/com/baeldung/applicationcontext/AccountRepository.java b/spring-core-3/src/main/java/com/baeldung/applicationcontext/AccountRepository.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/applicationcontext/AccountRepository.java
rename to spring-core-3/src/main/java/com/baeldung/applicationcontext/AccountRepository.java
diff --git a/spring-core-4/src/main/java/com/baeldung/applicationcontext/AccountService.java b/spring-core-3/src/main/java/com/baeldung/applicationcontext/AccountService.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/applicationcontext/AccountService.java
rename to spring-core-3/src/main/java/com/baeldung/applicationcontext/AccountService.java
diff --git a/spring-core-4/src/main/java/com/baeldung/applicationcontext/MyWebApplicationInitializer.java b/spring-core-3/src/main/java/com/baeldung/applicationcontext/MyWebApplicationInitializer.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/applicationcontext/MyWebApplicationInitializer.java
rename to spring-core-3/src/main/java/com/baeldung/applicationcontext/MyWebApplicationInitializer.java
diff --git a/spring-core-4/src/main/java/com/baeldung/applicationcontext/MyXmlWebApplicationInitializer.java b/spring-core-3/src/main/java/com/baeldung/applicationcontext/MyXmlWebApplicationInitializer.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/applicationcontext/MyXmlWebApplicationInitializer.java
rename to spring-core-3/src/main/java/com/baeldung/applicationcontext/MyXmlWebApplicationInitializer.java
diff --git a/spring-core-4/src/main/java/com/baeldung/applicationcontext/UserService.java b/spring-core-3/src/main/java/com/baeldung/applicationcontext/UserService.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/applicationcontext/UserService.java
rename to spring-core-3/src/main/java/com/baeldung/applicationcontext/UserService.java
diff --git a/spring-core-4/src/test/java/com/baeldung/applicationcontext/ApplicationContextUnitTest.java b/spring-core-3/src/test/java/com/baeldung/applicationcontext/ApplicationContextUnitTest.java
similarity index 100%
rename from spring-core-4/src/test/java/com/baeldung/applicationcontext/ApplicationContextUnitTest.java
rename to spring-core-3/src/test/java/com/baeldung/applicationcontext/ApplicationContextUnitTest.java
diff --git a/spring-core-4/src/test/resources/applicationcontext/account-bean-config.xml b/spring-core-3/src/test/resources/applicationcontext/account-bean-config.xml
similarity index 100%
rename from spring-core-4/src/test/resources/applicationcontext/account-bean-config.xml
rename to spring-core-3/src/test/resources/applicationcontext/account-bean-config.xml
diff --git a/spring-core-4/src/test/resources/applicationcontext/user-bean-config.xml b/spring-core-3/src/test/resources/applicationcontext/user-bean-config.xml
similarity index 100%
rename from spring-core-4/src/test/resources/applicationcontext/user-bean-config.xml
rename to spring-core-3/src/test/resources/applicationcontext/user-bean-config.xml
diff --git a/spring-core-4/src/test/resources/config/messages.properties b/spring-core-3/src/test/resources/config/messages.properties
similarity index 100%
rename from spring-core-4/src/test/resources/config/messages.properties
rename to spring-core-3/src/test/resources/config/messages.properties
diff --git a/spring-core-4/README.md b/spring-core-4/README.md
index 3b2c3d4764..a0f5ac97f9 100644
--- a/spring-core-4/README.md
+++ b/spring-core-4/README.md
@@ -5,10 +5,5 @@ This module contains articles about core Spring functionality
 ## Relevant Articles:
 
 - [Creating Spring Beans Through Factory Methods](https://www.baeldung.com/spring-beans-factory-methods)
-- [How to dynamically Autowire a Bean in Spring](https://www.baeldung.com/spring-dynamic-autowire)
-- [Spring @Import Annotation](https://www.baeldung.com/spring-import-annotation)
 - [Spring BeanPostProcessor](https://www.baeldung.com/spring-beanpostprocessor)
-- [Using @Autowired in Abstract Classes](https://www.baeldung.com/spring-autowired-abstract-class)
-- [Constructor Injection in Spring with Lombok](https://www.baeldung.com/spring-injection-lombok)
-- [The Spring ApplicationContext](https://www.baeldung.com/spring-application-context)
-- More articles: [[<-- prev]](/spring-core-3) [[next -->]](/spring-core-5)
+- More articles: [[<-- prev]](/spring-core-3)
diff --git a/spring-core-4/pom.xml b/spring-core-4/pom.xml
index 2874931738..6ba8357a0e 100644
--- a/spring-core-4/pom.xml
+++ b/spring-core-4/pom.xml
@@ -66,6 +66,11 @@
             <artifactId>javax.servlet-api</artifactId>
             <version>${servlet-api.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${annotation-api.version}</version>
+        </dependency>
     </dependencies>
 
     <properties>
@@ -73,6 +78,8 @@
         <spring.boot.version>2.2.2.RELEASE</spring.boot.version>
         <awaitility.version>4.0.2</awaitility.version>
         <servlet-api.version>4.0.0</servlet-api.version>
+        <annotation-api.version>1.3.2</annotation-api.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-core-5/README.md b/spring-core-5/README.md
deleted file mode 100644
index ebf62ac24f..0000000000
--- a/spring-core-5/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-## Spring Core
-
-This module contains articles about core Spring functionality.
-
-## Relevant Articles:
-
-- [Spring @Component Annotation](https://www.baeldung.com/spring-component-annotation)
-- [Solving Spring’s “not eligible for auto-proxying” Warning](https://www.baeldung.com/spring-not-eligible-for-auto-proxying)
-- [Spring Bean Names](https://www.baeldung.com/spring-bean-names)
-- [AliasFor Annotation in Spring](https://www.baeldung.com/spring-aliasfor-annotation)
-- [A Quick Guide to the Spring @Lazy Annotation](https://www.baeldung.com/spring-lazy-annotation)
-- [Finding the Spring Version](https://www.baeldung.com/spring-find-version)
-- [How Does the Spring Singleton Bean Serve Concurrent Requests?](https://www.baeldung.com/spring-singleton-concurrent-requests)
-- More articles: [[<-- prev]](../spring-core-4)
diff --git a/spring-core-5/pom.xml b/spring-core-5/pom.xml
deleted file mode 100644
index 1c2e80be44..0000000000
--- a/spring-core-5/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>spring-core-5</artifactId>
-    <name>spring-core-5</name>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-spring-5</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-spring-5</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-            <version>${spring-boot-starter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>${spring-boot-starter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <version>${spring-boot-starter.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <spring.version>5.3.3</spring.version>
-        <spring-boot-starter.version>2.4.2</spring-boot-starter.version>
-    </properties>
-
-</project>
\ No newline at end of file
diff --git a/spring-core-6/README.md b/spring-core-6/README.md
deleted file mode 100644
index e10db19a54..0000000000
--- a/spring-core-6/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-
-### Relevant Articles:
-- [Instantiating Multiple Beans of the Same Class with Spring Annotations](https://www.baeldung.com/spring-same-class-multiple-beans)
-- [Using Environment Variables in Spring Boot’s application.properties](https://www.baeldung.com/spring-boot-properties-env-variables)
-- [Reinitialize Singleton Bean in Spring Context](https://www.baeldung.com/spring-reinitialize-singleton-bean)
-- [HTTP Interface in Spring 6](https://www.baeldung.com/spring-6-http-interface)
-- [Getting the Current ApplicationContext in Spring](https://www.baeldung.com/spring-get-current-applicationcontext)
diff --git a/spring-core-6/pom.xml b/spring-core-6/pom.xml
deleted file mode 100644
index a3dda0374f..0000000000
--- a/spring-core-6/pom.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    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>
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-core-6</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-core-6</name>
-    <url>http://www.baeldung.com</url>
-
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.1</version>
-        <relativePath/> <!-- lookup parent from repository -->
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mock-server</groupId>
-            <artifactId>mockserver-netty</artifactId>
-            <version>${mockserver.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mock-server</groupId>
-            <artifactId>mockserver-client-java</artifactId>
-            <version>${mockserver.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.projectreactor</groupId>
-            <artifactId>reactor-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.1.0</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.0.2</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.0</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.1</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.0.2</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-install-plugin</artifactId>
-                    <version>2.5.2</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.8.2</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>3.7.1</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-project-info-reports-plugin</artifactId>
-                    <version>3.0.0</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <mockserver.version>5.14.0</mockserver.version>
-    </properties>
-
-</project>
\ No newline at end of file
diff --git a/spring-core-6/src/main/resources/application.properties b/spring-core-6/src/main/resources/application.properties
deleted file mode 100644
index 28a65dce32..0000000000
--- a/spring-core-6/src/main/resources/application.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-environment.name=${OS}
-java.home.and.environment=${JAVA_HOME}+${OS}
-not.existing.system.property=${thispropertydoesnotexist}
-baeldung.presentation=${HELLO_BAELDUNG}. Java is installed in the folder: ${JAVA_HOME}
-config.file.path=./spring-core-6/src/main/resources/config.properties
\ No newline at end of file
diff --git a/spring-core-6/src/test/java/com/baeldung/httpinterface/BooksServiceMockServerTest.java b/spring-core-6/src/test/java/com/baeldung/httpinterface/BooksServiceMockServerTest.java
deleted file mode 100644
index 22e00c16ae..0000000000
--- a/spring-core-6/src/test/java/com/baeldung/httpinterface/BooksServiceMockServerTest.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package com.baeldung.httpinterface;
-
-import org.apache.http.HttpException;
-import org.apache.http.HttpStatus;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.mockserver.client.MockServerClient;
-import org.mockserver.integration.ClientAndServer;
-import org.mockserver.configuration.Configuration;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.util.List;
-
-import org.mockserver.model.HttpRequest;
-import org.mockserver.model.MediaType;
-import org.mockserver.verify.VerificationTimes;
-import org.slf4j.event.Level;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatusCode;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-import reactor.core.publisher.Mono;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockserver.integration.ClientAndServer.startClientAndServer;
-import static org.mockserver.matchers.Times.exactly;
-import static org.mockserver.model.HttpRequest.request;
-import static org.mockserver.model.HttpResponse.response;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class BooksServiceMockServerTest {
-
-    private static final String SERVER_ADDRESS = "localhost";
-    private static final String PATH = "/books";
-
-    private static int serverPort;
-    private static ClientAndServer mockServer;
-    private static String serviceUrl;
-
-    @BeforeAll
-    static void startServer() throws IOException {
-        serverPort = getFreePort();
-        serviceUrl = "http://" + SERVER_ADDRESS + ":" + serverPort;
-
-        Configuration config = Configuration.configuration().logLevel(Level.WARN);
-        mockServer = startClientAndServer(config, serverPort);
-
-        mockAllBooksRequest();
-        mockBookByIdRequest();
-        mockSaveBookRequest();
-        mockDeleteBookRequest();
-    }
-
-    @AfterAll
-    static void stopServer() {
-        mockServer.stop();
-    }
-
-    @Test
-    void givenMockedGetResponse_whenGetBooksServiceMethodIsCalled_thenTwoBooksAreReturned() {
-        BooksClient booksClient = new BooksClient(WebClient.builder().baseUrl(serviceUrl).build());
-        BooksService booksService = booksClient.getBooksService();
-
-        List<Book> books = booksService.getBooks();
-        assertEquals(2, books.size());
-
-        mockServer.verify(
-          HttpRequest.request()
-            .withMethod(HttpMethod.GET.name())
-            .withPath(PATH),
-          VerificationTimes.exactly(1)
-        );
-    }
-
-    @Test
-    void givenMockedGetResponse_whenGetExistingBookServiceMethodIsCalled_thenCorrectBookIsReturned() {
-        BooksClient booksClient = new BooksClient(WebClient.builder().baseUrl(serviceUrl).build());
-        BooksService booksService = booksClient.getBooksService();
-
-        Book book = booksService.getBook(1);
-        assertEquals("Book_1", book.title());
-
-        mockServer.verify(
-          HttpRequest.request()
-            .withMethod(HttpMethod.GET.name())
-            .withPath(PATH + "/1"),
-          VerificationTimes.exactly(1)
-        );
-    }
-
-    @Test
-    void givenMockedGetResponse_whenGetNonExistingBookServiceMethodIsCalled_thenCorrectBookIsReturned() {
-        BooksClient booksClient = new BooksClient(WebClient.builder().baseUrl(serviceUrl).build());
-        BooksService booksService = booksClient.getBooksService();
-
-        assertThrows(WebClientResponseException.class, () -> booksService.getBook(9));
-    }
-
-    @Test
-    void givenCustomErrorHandlerIsSet_whenGetNonExistingBookServiceMethodIsCalled_thenCustomExceptionIsThrown() {
-        BooksClient booksClient = new BooksClient(WebClient.builder()
-          .defaultStatusHandler(HttpStatusCode::isError, resp ->
-            Mono.just(new MyServiceException("Custom exception")))
-          .baseUrl(serviceUrl)
-          .build());
-
-        BooksService booksService = booksClient.getBooksService();
-        assertThrows(MyServiceException.class, () -> booksService.getBook(9));
-    }
-
-    @Test
-    void givenMockedPostResponse_whenSaveBookServiceMethodIsCalled_thenCorrectBookIsReturned() {
-        BooksClient booksClient = new BooksClient(WebClient.builder().baseUrl(serviceUrl).build());
-        BooksService booksService = booksClient.getBooksService();
-
-        Book book = booksService.saveBook(new Book(3, "Book_3", "Author_3", 2000));
-        assertEquals("Book_3", book.title());
-
-        mockServer.verify(
-          HttpRequest.request()
-            .withMethod(HttpMethod.POST.name())
-            .withPath(PATH),
-          VerificationTimes.exactly(1)
-        );
-    }
-
-    @Test
-    void givenMockedDeleteResponse_whenDeleteBookServiceMethodIsCalled_thenCorrectCodeIsReturned() {
-        BooksClient booksClient = new BooksClient(WebClient.builder().baseUrl(serviceUrl).build());
-        BooksService booksService = booksClient.getBooksService();
-
-        ResponseEntity<Void> response = booksService.deleteBook(3);
-        assertEquals(HttpStatusCode.valueOf(200), response.getStatusCode());
-
-        mockServer.verify(
-          HttpRequest.request()
-            .withMethod(HttpMethod.DELETE.name())
-            .withPath(PATH + "/3"),
-          VerificationTimes.exactly(1)
-        );
-    }
-
-    private static int getFreePort () throws IOException {
-        try (ServerSocket serverSocket = new ServerSocket(0)) {
-            return serverSocket.getLocalPort();
-        }
-    }
-
-    private static void mockAllBooksRequest() {
-        new MockServerClient(SERVER_ADDRESS, serverPort)
-          .when(
-            request()
-              .withPath(PATH)
-              .withMethod(HttpMethod.GET.name()),
-            exactly(1)
-          )
-          .respond(
-            response()
-              .withStatusCode(HttpStatus.SC_OK)
-              .withContentType(MediaType.APPLICATION_JSON)
-              .withBody("[{\"id\":1,\"title\":\"Book_1\",\"author\":\"Author_1\",\"year\":1998},{\"id\":2,\"title\":\"Book_2\",\"author\":\"Author_2\",\"year\":1999}]")
-          );
-    }
-
-    private static void mockBookByIdRequest() {
-        new MockServerClient(SERVER_ADDRESS, serverPort)
-          .when(
-            request()
-              .withPath(PATH + "/1")
-              .withMethod(HttpMethod.GET.name()),
-            exactly(1)
-          )
-          .respond(
-            response()
-              .withStatusCode(HttpStatus.SC_OK)
-              .withContentType(MediaType.APPLICATION_JSON)
-              .withBody("{\"id\":1,\"title\":\"Book_1\",\"author\":\"Author_1\",\"year\":1998}")
-          );
-    }
-
-    private static void mockSaveBookRequest() {
-        new MockServerClient(SERVER_ADDRESS, serverPort)
-          .when(
-            request()
-              .withPath(PATH)
-              .withMethod(HttpMethod.POST.name())
-              .withContentType(MediaType.APPLICATION_JSON)
-              .withBody("{\"id\":3,\"title\":\"Book_3\",\"author\":\"Author_3\",\"year\":2000}"),
-            exactly(1)
-          )
-          .respond(
-            response()
-              .withStatusCode(HttpStatus.SC_OK)
-              .withContentType(MediaType.APPLICATION_JSON)
-              .withBody("{\"id\":3,\"title\":\"Book_3\",\"author\":\"Author_3\",\"year\":2000}")
-          );
-    }
-
-    private static void mockDeleteBookRequest() {
-        new MockServerClient(SERVER_ADDRESS, serverPort)
-          .when(
-            request()
-              .withPath(PATH + "/3")
-              .withMethod(HttpMethod.DELETE.name()),
-            exactly(1)
-          )
-          .respond(
-            response()
-              .withStatusCode(HttpStatus.SC_OK)
-          );
-    }
-
-}
diff --git a/spring-core-6/src/test/java/com/baeldung/httpinterface/BooksServiceMockitoTest.java b/spring-core-6/src/test/java/com/baeldung/httpinterface/BooksServiceMockitoTest.java
deleted file mode 100644
index 7a82835ef3..0000000000
--- a/spring-core-6/src/test/java/com/baeldung/httpinterface/BooksServiceMockitoTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.baeldung.httpinterface;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Answers;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatusCode;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Mono;
-
-import static org.mockito.BDDMockito.*;
-
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-@ExtendWith(MockitoExtension.class)
-class BooksServiceMockitoTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private WebClient webClient;
-
-    @InjectMocks
-    private BooksClient booksClient;
-
-    @Test
-    void givenMockedWebClientReturnsTwoBooks_whenGetBooksServiceMethodIsCalled_thenListOfTwoBooksIsReturned() {
-        given(webClient.method(HttpMethod.GET)
-          .uri(anyString(), anyMap())
-          .retrieve()
-          .bodyToMono(new ParameterizedTypeReference<List<Book>>(){}))
-          .willReturn(Mono.just(List.of(
-            new Book(1,"Book_1", "Author_1", 1998),
-            new Book(2, "Book_2", "Author_2", 1999)
-          )));
-
-        BooksService booksService = booksClient.getBooksService();
-        List<Book> books = booksService.getBooks();
-        assertEquals(2, books.size());
-    }
-
-    @Test
-    void givenMockedWebClientReturnsBook_whenGetBookServiceMethodIsCalled_thenBookIsReturned() {
-        given(webClient.method(HttpMethod.GET)
-          .uri(anyString(), anyMap())
-          .retrieve()
-          .bodyToMono(new ParameterizedTypeReference<Book>(){}))
-          .willReturn(Mono.just(new Book(1,"Book_1", "Author_1", 1998)));
-
-        BooksService booksService = booksClient.getBooksService();
-        Book book = booksService.getBook(1);
-        assertEquals("Book_1", book.title());
-    }
-
-    @Test
-    void givenMockedWebClientReturnsBook_whenSaveBookServiceMethodIsCalled_thenBookIsReturned() {
-        given(webClient.method(HttpMethod.POST)
-          .uri(anyString(), anyMap())
-          .retrieve()
-          .bodyToMono(new ParameterizedTypeReference<Book>(){}))
-          .willReturn(Mono.just(new Book(3, "Book_3", "Author_3", 2000)));
-
-        BooksService booksService = booksClient.getBooksService();
-        Book book = booksService.saveBook(new Book(3, "Book_3", "Author_3", 2000));
-        assertEquals("Book_3", book.title());
-    }
-
-    @Test
-    void givenMockedWebClientReturnsOk_whenDeleteBookServiceMethodIsCalled_thenOkCodeIsReturned() {
-        given(webClient.method(HttpMethod.DELETE)
-          .uri(anyString(), anyMap())
-          .retrieve()
-          .toBodilessEntity()
-          .block(any())
-          .getStatusCode())
-          .willReturn(HttpStatusCode.valueOf(200));
-
-        BooksService booksService = booksClient.getBooksService();
-        ResponseEntity<Void> response = booksService.deleteBook(3);
-        assertEquals(HttpStatusCode.valueOf(200), response.getStatusCode());
-    }
-
-}
diff --git a/spring-core/pom.xml b/spring-core/pom.xml
index d8eaf22220..d1c155b92a 100644
--- a/spring-core/pom.xml
+++ b/spring-core/pom.xml
@@ -62,6 +62,11 @@
             <artifactId>commons-io</artifactId>
             <version>${commons-io.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${annotation-api.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -82,6 +87,8 @@
         <javax.inject.version>1</javax.inject.version>
         <spring-boot.version>1.5.2.RELEASE</spring-boot.version>
         <mockito.version>1.10.19</mockito.version>
+        <annotation-api.version>1.3.2</annotation-api.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-di-2/pom.xml b/spring-di-2/pom.xml
index 1207506d17..69333c74f1 100644
--- a/spring-di-2/pom.xml
+++ b/spring-di-2/pom.xml
@@ -85,7 +85,7 @@
 
     <properties>
         <spring-boot.version>2.6.1</spring-boot.version>
-        <aspectj-plugin.version>1.11</aspectj-plugin.version>
+        <aspectj-plugin.version>1.14.0</aspectj-plugin.version>
         <javax.inject.version>1</javax.inject.version>
         <log4j2.version>2.17.1</log4j2.version>
     </properties>
diff --git a/spring-di-3/README.md b/spring-di-3/README.md
index 3ddd720af5..ffb81fbe7d 100644
--- a/spring-di-3/README.md
+++ b/spring-di-3/README.md
@@ -7,4 +7,8 @@ This module contains articles about dependency injection with Spring
 - [@Lookup Annotation in Spring](https://www.baeldung.com/spring-lookup)
 - [Spring @Autowired Field Null – Common Causes and Solutions](https://www.baeldung.com/spring-autowired-field-null)
 - [Finding All Beans with a Custom Annotation](https://www.baeldung.com/spring-injecting-all-annotated-beans)
-- More articles: [[<-- prev]](../spring-di-2)
+- [Guide to Spring @Autowired](http://www.baeldung.com/spring-autowire)
+- [@Order in Spring](http://www.baeldung.com/spring-order)
+- [How to dynamically Autowire a Bean in Spring](https://www.baeldung.com/spring-dynamic-autowire)
+- [Spring @Import Annotation](https://www.baeldung.com/spring-import-annotation)
+- More articles: [[<-- prev]](../spring-di-2)[[more -->]](../spring-di-4)
diff --git a/spring-core-2/src/main/java/com/baeldung/autowire/sample/App.java b/spring-di-3/src/main/java/com/baeldung/autowire/sample/App.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/autowire/sample/App.java
rename to spring-di-3/src/main/java/com/baeldung/autowire/sample/App.java
diff --git a/spring-core-2/src/main/java/com/baeldung/autowire/sample/AppConfig.java b/spring-di-3/src/main/java/com/baeldung/autowire/sample/AppConfig.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/autowire/sample/AppConfig.java
rename to spring-di-3/src/main/java/com/baeldung/autowire/sample/AppConfig.java
diff --git a/spring-core-2/src/main/java/com/baeldung/autowire/sample/BarFormatter.java b/spring-di-3/src/main/java/com/baeldung/autowire/sample/BarFormatter.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/autowire/sample/BarFormatter.java
rename to spring-di-3/src/main/java/com/baeldung/autowire/sample/BarFormatter.java
diff --git a/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooDAO.java b/spring-di-3/src/main/java/com/baeldung/autowire/sample/FooDAO.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/autowire/sample/FooDAO.java
rename to spring-di-3/src/main/java/com/baeldung/autowire/sample/FooDAO.java
diff --git a/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooFormatter.java b/spring-di-3/src/main/java/com/baeldung/autowire/sample/FooFormatter.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/autowire/sample/FooFormatter.java
rename to spring-di-3/src/main/java/com/baeldung/autowire/sample/FooFormatter.java
diff --git a/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooService.java b/spring-di-3/src/main/java/com/baeldung/autowire/sample/FooService.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/autowire/sample/FooService.java
rename to spring-di-3/src/main/java/com/baeldung/autowire/sample/FooService.java
diff --git a/spring-core-2/src/main/java/com/baeldung/autowire/sample/Formatter.java b/spring-di-3/src/main/java/com/baeldung/autowire/sample/Formatter.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/autowire/sample/Formatter.java
rename to spring-di-3/src/main/java/com/baeldung/autowire/sample/Formatter.java
diff --git a/spring-core-2/src/main/java/com/baeldung/autowire/sample/FormatterType.java b/spring-di-3/src/main/java/com/baeldung/autowire/sample/FormatterType.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/autowire/sample/FormatterType.java
rename to spring-di-3/src/main/java/com/baeldung/autowire/sample/FormatterType.java
diff --git a/spring-core-4/src/main/java/com/baeldung/dynamic/autowire/BeanFactoryDynamicAutowireService.java b/spring-di-3/src/main/java/com/baeldung/dynamic/autowire/BeanFactoryDynamicAutowireService.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/dynamic/autowire/BeanFactoryDynamicAutowireService.java
rename to spring-di-3/src/main/java/com/baeldung/dynamic/autowire/BeanFactoryDynamicAutowireService.java
diff --git a/spring-core-4/src/main/java/com/baeldung/dynamic/autowire/CustomMapFromListDynamicAutowireService.java b/spring-di-3/src/main/java/com/baeldung/dynamic/autowire/CustomMapFromListDynamicAutowireService.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/dynamic/autowire/CustomMapFromListDynamicAutowireService.java
rename to spring-di-3/src/main/java/com/baeldung/dynamic/autowire/CustomMapFromListDynamicAutowireService.java
diff --git a/spring-core-4/src/main/java/com/baeldung/dynamic/autowire/DynamicAutowireConfig.java b/spring-di-3/src/main/java/com/baeldung/dynamic/autowire/DynamicAutowireConfig.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/dynamic/autowire/DynamicAutowireConfig.java
rename to spring-di-3/src/main/java/com/baeldung/dynamic/autowire/DynamicAutowireConfig.java
diff --git a/spring-core-4/src/main/java/com/baeldung/dynamic/autowire/GBRegionService.java b/spring-di-3/src/main/java/com/baeldung/dynamic/autowire/GBRegionService.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/dynamic/autowire/GBRegionService.java
rename to spring-di-3/src/main/java/com/baeldung/dynamic/autowire/GBRegionService.java
diff --git a/spring-core-4/src/main/java/com/baeldung/dynamic/autowire/RegionService.java b/spring-di-3/src/main/java/com/baeldung/dynamic/autowire/RegionService.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/dynamic/autowire/RegionService.java
rename to spring-di-3/src/main/java/com/baeldung/dynamic/autowire/RegionService.java
diff --git a/spring-core-4/src/main/java/com/baeldung/dynamic/autowire/USRegionService.java b/spring-di-3/src/main/java/com/baeldung/dynamic/autowire/USRegionService.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/dynamic/autowire/USRegionService.java
rename to spring-di-3/src/main/java/com/baeldung/dynamic/autowire/USRegionService.java
diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/AnimalConfiguration.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/AnimalConfiguration.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/AnimalConfiguration.java
rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/AnimalConfiguration.java
diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/AnimalScanConfiguration.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/AnimalScanConfiguration.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/AnimalScanConfiguration.java
rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/AnimalScanConfiguration.java
diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/Bird.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/Bird.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/Bird.java
rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/Bird.java
diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/BirdConfig.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/BirdConfig.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/BirdConfig.java
rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/BirdConfig.java
diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/Bug.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/Bug.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/Bug.java
rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/Bug.java
diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/BugConfig.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/BugConfig.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/BugConfig.java
rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/BugConfig.java
diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/Cat.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/Cat.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/Cat.java
rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/Cat.java
diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/CatConfig.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/CatConfig.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/CatConfig.java
rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/CatConfig.java
diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/Dog.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/Dog.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/Dog.java
rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/Dog.java
diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/DogConfig.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/DogConfig.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/DogConfig.java
rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/DogConfig.java
diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/MammalConfiguration.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/MammalConfiguration.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/MammalConfiguration.java
rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/MammalConfiguration.java
diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/zoo/ZooApplication.java b/spring-di-3/src/main/java/com/baeldung/importannotation/zoo/ZooApplication.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/importannotation/zoo/ZooApplication.java
rename to spring-di-3/src/main/java/com/baeldung/importannotation/zoo/ZooApplication.java
diff --git a/spring-core-2/src/main/java/com/baeldung/order/Average.java b/spring-di-3/src/main/java/com/baeldung/order/Average.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/order/Average.java
rename to spring-di-3/src/main/java/com/baeldung/order/Average.java
diff --git a/spring-core-2/src/main/java/com/baeldung/order/Excellent.java b/spring-di-3/src/main/java/com/baeldung/order/Excellent.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/order/Excellent.java
rename to spring-di-3/src/main/java/com/baeldung/order/Excellent.java
diff --git a/spring-core-2/src/main/java/com/baeldung/order/Good.java b/spring-di-3/src/main/java/com/baeldung/order/Good.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/order/Good.java
rename to spring-di-3/src/main/java/com/baeldung/order/Good.java
diff --git a/spring-core-2/src/main/java/com/baeldung/order/Rating.java b/spring-di-3/src/main/java/com/baeldung/order/Rating.java
similarity index 100%
rename from spring-core-2/src/main/java/com/baeldung/order/Rating.java
rename to spring-di-3/src/main/java/com/baeldung/order/Rating.java
diff --git a/spring-core-2/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java b/spring-di-3/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java
rename to spring-di-3/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java
diff --git a/spring-core-4/src/test/java/com/baeldung/dynamic/autowire/DynamicAutowireIntegrationTest.java b/spring-di-3/src/test/java/com/baeldung/dynamic/autowire/DynamicAutowireIntegrationTest.java
similarity index 100%
rename from spring-core-4/src/test/java/com/baeldung/dynamic/autowire/DynamicAutowireIntegrationTest.java
rename to spring-di-3/src/test/java/com/baeldung/dynamic/autowire/DynamicAutowireIntegrationTest.java
diff --git a/spring-core-4/src/test/java/com/baeldung/importannotation/animal/AnimalConfigUnitTest.java b/spring-di-3/src/test/java/com/baeldung/importannotation/animal/AnimalConfigUnitTest.java
similarity index 100%
rename from spring-core-4/src/test/java/com/baeldung/importannotation/animal/AnimalConfigUnitTest.java
rename to spring-di-3/src/test/java/com/baeldung/importannotation/animal/AnimalConfigUnitTest.java
diff --git a/spring-core-4/src/test/java/com/baeldung/importannotation/animal/BugConfigUnitTest.java b/spring-di-3/src/test/java/com/baeldung/importannotation/animal/BugConfigUnitTest.java
similarity index 100%
rename from spring-core-4/src/test/java/com/baeldung/importannotation/animal/BugConfigUnitTest.java
rename to spring-di-3/src/test/java/com/baeldung/importannotation/animal/BugConfigUnitTest.java
diff --git a/spring-core-4/src/test/java/com/baeldung/importannotation/animal/ConfigUnitTest.java b/spring-di-3/src/test/java/com/baeldung/importannotation/animal/ConfigUnitTest.java
similarity index 100%
rename from spring-core-4/src/test/java/com/baeldung/importannotation/animal/ConfigUnitTest.java
rename to spring-di-3/src/test/java/com/baeldung/importannotation/animal/ConfigUnitTest.java
diff --git a/spring-core-4/src/test/java/com/baeldung/importannotation/animal/MammalConfigUnitTest.java b/spring-di-3/src/test/java/com/baeldung/importannotation/animal/MammalConfigUnitTest.java
similarity index 100%
rename from spring-core-4/src/test/java/com/baeldung/importannotation/animal/MammalConfigUnitTest.java
rename to spring-di-3/src/test/java/com/baeldung/importannotation/animal/MammalConfigUnitTest.java
diff --git a/spring-core-4/src/test/java/com/baeldung/importannotation/zoo/ZooApplicationUnitTest.java b/spring-di-3/src/test/java/com/baeldung/importannotation/zoo/ZooApplicationUnitTest.java
similarity index 100%
rename from spring-core-4/src/test/java/com/baeldung/importannotation/zoo/ZooApplicationUnitTest.java
rename to spring-di-3/src/test/java/com/baeldung/importannotation/zoo/ZooApplicationUnitTest.java
diff --git a/spring-core-2/src/test/java/com/baeldung/order/RatingRetrieverUnitTest.java b/spring-di-3/src/test/java/com/baeldung/order/RatingRetrieverUnitTest.java
similarity index 100%
rename from spring-core-2/src/test/java/com/baeldung/order/RatingRetrieverUnitTest.java
rename to spring-di-3/src/test/java/com/baeldung/order/RatingRetrieverUnitTest.java
diff --git a/spring-di-4/README.md b/spring-di-4/README.md
new file mode 100644
index 0000000000..d4b0d94385
--- /dev/null
+++ b/spring-di-4/README.md
@@ -0,0 +1,9 @@
+## Spring Dependency Injection
+
+This module contains articles about dependency injection with Spring
+
+### Relevant Articles
+
+- [Using @Autowired in Abstract Classes](https://www.baeldung.com/spring-autowired-abstract-class)
+- [Spring @Component Annotation](https://www.baeldung.com/spring-component-annotation)
+- More articles: [[<-- prev]](../spring-di-3)
diff --git a/spring-di-4/pom.xml b/spring-di-4/pom.xml
new file mode 100644
index 0000000000..c6572495cb
--- /dev/null
+++ b/spring-di-4/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>spring-di-4</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>spring-di-4</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/spring-core-5/src/main/java/com/baeldung/component/inscope/AmbiguousBean.java b/spring-di-4/src/main/java/com/baeldung/component/inscope/AmbiguousBean.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/inscope/AmbiguousBean.java
rename to spring-di-4/src/main/java/com/baeldung/component/inscope/AmbiguousBean.java
diff --git a/spring-core-5/src/main/java/com/baeldung/component/inscope/BeanExample.java b/spring-di-4/src/main/java/com/baeldung/component/inscope/BeanExample.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/inscope/BeanExample.java
rename to spring-di-4/src/main/java/com/baeldung/component/inscope/BeanExample.java
diff --git a/spring-core-5/src/main/java/com/baeldung/component/inscope/BeanImplA.java b/spring-di-4/src/main/java/com/baeldung/component/inscope/BeanImplA.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/inscope/BeanImplA.java
rename to spring-di-4/src/main/java/com/baeldung/component/inscope/BeanImplA.java
diff --git a/spring-core-5/src/main/java/com/baeldung/component/inscope/BeanImplB.java b/spring-di-4/src/main/java/com/baeldung/component/inscope/BeanImplB.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/inscope/BeanImplB.java
rename to spring-di-4/src/main/java/com/baeldung/component/inscope/BeanImplB.java
diff --git a/spring-core-5/src/main/java/com/baeldung/component/inscope/ComponentApplication.java b/spring-di-4/src/main/java/com/baeldung/component/inscope/ComponentApplication.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/inscope/ComponentApplication.java
rename to spring-di-4/src/main/java/com/baeldung/component/inscope/ComponentApplication.java
diff --git a/spring-core-5/src/main/java/com/baeldung/component/inscope/ComponentExample.java b/spring-di-4/src/main/java/com/baeldung/component/inscope/ComponentExample.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/inscope/ComponentExample.java
rename to spring-di-4/src/main/java/com/baeldung/component/inscope/ComponentExample.java
diff --git a/spring-core-5/src/main/java/com/baeldung/component/inscope/ControllerExample.java b/spring-di-4/src/main/java/com/baeldung/component/inscope/ControllerExample.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/inscope/ControllerExample.java
rename to spring-di-4/src/main/java/com/baeldung/component/inscope/ControllerExample.java
diff --git a/spring-core-5/src/main/java/com/baeldung/component/inscope/CustomComponent.java b/spring-di-4/src/main/java/com/baeldung/component/inscope/CustomComponent.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/inscope/CustomComponent.java
rename to spring-di-4/src/main/java/com/baeldung/component/inscope/CustomComponent.java
diff --git a/spring-core-5/src/main/java/com/baeldung/component/inscope/CustomComponentExample.java b/spring-di-4/src/main/java/com/baeldung/component/inscope/CustomComponentExample.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/inscope/CustomComponentExample.java
rename to spring-di-4/src/main/java/com/baeldung/component/inscope/CustomComponentExample.java
diff --git a/spring-core-5/src/main/java/com/baeldung/component/inscope/RepositoryExample.java b/spring-di-4/src/main/java/com/baeldung/component/inscope/RepositoryExample.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/inscope/RepositoryExample.java
rename to spring-di-4/src/main/java/com/baeldung/component/inscope/RepositoryExample.java
diff --git a/spring-core-5/src/main/java/com/baeldung/component/inscope/ServiceExample.java b/spring-di-4/src/main/java/com/baeldung/component/inscope/ServiceExample.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/inscope/ServiceExample.java
rename to spring-di-4/src/main/java/com/baeldung/component/inscope/ServiceExample.java
diff --git a/spring-core-5/src/main/java/com/baeldung/component/outsidescope/OutsideScopeBeanExample.java b/spring-di-4/src/main/java/com/baeldung/component/outsidescope/OutsideScopeBeanExample.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/outsidescope/OutsideScopeBeanExample.java
rename to spring-di-4/src/main/java/com/baeldung/component/outsidescope/OutsideScopeBeanExample.java
diff --git a/spring-core-5/src/main/java/com/baeldung/component/outsidescope/OutsideScopeExample.java b/spring-di-4/src/main/java/com/baeldung/component/outsidescope/OutsideScopeExample.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/outsidescope/OutsideScopeExample.java
rename to spring-di-4/src/main/java/com/baeldung/component/outsidescope/OutsideScopeExample.java
diff --git a/spring-core-5/src/main/java/com/baeldung/component/scannedscope/ScannedScopeExample.java b/spring-di-4/src/main/java/com/baeldung/component/scannedscope/ScannedScopeExample.java
similarity index 100%
rename from spring-core-5/src/main/java/com/baeldung/component/scannedscope/ScannedScopeExample.java
rename to spring-di-4/src/main/java/com/baeldung/component/scannedscope/ScannedScopeExample.java
diff --git a/spring-core-4/src/main/java/com/baeldung/sampleabstract/BallService.java b/spring-di-4/src/main/java/com/baeldung/sampleabstract/BallService.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/sampleabstract/BallService.java
rename to spring-di-4/src/main/java/com/baeldung/sampleabstract/BallService.java
diff --git a/spring-core-4/src/main/java/com/baeldung/sampleabstract/BasketballService.java b/spring-di-4/src/main/java/com/baeldung/sampleabstract/BasketballService.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/sampleabstract/BasketballService.java
rename to spring-di-4/src/main/java/com/baeldung/sampleabstract/BasketballService.java
diff --git a/spring-core-4/src/main/java/com/baeldung/sampleabstract/DemoApp.java b/spring-di-4/src/main/java/com/baeldung/sampleabstract/DemoApp.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/sampleabstract/DemoApp.java
rename to spring-di-4/src/main/java/com/baeldung/sampleabstract/DemoApp.java
diff --git a/spring-core-4/src/main/java/com/baeldung/sampleabstract/LogRepository.java b/spring-di-4/src/main/java/com/baeldung/sampleabstract/LogRepository.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/sampleabstract/LogRepository.java
rename to spring-di-4/src/main/java/com/baeldung/sampleabstract/LogRepository.java
diff --git a/spring-core-4/src/main/java/com/baeldung/sampleabstract/RuleRepository.java b/spring-di-4/src/main/java/com/baeldung/sampleabstract/RuleRepository.java
similarity index 100%
rename from spring-core-4/src/main/java/com/baeldung/sampleabstract/RuleRepository.java
rename to spring-di-4/src/main/java/com/baeldung/sampleabstract/RuleRepository.java
diff --git a/spring-core-5/src/main/resources/application.yml b/spring-di-4/src/main/resources/application.yml
similarity index 100%
rename from spring-core-5/src/main/resources/application.yml
rename to spring-di-4/src/main/resources/application.yml
diff --git a/spring-core-5/src/test/java/com/baeldung/component/inscope/ComponentUnitTest.java b/spring-di-4/src/test/java/com/baeldung/component/inscope/ComponentUnitTest.java
similarity index 100%
rename from spring-core-5/src/test/java/com/baeldung/component/inscope/ComponentUnitTest.java
rename to spring-di-4/src/test/java/com/baeldung/component/inscope/ComponentUnitTest.java
diff --git a/spring-core-5/src/test/resources/application.yml b/spring-di-4/src/test/resources/application.yml
similarity index 100%
rename from spring-core-5/src/test/resources/application.yml
rename to spring-di-4/src/test/resources/application.yml
diff --git a/spring-core-5/src/test/resources/logback-test.xml b/spring-di-4/src/test/resources/logback-test.xml
similarity index 100%
rename from spring-core-5/src/test/resources/logback-test.xml
rename to spring-di-4/src/test/resources/logback-test.xml
diff --git a/spring-di/pom.xml b/spring-di/pom.xml
index af0601deb6..cf3703096c 100644
--- a/spring-di/pom.xml
+++ b/spring-di/pom.xml
@@ -149,6 +149,7 @@
         <spring-boot.version>1.5.2.RELEASE</spring-boot.version>
         <mockito.version>1.10.19</mockito.version>
         <aspectjweaver.version>1.9.5</aspectjweaver.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-drools/pom.xml b/spring-drools/pom.xml
index b8c025893c..e13feb6c80 100644
--- a/spring-drools/pom.xml
+++ b/spring-drools/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.kie</groupId>
             <artifactId>kie-spring</artifactId>
-            <version>${drools-version}</version>
+            <version>${kie-spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -75,7 +75,8 @@
     </dependencies>
 
     <properties>
-        <drools-version>7.0.0.Final</drools-version>
+        <drools-version>8.34.0.Final</drools-version>
+        <kie-spring.version>7.73.0.Final</kie-spring.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareCalculatorService.java b/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareCalculatorService.java
index c2c5b399df..8f6f49c29b 100644
--- a/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareCalculatorService.java
+++ b/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareCalculatorService.java
@@ -2,6 +2,8 @@ package com.baeldung.spring.drools.service;
 
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -11,6 +13,8 @@ import com.baeldung.spring.drools.model.TaxiRide;
 @Service
 public class TaxiFareCalculatorService {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(TaxiFareCalculatorService.class);
+
     @Autowired
     private KieContainer kContainer;
 
@@ -20,7 +24,7 @@ public class TaxiFareCalculatorService {
         kieSession.insert(taxiRide);
         kieSession.fireAllRules();
         kieSession.dispose();
-        System.out.println("!! RIDE FARE !! " + rideFare.getTotalFare());
+        LOGGER.debug("!! RIDE FARE !! " + rideFare.getTotalFare());
         return rideFare.getTotalFare();
     }
 }
diff --git a/spring-ejb-modules/wildfly/pom.xml b/spring-ejb-modules/wildfly/pom.xml
index c73a1f128d..f122e99001 100644
--- a/spring-ejb-modules/wildfly/pom.xml
+++ b/spring-ejb-modules/wildfly/pom.xml
@@ -85,8 +85,6 @@
     </dependencyManagement>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
         <javaee-api.version>7.0</javaee-api.version>
         <wildfly-javaee7.version>10.1.0.Final</wildfly-javaee7.version>
         <hibernate-core.version>5.2.3.Final</hibernate-core.version>
diff --git a/spring-ejb-modules/wildfly/widlfly-web/pom.xml b/spring-ejb-modules/wildfly/widlfly-web/pom.xml
index fb8a7678af..46c3f7d0bc 100644
--- a/spring-ejb-modules/wildfly/widlfly-web/pom.xml
+++ b/spring-ejb-modules/wildfly/widlfly-web/pom.xml
@@ -41,4 +41,7 @@
         </dependency>
     </dependencies>
 
+    <properties>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
+    </properties>
 </project>
\ No newline at end of file
diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml
index 0621009bdd..8912cad674 100644
--- a/spring-exceptions/pom.xml
+++ b/spring-exceptions/pom.xml
@@ -133,6 +133,11 @@
             <artifactId>derbytools</artifactId>
             <version>${derby.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-api.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -157,7 +162,7 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>4.3.4.RELEASE</org.springframework.version>
+        <org.springframework.version>5.3.25</org.springframework.version>
         <org.springframework.security.version>4.2.0.RELEASE</org.springframework.security.version>
         <javassist.version>3.21.0-GA</javassist.version>
         <!-- persistence -->
@@ -168,6 +173,7 @@
         <!-- various -->
         <hibernate-validator.version>5.3.3.Final</hibernate-validator.version>
         <javax.el.version>2.2</javax.el.version>
+        <jaxb-api.version>2.3.0</jaxb-api.version>
         <!-- util -->
         <httpcore.version>4.4.5</httpcore.version>
         <httpclient.version>4.5.2</httpclient.version>
@@ -175,6 +181,7 @@
         <!-- maven plugins -->
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause1PersistenceConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause1PersistenceConfig.java
index d2929e3d91..6a24db6733 100644
--- a/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause1PersistenceConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause1PersistenceConfig.java
@@ -12,8 +12,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.orm.hibernate4.HibernateTransactionManager;
-import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
+import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.google.common.base.Preconditions;
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause2PersistenceConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause2PersistenceConfig.java
index 399238073c..a60fa5bc17 100644
--- a/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause2PersistenceConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause2PersistenceConfig.java
@@ -12,8 +12,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.orm.hibernate4.HibernateTransactionManager;
-import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
+import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.google.common.base.Preconditions;
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause3PersistenceConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause3PersistenceConfig.java
index f5191d52f2..ee76232323 100644
--- a/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause3PersistenceConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause3PersistenceConfig.java
@@ -13,8 +13,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.orm.hibernate4.HibernateTransactionManager;
-import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
+import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.google.common.base.Preconditions;
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java
index 118cb5da90..6cf905c330 100644
--- a/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java
@@ -12,8 +12,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.orm.hibernate4.HibernateTransactionManager;
-import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
+import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.google.common.base.Preconditions;
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java
index e79266e9ee..fdad253671 100644
--- a/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java
@@ -12,8 +12,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.orm.hibernate4.HibernateTransactionManager;
-import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
+import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.google.common.base.Preconditions;
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java
index 784b36afbf..3256b002da 100644
--- a/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java
@@ -12,8 +12,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.orm.hibernate4.HibernateTransactionManager;
-import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
+import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.google.common.base.Preconditions;
diff --git a/spring-exceptions/src/main/java/com/baeldung/spring/config/PersistenceConfig.java b/spring-exceptions/src/main/java/com/baeldung/spring/config/PersistenceConfig.java
index 0a31b158d9..b2630f5603 100644
--- a/spring-exceptions/src/main/java/com/baeldung/spring/config/PersistenceConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/spring/config/PersistenceConfig.java
@@ -12,8 +12,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.orm.hibernate4.HibernateTransactionManager;
-import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
+import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.google.common.base.Preconditions;
diff --git a/spring-exceptions/src/main/resources/hibernate-mysql.properties b/spring-exceptions/src/main/resources/hibernate-mysql.properties
index 49ca7fb3d1..bba27db11b 100644
--- a/spring-exceptions/src/main/resources/hibernate-mysql.properties
+++ b/spring-exceptions/src/main/resources/hibernate-mysql.properties
@@ -2,6 +2,6 @@ hibernate.connection.username=tutorialuser
 hibernate.connection.password=tutorialmy5ql
 hibernate.connection.driver_class=com.mysql.jdbc.Driver
 hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
-hibernate.connection.url=jdbc:mysql://localhost:3306/spring_hibernate4_exceptions?createDatabaseIfNotExist=true
+hibernate.connection.url=jdbc:mysql://localhost:3306/spring_hibernate5_exceptions?createDatabaseIfNotExist=true
 hibernate.show_sql=false
 hibernate.hbm2ddl.auto=create
\ No newline at end of file
diff --git a/spring-exceptions/src/main/resources/persistence-mysql-incorrect.properties b/spring-exceptions/src/main/resources/persistence-mysql-incorrect.properties
index b5b8095104..142997a974 100644
--- a/spring-exceptions/src/main/resources/persistence-mysql-incorrect.properties
+++ b/spring-exceptions/src/main/resources/persistence-mysql-incorrect.properties
@@ -1,6 +1,6 @@
 # jdbc.X
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql:3306://localhost/spring_hibernate4_exceptions?createDatabaseIfNotExist=true
+jdbc.url=jdbc:mysql:3306://localhost/spring_hibernate5_exceptions?createDatabaseIfNotExist=true
 jdbc.user=tutorialuser
 jdbc.pass=tutorialmy5ql
 
diff --git a/spring-exceptions/src/main/resources/persistence-mysql.properties b/spring-exceptions/src/main/resources/persistence-mysql.properties
index af56ce1bf8..5ac477607c 100644
--- a/spring-exceptions/src/main/resources/persistence-mysql.properties
+++ b/spring-exceptions/src/main/resources/persistence-mysql.properties
@@ -1,6 +1,6 @@
 # jdbc.X
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost:3306/spring_hibernate4_exceptions?createDatabaseIfNotExist=true
+jdbc.url=jdbc:mysql://localhost:3306/spring_hibernate5_exceptions?createDatabaseIfNotExist=true
 jdbc.user=tutorialuser
 jdbc.pass=tutorialmy5ql
 
diff --git a/spring-integration/pom.xml b/spring-integration/pom.xml
index 2e0e242a56..9882e02c57 100644
--- a/spring-integration/pom.xml
+++ b/spring-integration/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-twitter</artifactId>
-            <version>${spring.version}</version>
+            <version>${spring-integration-twitter.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.integration</groupId>
@@ -85,6 +85,11 @@
             <artifactId>h2</artifactId>
             <version>${h2.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-api.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -114,11 +119,13 @@
     </build>
 
     <properties>
-        <spring.version>5.0.13.RELEASE</spring.version>
+        <spring.version>5.1.13.RELEASE</spring.version>
         <spring-social.version>1.1.4.RELEASE</spring-social.version>
+        <spring-integration-twitter.version>5.0.13.RELEASE</spring-integration-twitter.version>
         <javax-mail.version>1.4.7</javax-mail.version>
         <javax-activation.version>1.1.1</javax-activation.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
+        <jaxb-api.version>2.3.0</jaxb-api.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-integration/src/main/java/com/baeldung/dsl/JavaDSLFileCopyConfig.java b/spring-integration/src/main/java/com/baeldung/dsl/JavaDSLFileCopyConfig.java
index e79eec3e83..adaeac5386 100644
--- a/spring-integration/src/main/java/com/baeldung/dsl/JavaDSLFileCopyConfig.java
+++ b/spring-integration/src/main/java/com/baeldung/dsl/JavaDSLFileCopyConfig.java
@@ -16,7 +16,7 @@ import org.springframework.integration.core.MessageSource;
 import org.springframework.integration.dsl.IntegrationFlow;
 import org.springframework.integration.dsl.IntegrationFlows;
 import org.springframework.integration.dsl.Pollers;
-import org.springframework.integration.dsl.channel.MessageChannels;
+import org.springframework.integration.dsl.MessageChannels;
 import org.springframework.integration.file.FileReadingMessageSource;
 import org.springframework.integration.file.FileWritingMessageHandler;
 import org.springframework.messaging.MessageChannel;
diff --git a/spring-jersey/pom.xml b/spring-jersey/pom.xml
index 32f75aa676..17d527ca6a 100644
--- a/spring-jersey/pom.xml
+++ b/spring-jersey/pom.xml
@@ -221,6 +221,7 @@
         <httpclient.version>4.5.5</httpclient.version>
         <wiremock.version>2.27.2</wiremock.version>
         <spring-boot.version>1.5.10.RELEASE</spring-boot.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-kafka-2/README.md b/spring-kafka-2/README.md
index 1f5e015f9e..60d7d8b607 100644
--- a/spring-kafka-2/README.md
+++ b/spring-kafka-2/README.md
@@ -5,3 +5,4 @@ This module contains articles about Spring with Kafka
 ### Relevant articles
 
 - [Implementing Retry In Kafka Consumer](https://www.baeldung.com/spring-retry-kafka-consumer)
+- [Spring Kafka: Configure Multiple Listeners on Same Topic](https://www.baeldung.com/spring-kafka-multiple-listeners-same-topic)
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multiplelisteners/BookConsumer.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multiplelisteners/BookConsumer.java
new file mode 100644
index 0000000000..77c7dc2e91
--- /dev/null
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multiplelisteners/BookConsumer.java
@@ -0,0 +1,26 @@
+package com.baeldung.spring.kafka.multiplelisteners;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.stereotype.Service;
+
+@Service
+public class BookConsumer {
+    private static final Logger logger = LoggerFactory.getLogger(BookConsumer.class);
+
+    @KafkaListener(topics = "books", groupId = "books-content-search")
+    public void bookContentSearchConsumer(BookEvent event) {
+        logger.info("Books event received for full-text search indexing => {}", event);
+    }
+
+    @KafkaListener(topics = "books", groupId = "books-price-index")
+    public void bookPriceIndexerConsumer(BookEvent event) {
+        logger.info("Books event received for price indexing => {}", event);
+    }
+
+    @KafkaListener(topics = "books", groupId = "book-notification-consumer", concurrency = "2")
+    public void bookNotificationConsumer(BookEvent event) {
+        logger.info("Books event received for notification => {}", event);
+    }
+}
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multiplelisteners/BookEvent.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multiplelisteners/BookEvent.java
new file mode 100644
index 0000000000..11b13f120d
--- /dev/null
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multiplelisteners/BookEvent.java
@@ -0,0 +1,15 @@
+package com.baeldung.spring.kafka.multiplelisteners;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BookEvent {
+
+    private String title;
+    private String description;
+    private Double price;
+}
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multiplelisteners/KafkaConsumerConfig.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multiplelisteners/KafkaConsumerConfig.java
new file mode 100644
index 0000000000..a6e0a91425
--- /dev/null
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multiplelisteners/KafkaConsumerConfig.java
@@ -0,0 +1,64 @@
+package com.baeldung.spring.kafka.multiplelisteners;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.kafka.annotation.EnableKafka;
+import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
+import org.springframework.kafka.core.ConsumerFactory;
+import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
+import org.springframework.kafka.listener.DefaultErrorHandler;
+import org.springframework.kafka.support.serializer.JsonDeserializer;
+import org.springframework.util.backoff.BackOff;
+import org.springframework.util.backoff.FixedBackOff;
+
+@EnableKafka
+@Configuration
+public class KafkaConsumerConfig {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(KafkaConsumerConfig.class);
+
+    @Value(value = "${spring.kafka.bootstrap-servers}")
+    private String bootstrapAddress;
+
+    @Value(value = "${kafka.backoff.interval}")
+    private Long interval;
+
+    @Value(value = "${kafka.backoff.max_failure}")
+    private Long maxAttempts;
+
+    public ConsumerFactory<String, BookEvent> consumerFactory() {
+        Map<String, Object> props = new HashMap<>();
+        props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
+        props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
+        props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, JsonDeserializer.class);
+        props.put(ConsumerConfig.MAX_PARTITION_FETCH_BYTES_CONFIG, "20971520");
+        props.put(ConsumerConfig.FETCH_MAX_BYTES_CONFIG, "20971520");
+        props.put(JsonDeserializer.TRUSTED_PACKAGES, "*");
+        props.put(JsonDeserializer.TYPE_MAPPINGS, "bookEvent:com.baeldung.spring.kafka.multiplelisteners.BookEvent");
+
+        return new DefaultKafkaConsumerFactory<>(props);
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<String, BookEvent> kafkaListenerContainerFactory() {
+        ConcurrentKafkaListenerContainerFactory<String, BookEvent> factory = new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(consumerFactory());
+        factory.setCommonErrorHandler(errorHandler());
+        return factory;
+    }
+
+    @Bean
+    public DefaultErrorHandler errorHandler() {
+        BackOff fixedBackOff = new FixedBackOff(interval, maxAttempts);
+        return new DefaultErrorHandler((consumerRecord, e) -> LOGGER.error(String.format("consumed record %s because this exception was thrown", consumerRecord.toString())), fixedBackOff);
+    }
+
+}
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multiplelisteners/KafkaProducerConfig.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multiplelisteners/KafkaProducerConfig.java
new file mode 100644
index 0000000000..35204428a0
--- /dev/null
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multiplelisteners/KafkaProducerConfig.java
@@ -0,0 +1,54 @@
+package com.baeldung.spring.kafka.multiplelisteners;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.kafka.core.DefaultKafkaProducerFactory;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.kafka.core.ProducerFactory;
+import org.springframework.kafka.support.serializer.JsonSerializer;
+
+@Configuration
+public class KafkaProducerConfig {
+
+    @Value(value = "${spring.kafka.bootstrap-servers}")
+    private String bootstrapAddress;
+
+    @Bean
+    public ProducerFactory<String, String> producerFactory() {
+        Map<String, Object> configProps = new HashMap<>();
+        configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
+        configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
+        configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
+        configProps.put(ProducerConfig.MAX_REQUEST_SIZE_CONFIG, "20971520");
+
+        return new DefaultKafkaProducerFactory<>(configProps);
+    }
+
+    @Bean
+    public KafkaTemplate<String, String> kafkaTemplate() {
+        return new KafkaTemplate<>(producerFactory());
+    }
+
+    @Bean
+    public ProducerFactory<String, BookEvent> bookProducerFactory() {
+        Map<String, Object> configProps = new HashMap<>();
+        configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
+        configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
+        configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, JsonSerializer.class);
+        configProps.put(JsonSerializer.TYPE_MAPPINGS, "bookEvent:com.baeldung.spring.kafka.multiplelisteners.BookEvent");
+
+        return new DefaultKafkaProducerFactory<>(configProps);
+    }
+
+    @Bean
+    public KafkaTemplate<String, BookEvent> bookKafkaTemplate() {
+        return new KafkaTemplate<>(bookProducerFactory());
+    }
+
+}
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multiplelisteners/KafkaTopicConfig.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multiplelisteners/KafkaTopicConfig.java
new file mode 100644
index 0000000000..5bc0a966b5
--- /dev/null
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multiplelisteners/KafkaTopicConfig.java
@@ -0,0 +1,33 @@
+package com.baeldung.spring.kafka.multiplelisteners;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.kafka.clients.admin.AdminClientConfig;
+import org.apache.kafka.clients.admin.NewTopic;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.kafka.core.KafkaAdmin;
+
+@Configuration
+public class KafkaTopicConfig {
+
+    @Value(value = "${spring.kafka.bootstrap-servers}")
+    private String bootstrapAddress;
+
+    @Value(value = "${multiple-listeners.books.topic.name}")
+    private String booksTopicName;
+
+    @Bean
+    public KafkaAdmin kafkaAdmin() {
+        Map<String, Object> configs = new HashMap<>();
+        configs.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
+        return new KafkaAdmin(configs);
+    }
+
+    @Bean
+    public NewTopic booksTopic() {
+        return new NewTopic(booksTopicName, 1, (short) 1);
+    }
+}
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multiplelisteners/MultipleListenersApplicationKafkaApp.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multiplelisteners/MultipleListenersApplicationKafkaApp.java
new file mode 100644
index 0000000000..c8a2f6e689
--- /dev/null
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multiplelisteners/MultipleListenersApplicationKafkaApp.java
@@ -0,0 +1,14 @@
+package com.baeldung.spring.kafka.multiplelisteners;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Import;
+
+@SpringBootApplication
+@Import(value = { KafkaTopicConfig.class, KafkaConsumerConfig.class, KafkaProducerConfig.class })
+public class MultipleListenersApplicationKafkaApp {
+
+    public static void main(String[] args) {
+        SpringApplication.run(MultipleListenersApplicationKafkaApp.class, args);
+    }
+}
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/Farewell.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/Farewell.java
similarity index 94%
rename from spring-kafka-2/src/main/java/com/baeldung/spring/kafka/Farewell.java
rename to spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/Farewell.java
index bbff315ad2..519d847aab 100644
--- a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/Farewell.java
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/Farewell.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.kafka;
+package com.baeldung.spring.kafka.retryable;
 
 public class Farewell {
 
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/Greeting.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/Greeting.java
similarity index 92%
rename from spring-kafka-2/src/main/java/com/baeldung/spring/kafka/Greeting.java
rename to spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/Greeting.java
index b4633e802a..79abeda34e 100644
--- a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/Greeting.java
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/Greeting.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.kafka;
+package com.baeldung.spring.kafka.retryable;
 
 public class Greeting {
 
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/KafkaConsumerConfig.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/KafkaConsumerConfig.java
similarity index 98%
rename from spring-kafka-2/src/main/java/com/baeldung/spring/kafka/KafkaConsumerConfig.java
rename to spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/KafkaConsumerConfig.java
index 463d3209ea..cf4b29137e 100644
--- a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/KafkaConsumerConfig.java
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/KafkaConsumerConfig.java
@@ -1,6 +1,5 @@
-package com.baeldung.spring.kafka;
+package com.baeldung.spring.kafka.retryable;
 
-import java.net.SocketTimeoutException;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/KafkaProducerConfig.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/KafkaProducerConfig.java
similarity index 94%
rename from spring-kafka-2/src/main/java/com/baeldung/spring/kafka/KafkaProducerConfig.java
rename to spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/KafkaProducerConfig.java
index da8b2bd1a6..90dcb2ccf9 100644
--- a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/KafkaProducerConfig.java
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/KafkaProducerConfig.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.kafka;
+package com.baeldung.spring.kafka.retryable;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -55,7 +55,7 @@ public class KafkaProducerConfig {
         configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
         configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
         configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, JsonSerializer.class);
-        configProps.put(JsonSerializer.TYPE_MAPPINGS, "greeting:com.baeldung.spring.kafka.Greeting, farewell:com.baeldung.spring.kafka.Farewell");
+        configProps.put(JsonSerializer.TYPE_MAPPINGS, "greeting:com.baeldung.spring.kafka.retrayable.Greeting, farewell:com.baeldung.spring.kafka.retrayable.Farewell");
         return new DefaultKafkaProducerFactory<>(configProps);
     }
 
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/KafkaTopicConfig.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/KafkaTopicConfig.java
similarity index 97%
rename from spring-kafka-2/src/main/java/com/baeldung/spring/kafka/KafkaTopicConfig.java
rename to spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/KafkaTopicConfig.java
index 6a20915699..3b4c2d9928 100644
--- a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/KafkaTopicConfig.java
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/KafkaTopicConfig.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.kafka;
+package com.baeldung.spring.kafka.retryable;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/MultiTypeKafkaListener.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/MultiTypeKafkaListener.java
similarity index 95%
rename from spring-kafka-2/src/main/java/com/baeldung/spring/kafka/MultiTypeKafkaListener.java
rename to spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/MultiTypeKafkaListener.java
index 6c4d78171b..441e564176 100644
--- a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/MultiTypeKafkaListener.java
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/MultiTypeKafkaListener.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.kafka;
+package com.baeldung.spring.kafka.retryable;
 
 import org.springframework.kafka.annotation.KafkaHandler;
 import org.springframework.kafka.annotation.KafkaListener;
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/RetryableApplicationKafkaApp.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/RetryableApplicationKafkaApp.java
similarity index 91%
rename from spring-kafka-2/src/main/java/com/baeldung/spring/kafka/RetryableApplicationKafkaApp.java
rename to spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/RetryableApplicationKafkaApp.java
index e43207829a..458ebac124 100644
--- a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/RetryableApplicationKafkaApp.java
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/retryable/RetryableApplicationKafkaApp.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.kafka;
+package com.baeldung.spring.kafka.retryable;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-kafka-2/src/main/resources/application.properties b/spring-kafka-2/src/main/resources/application.properties
index 691b6f55b7..4725ace2d9 100644
--- a/spring-kafka-2/src/main/resources/application.properties
+++ b/spring-kafka-2/src/main/resources/application.properties
@@ -16,5 +16,7 @@ monitor.kafka.consumer.groupid.simulate=baeldungGrpSimulate
 test.topic=testtopic1
 kafka.backoff.interval=9000
 kafka.backoff.max_failure=5
+# multiple listeners properties
+multiple-listeners.books.topic.name=books
 
 
diff --git a/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/multiplelisteners/KafkaMultipleListenersIntegrationTest.java b/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/multiplelisteners/KafkaMultipleListenersIntegrationTest.java
new file mode 100644
index 0000000000..b6634ec7ed
--- /dev/null
+++ b/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/multiplelisteners/KafkaMultipleListenersIntegrationTest.java
@@ -0,0 +1,75 @@
+package com.baeldung.spring.kafka.multiplelisteners;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.kafka.config.KafkaListenerEndpointRegistry;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.kafka.listener.AcknowledgingConsumerAwareMessageListener;
+import org.springframework.kafka.listener.ConcurrentMessageListenerContainer;
+import org.springframework.kafka.test.context.EmbeddedKafka;
+
+@SpringBootTest(classes = MultipleListenersApplicationKafkaApp.class)
+@EmbeddedKafka(partitions = 1, brokerProperties = { "listeners=PLAINTEXT://localhost:9092", "port=9092" })
+class KafkaMultipleListenersIntegrationTest {
+
+    @Autowired
+    private KafkaListenerEndpointRegistry registry;
+    @Autowired
+    private KafkaTemplate<String, BookEvent> bookEventKafkaTemplate;
+
+    private static final String TOPIC = "books";
+
+    @Test
+    void givenEmbeddedKafkaBroker_whenSendingAMessage_thenMessageIsConsumedByAll3Listeners() throws Exception {
+        BookEvent bookEvent = new BookEvent("test-book-title-1", "test-book-desc-1", 2.0);
+        CountDownLatch latch = new CountDownLatch(3);
+
+        List<? extends ConcurrentMessageListenerContainer<?, ?>> bookListeners = registry.getAllListenerContainers()
+          .stream()
+          .map(c -> (ConcurrentMessageListenerContainer<?, ?>) c)
+          .collect(Collectors.toList());
+
+        bookListeners.forEach(listener -> {
+            listener.stop();
+            listener.getContainerProperties()
+              .setMessageListener((AcknowledgingConsumerAwareMessageListener<String, BookEvent>) (data, acknowledgment, consumer) -> {
+                  assertThat(data.value()).isEqualTo(bookEvent);
+                  latch.countDown();
+              });
+            listener.start();
+        });
+
+        bookEventKafkaTemplate.send(TOPIC, UUID.randomUUID()
+          .toString(), bookEvent);
+
+        assertThat(bookListeners.size()).isEqualTo(3);
+        assertThat(latch.await(10, TimeUnit.SECONDS)).isTrue();
+    }
+
+    @Test
+    void givenEmbeddedKafkaBroker_whenSendingThreeMessage_thenListenerPrintLogs() throws Exception {
+        CountDownLatch latch = new CountDownLatch(3);
+        Arrays.stream(new int[] { 1, 2, 3 })
+          .mapToObj(i -> new BookEvent(String.format("book %s", i), String.format("description %s", i), (double) i))
+          .forEach(bookEvent -> {
+              bookEventKafkaTemplate.send(TOPIC, UUID.randomUUID()
+                .toString(), bookEvent);
+              latch.countDown();
+          });
+
+        // wait for messages to be printed
+        Thread.sleep(1000);
+
+        assertThat(latch.await(10, TimeUnit.SECONDS)).isTrue();
+    }
+}
diff --git a/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/KafkaRetryableIntegrationTest.java b/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/retryable/KafkaRetryableIntegrationTest.java
similarity index 95%
rename from spring-kafka-2/src/test/java/com/baeldung/spring/kafka/KafkaRetryableIntegrationTest.java
rename to spring-kafka-2/src/test/java/com/baeldung/spring/kafka/retryable/KafkaRetryableIntegrationTest.java
index 5417fee1ac..52cda85f90 100644
--- a/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/KafkaRetryableIntegrationTest.java
+++ b/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/retryable/KafkaRetryableIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.kafka;
+package com.baeldung.spring.kafka.retryable;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
@@ -17,6 +17,8 @@ import org.springframework.kafka.listener.ConcurrentMessageListenerContainer;
 import org.springframework.kafka.test.EmbeddedKafkaBroker;
 import org.springframework.kafka.test.context.EmbeddedKafka;
 
+import com.baeldung.spring.kafka.retryable.Greeting;
+import com.baeldung.spring.kafka.retryable.RetryableApplicationKafkaApp;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 @SpringBootTest(classes = RetryableApplicationKafkaApp.class)
diff --git a/spring-kafka/pom.xml b/spring-kafka/pom.xml
index d51c2e300f..c013be32e3 100644
--- a/spring-kafka/pom.xml
+++ b/spring-kafka/pom.xml
@@ -9,9 +9,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
@@ -23,6 +23,16 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+            <version>3.0.5</version>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+            <version>1.10.5</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.kafka</groupId>
             <artifactId>spring-kafka</artifactId>
@@ -61,8 +71,24 @@
             <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.baeldung.spring.kafka.KafkaApplication</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <testcontainers-kafka.version>1.16.2</testcontainers-kafka.version>
     </properties>
diff --git a/spring-kafka/src/main/java/com/baeldung/countingmessages/KafkaCountingMessagesComponent.java b/spring-kafka/src/main/java/com/baeldung/countingmessages/KafkaCountingMessagesComponent.java
index 89cd1c8dac..f76be95c1c 100644
--- a/spring-kafka/src/main/java/com/baeldung/countingmessages/KafkaCountingMessagesComponent.java
+++ b/spring-kafka/src/main/java/com/baeldung/countingmessages/KafkaCountingMessagesComponent.java
@@ -6,7 +6,7 @@ import org.apache.kafka.common.serialization.StringDeserializer;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
diff --git a/spring-kafka/src/main/java/com/baeldung/kafka/ssl/KafkaProducer.java b/spring-kafka/src/main/java/com/baeldung/kafka/ssl/KafkaProducer.java
index 895d437c6b..38ce366355 100644
--- a/spring-kafka/src/main/java/com/baeldung/kafka/ssl/KafkaProducer.java
+++ b/spring-kafka/src/main/java/com/baeldung/kafka/ssl/KafkaProducer.java
@@ -15,9 +15,12 @@ public class KafkaProducer {
     public void sendMessage(String message, String topic) {
         log.info("Producing message: {}", message);
         kafkaTemplate.send(topic, "key", message)
-          .addCallback(
-            result -> log.info("Message sent to topic: {}", message),
-            ex -> log.error("Failed to send message", ex)
-          );
+            .whenComplete((result, ex) -> {
+                if (ex == null) {
+                    log.info("Message sent to topic: {}", message);
+                } else {
+                    log.error("Failed to send message", ex);
+                }
+            });
     }
 }
diff --git a/spring-kafka/src/main/java/com/baeldung/kafka/streams/KafkaProducer.java b/spring-kafka/src/main/java/com/baeldung/kafka/streams/KafkaProducer.java
index 2b8e9bbfbd..664758a052 100644
--- a/spring-kafka/src/main/java/com/baeldung/kafka/streams/KafkaProducer.java
+++ b/spring-kafka/src/main/java/com/baeldung/kafka/streams/KafkaProducer.java
@@ -15,9 +15,12 @@ public class KafkaProducer {
 
     public void sendMessage(String message) {
         kafkaTemplate.send("input-topic", message)
-          .addCallback(
-            result -> log.info("Message sent to topic: {}", message),
-            ex -> log.error("Failed to send message", ex)
-          );
+            .whenComplete((result, ex) -> {
+                if (ex == null) {
+                    log.info("Message sent to topic: {}", message);
+                } else {
+                    log.error("Failed to send message", ex);
+                }
+            });
     }
 }
diff --git a/spring-kafka/src/main/java/com/baeldung/monitoring/LagAnalyzerApplication.java b/spring-kafka/src/main/java/com/baeldung/monitoring/LagAnalyzerApplication.java
index 9275151d50..d305af8c87 100644
--- a/spring-kafka/src/main/java/com/baeldung/monitoring/LagAnalyzerApplication.java
+++ b/spring-kafka/src/main/java/com/baeldung/monitoring/LagAnalyzerApplication.java
@@ -10,6 +10,7 @@ public class LagAnalyzerApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(LagAnalyzerApplication.class, args);
-        while (true) ;
+        while (true)
+          ;
     }
 }
diff --git a/spring-kafka/src/main/java/com/baeldung/monitoring/service/LagAnalyzerService.java b/spring-kafka/src/main/java/com/baeldung/monitoring/service/LagAnalyzerService.java
index b046f0b2c4..f8898b60d8 100644
--- a/spring-kafka/src/main/java/com/baeldung/monitoring/service/LagAnalyzerService.java
+++ b/spring-kafka/src/main/java/com/baeldung/monitoring/service/LagAnalyzerService.java
@@ -1,6 +1,7 @@
 package com.baeldung.monitoring.service;
 
 import com.baeldung.monitoring.util.MonitoringUtil;
+
 import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.apache.kafka.clients.admin.ListConsumerGroupOffsetsResult;
@@ -27,36 +28,38 @@ public class LagAnalyzerService {
     private final KafkaConsumer<String, String> consumer;
 
     @Autowired
-    public LagAnalyzerService(
-            @Value("${monitor.kafka.bootstrap.config}") String bootstrapServerConfig) {
+    public LagAnalyzerService(@Value("${monitor.kafka.bootstrap.config}") String bootstrapServerConfig) {
         adminClient = getAdminClient(bootstrapServerConfig);
         consumer = getKafkaConsumer(bootstrapServerConfig);
     }
 
-    public Map<TopicPartition, Long> analyzeLag(
-            String groupId)
-            throws ExecutionException, InterruptedException {
+    public Map<TopicPartition, Long> analyzeLag(String groupId)
+      throws ExecutionException, InterruptedException {
         Map<TopicPartition, Long> consumerGrpOffsets = getConsumerGrpOffsets(groupId);
         Map<TopicPartition, Long> producerOffsets = getProducerOffsets(consumerGrpOffsets);
         Map<TopicPartition, Long> lags = computeLags(consumerGrpOffsets, producerOffsets);
         for (Map.Entry<TopicPartition, Long> lagEntry : lags.entrySet()) {
-            String topic = lagEntry.getKey().topic();
-            int partition = lagEntry.getKey().partition();
+            String topic = lagEntry.getKey()
+              .topic();
+            int partition = lagEntry.getKey()
+              .partition();
             Long lag = lagEntry.getValue();
-            LOGGER.info("Time={} | Lag for topic = {}, partition = {} is {}",
-                    MonitoringUtil.time(),
-                    topic,
-                    partition,
-                    lag);
+            LOGGER.info("Time={} | Lag for topic = {}, partition = {}, groupId = {} is {}",
+              MonitoringUtil.time(),
+              topic,
+              partition,
+              groupId,
+              lag);
         }
         return lags;
     }
 
     public Map<TopicPartition, Long> getConsumerGrpOffsets(String groupId)
-            throws ExecutionException, InterruptedException {
+      throws ExecutionException, InterruptedException {
         ListConsumerGroupOffsetsResult info = adminClient.listConsumerGroupOffsets(groupId);
-        Map<TopicPartition, OffsetAndMetadata> metadataMap
-                = info.partitionsToOffsetAndMetadata().get();
+        Map<TopicPartition, OffsetAndMetadata> metadataMap = info
+          .partitionsToOffsetAndMetadata()
+          .get();
         Map<TopicPartition, Long> groupOffset = new HashMap<>();
         for (Map.Entry<TopicPartition, OffsetAndMetadata> entry : metadataMap.entrySet()) {
             TopicPartition key = entry.getKey();
@@ -66,8 +69,7 @@ public class LagAnalyzerService {
         return groupOffset;
     }
 
-    private Map<TopicPartition, Long> getProducerOffsets(
-            Map<TopicPartition, Long> consumerGrpOffset) {
+    private Map<TopicPartition, Long> getProducerOffsets(Map<TopicPartition, Long> consumerGrpOffset) {
         List<TopicPartition> topicPartitions = new LinkedList<>();
         for (Map.Entry<TopicPartition, Long> entry : consumerGrpOffset.entrySet()) {
             TopicPartition key = entry.getKey();
@@ -77,9 +79,9 @@ public class LagAnalyzerService {
     }
 
     public Map<TopicPartition, Long> computeLags(
-            Map<TopicPartition, Long> consumerGrpOffsets,
-            Map<TopicPartition, Long> producerOffsets) {
-        Map<TopicPartition, Long> lags = new HashMap<>();
+      Map<TopicPartition, Long> consumerGrpOffsets,
+      Map<TopicPartition, Long> producerOffsets) {
+      Map<TopicPartition, Long> lags = new HashMap<>();
         for (Map.Entry<TopicPartition, Long> entry : consumerGrpOffsets.entrySet()) {
             Long producerOffset = producerOffsets.get(entry.getKey());
             Long consumerOffset = consumerGrpOffsets.get(entry.getKey());
@@ -91,15 +93,24 @@ public class LagAnalyzerService {
 
     private AdminClient getAdminClient(String bootstrapServerConfig) {
         Properties config = new Properties();
-        config.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServerConfig);
+        config.put(
+          AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG,
+          bootstrapServerConfig);
         return AdminClient.create(config);
     }
 
-    private KafkaConsumer<String, String> getKafkaConsumer(String bootstrapServerConfig) {
+    private KafkaConsumer<String, String> getKafkaConsumer(
+      String bootstrapServerConfig) {
         Properties properties = new Properties();
-        properties.setProperty(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServerConfig);
-        properties.setProperty(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
-        properties.setProperty(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+        properties.setProperty(
+          ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG,
+          bootstrapServerConfig);
+        properties.setProperty(
+          ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG,
+          StringDeserializer.class.getName());
+        properties.setProperty(
+          ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
+          StringDeserializer.class.getName());
         return new KafkaConsumer<>(properties);
     }
 }
diff --git a/spring-kafka/src/main/java/com/baeldung/monitoring/service/LiveLagAnalyzerService.java b/spring-kafka/src/main/java/com/baeldung/monitoring/service/LiveLagAnalyzerService.java
index a20b9e9a0c..7035bf73bd 100644
--- a/spring-kafka/src/main/java/com/baeldung/monitoring/service/LiveLagAnalyzerService.java
+++ b/spring-kafka/src/main/java/com/baeldung/monitoring/service/LiveLagAnalyzerService.java
@@ -15,8 +15,8 @@ public class LiveLagAnalyzerService {
 
     @Autowired
     public LiveLagAnalyzerService(
-            LagAnalyzerService lagAnalyzerService,
-            @Value(value = "${monitor.kafka.consumer.groupid}") String groupId) {
+      LagAnalyzerService lagAnalyzerService,
+      @Value(value = "${monitor.kafka.consumer.groupid}") String groupId) {
         this.lagAnalyzerService = lagAnalyzerService;
         this.groupId = groupId;
     }
diff --git a/spring-kafka/src/main/java/com/baeldung/monitoring/simulation/ConsumerSimulator.java b/spring-kafka/src/main/java/com/baeldung/monitoring/simulation/ConsumerSimulator.java
index 2d376432e5..171c17a282 100644
--- a/spring-kafka/src/main/java/com/baeldung/monitoring/simulation/ConsumerSimulator.java
+++ b/spring-kafka/src/main/java/com/baeldung/monitoring/simulation/ConsumerSimulator.java
@@ -7,10 +7,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class ConsumerSimulator {
 
-    @KafkaListener(
-            topics = "${monitor.topic.name}",
-            containerFactory = "kafkaListenerContainerFactory",
-            autoStartup = "${monitor.consumer.simulate}")
+    @KafkaListener(topics = "${monitor.topic.name}",
+      containerFactory = "kafkaListenerContainerFactory",
+      autoStartup = "${monitor.consumer.simulate}")
     public void listenGroup(String message) throws InterruptedException {
         Thread.sleep(10L);
     }
diff --git a/spring-kafka/src/main/java/com/baeldung/monitoring/simulation/KafkaConsumerConfig.java b/spring-kafka/src/main/java/com/baeldung/monitoring/simulation/KafkaConsumerConfig.java
index a4a8847bcf..9d5160e713 100644
--- a/spring-kafka/src/main/java/com/baeldung/monitoring/simulation/KafkaConsumerConfig.java
+++ b/spring-kafka/src/main/java/com/baeldung/monitoring/simulation/KafkaConsumerConfig.java
@@ -2,53 +2,54 @@ package com.baeldung.monitoring.simulation;
 
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.common.serialization.StringDeserializer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.kafka.annotation.EnableKafka;
 import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
 import org.springframework.kafka.core.ConsumerFactory;
 import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
+import org.springframework.kafka.core.MicrometerConsumerListener;
+import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import io.micrometer.core.instrument.MeterRegistry;
+
 @EnableKafka
-@Configuration
+@Component
 public class KafkaConsumerConfig {
 
     @Value(value = "${monitor.kafka.bootstrap.config}")
     private String bootstrapAddress;
     @Value(value = "${monitor.kafka.consumer.groupid}")
     private String groupId;
-    @Value(value = "${monitor.kafka.consumer.groupid.simulate}")
-    private String simulateGroupId;
-    @Value(value = "${monitor.producer.simulate}")
-    private boolean enabled;
 
-    public ConsumerFactory<String, String> consumerFactory(String groupId) {
+    @Autowired
+    private MeterRegistry meterRegistry;
+
+    @Bean
+    public ConsumerFactory<String, String> consumerFactory() {
         Map<String, Object> props = new HashMap<>();
         props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
-        if (enabled) {
-            props.put(ConsumerConfig.GROUP_ID_CONFIG, groupId);
-        } else {
-            props.put(ConsumerConfig.GROUP_ID_CONFIG, simulateGroupId);
-        }
         props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
         props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
         props.put(ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG, 0);
-        return new DefaultKafkaConsumerFactory<>(props);
+        props.put(ConsumerConfig.GROUP_ID_CONFIG, groupId);
+        DefaultKafkaConsumerFactory<String, String> consumerFactory = new DefaultKafkaConsumerFactory<>(props);
+        consumerFactory.addListener(new MicrometerConsumerListener<>(this.meterRegistry));
+        return consumerFactory;
     }
 
     @Bean
-    public ConcurrentKafkaListenerContainerFactory<String, String> kafkaListenerContainerFactory() {
-        ConcurrentKafkaListenerContainerFactory<String, String> factory = new ConcurrentKafkaListenerContainerFactory<>();
-        if (enabled) {
-            factory.setConsumerFactory(consumerFactory(groupId));
-        } else {
-            factory.setConsumerFactory(consumerFactory(simulateGroupId));
-        }
-        return factory;
+    public ConcurrentKafkaListenerContainerFactory<String, String>
+      kafkaListenerContainerFactory(@Qualifier("consumerFactory") ConsumerFactory<String,
+      String> consumerFactory) {
+        ConcurrentKafkaListenerContainerFactory<String, String> listenerContainerFactory =
+          new ConcurrentKafkaListenerContainerFactory<>();
+        listenerContainerFactory.setConsumerFactory(consumerFactory);
+        return listenerContainerFactory;
     }
 }
diff --git a/spring-kafka/src/main/java/com/baeldung/monitoring/simulation/ProducerSimulator.java b/spring-kafka/src/main/java/com/baeldung/monitoring/simulation/ProducerSimulator.java
index 30476ff7ec..ad4a006809 100644
--- a/spring-kafka/src/main/java/com/baeldung/monitoring/simulation/ProducerSimulator.java
+++ b/spring-kafka/src/main/java/com/baeldung/monitoring/simulation/ProducerSimulator.java
@@ -23,10 +23,9 @@ public class ProducerSimulator {
     private final boolean enabled;
 
     @Autowired
-    public ProducerSimulator(
-            KafkaTemplate<String, String> kafkaTemplate,
-            @Value(value = "${monitor.topic.name}") String topicName,
-            @Value(value = "${monitor.producer.simulate}") String enabled) {
+    public ProducerSimulator(KafkaTemplate<String, String> kafkaTemplate,
+      @Value(value = "${monitor.topic.name}") String topicName,
+      @Value(value = "${monitor.producer.simulate}") String enabled) {
         this.kafkaTemplate = kafkaTemplate;
         this.topicName = topicName;
         this.enabled = BooleanUtils.toBoolean(enabled);
@@ -37,7 +36,9 @@ public class ProducerSimulator {
         if (enabled) {
             if (endTime.after(new Date())) {
                 String message = "msg-" + time();
-                SendResult<String, String> result = kafkaTemplate.send(topicName, message).get();
+                SendResult<String, String> result = kafkaTemplate
+                  .send(topicName, message)
+                  .get();
             }
         }
     }
diff --git a/spring-kafka/src/main/java/com/baeldung/spring/kafka/KafkaApplication.java b/spring-kafka/src/main/java/com/baeldung/spring/kafka/KafkaApplication.java
index 9b79f716e9..ff2d21668f 100644
--- a/spring-kafka/src/main/java/com/baeldung/spring/kafka/KafkaApplication.java
+++ b/spring-kafka/src/main/java/com/baeldung/spring/kafka/KafkaApplication.java
@@ -1,5 +1,6 @@
 package com.baeldung.spring.kafka;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -16,8 +17,6 @@ import org.springframework.kafka.support.KafkaHeaders;
 import org.springframework.kafka.support.SendResult;
 import org.springframework.messaging.handler.annotation.Header;
 import org.springframework.messaging.handler.annotation.Payload;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.ListenableFutureCallback;
 
 @SpringBootApplication
 public class KafkaApplication {
@@ -102,18 +101,13 @@ public class KafkaApplication {
 
         public void sendMessage(String message) {
 
-            ListenableFuture<SendResult<String, String>> future = kafkaTemplate.send(topicName, message);
+            CompletableFuture<SendResult<String, String>> future = kafkaTemplate.send(topicName, message);
+            future.whenComplete((result, ex) -> {
 
-            future.addCallback(new ListenableFutureCallback<SendResult<String, String>>() {
-
-                @Override
-                public void onSuccess(SendResult<String, String> result) {
+                if (ex == null) {
                     System.out.println("Sent message=[" + message + "] with offset=[" + result.getRecordMetadata()
                         .offset() + "]");
-                }
-
-                @Override
-                public void onFailure(Throwable ex) {
+                } else {
                     System.out.println("Unable to send message=[" + message + "] due to : " + ex.getMessage());
                 }
             });
@@ -155,13 +149,13 @@ public class KafkaApplication {
         }
 
         @KafkaListener(topics = "${message.topic.name}", containerFactory = "headersKafkaListenerContainerFactory")
-        public void listenWithHeaders(@Payload String message, @Header(KafkaHeaders.RECEIVED_PARTITION_ID) int partition) {
+        public void listenWithHeaders(@Payload String message, @Header(KafkaHeaders.RECEIVED_PARTITION) int partition) {
             System.out.println("Received Message: " + message + " from partition: " + partition);
             latch.countDown();
         }
 
         @KafkaListener(topicPartitions = @TopicPartition(topic = "${partitioned.topic.name}", partitions = { "0", "3" }), containerFactory = "partitionsKafkaListenerContainerFactory")
-        public void listenToPartition(@Payload String message, @Header(KafkaHeaders.RECEIVED_PARTITION_ID) int partition) {
+        public void listenToPartition(@Payload String message, @Header(KafkaHeaders.RECEIVED_PARTITION) int partition) {
             System.out.println("Received Message: " + message + " from partition: " + partition);
             this.partitionLatch.countDown();
         }
diff --git a/spring-kafka/src/main/resources/application.properties b/spring-kafka/src/main/resources/application.properties
index c57537e2af..1a639a43fc 100644
--- a/spring-kafka/src/main/resources/application.properties
+++ b/spring-kafka/src/main/resources/application.properties
@@ -1,3 +1,4 @@
+server.port=8081
 spring.kafka.bootstrap-servers=localhost:9092
 message.topic.name=baeldung
 long.message.topic.name=longMessage
@@ -15,3 +16,12 @@ monitor.consumer.simulate=true
 monitor.kafka.consumer.groupid.simulate=baeldungGrpSimulate
 test.topic=testtopic1
 
+
+
+management.endpoints.web.base-path=/actuator
+management.endpoints.web.exposure.include=*
+management.endpoint.health.show-details=always
+management.endpoint.metrics.enabled=true
+management.endpoint.prometheus.enabled=true
+
+spring.jmx.enabled=false
diff --git a/spring-kafka/src/test/java/com/baeldung/kafka/streams/KafkaStreamsApplicationLiveTest.java b/spring-kafka/src/test/java/com/baeldung/kafka/streams/KafkaStreamsApplicationLiveTest.java
index 85df8485d2..aee3c2c0dc 100644
--- a/spring-kafka/src/test/java/com/baeldung/kafka/streams/KafkaStreamsApplicationLiveTest.java
+++ b/spring-kafka/src/test/java/com/baeldung/kafka/streams/KafkaStreamsApplicationLiveTest.java
@@ -20,7 +20,7 @@ import org.junit.jupiter.api.io.TempDir;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
diff --git a/spring-katharsis/pom.xml b/spring-katharsis/pom.xml
index b836a42bca..82be0555c3 100644
--- a/spring-katharsis/pom.xml
+++ b/spring-katharsis/pom.xml
@@ -135,6 +135,7 @@
         <katharsis.version>3.0.2</katharsis.version>
         <reflections.version>0.9.10</reflections.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-mobile/pom.xml b/spring-mobile/pom.xml
index 7f715c8735..0c279c0d62 100644
--- a/spring-mobile/pom.xml
+++ b/spring-mobile/pom.xml
@@ -32,8 +32,33 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${maven-war-plugin.version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <compilerArgs>
+                        <arg>--add-exports=java.base/jdk.internal.vm.annotation=ALL-UNNAMED</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <spring-mobile-device.version>1.1.5.RELEASE</spring-mobile-device.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-5-data-reactive/pom.xml b/spring-reactive-modules/spring-5-data-reactive/pom.xml
index bf5170c621..3c7b4eefad 100644
--- a/spring-reactive-modules/spring-5-data-reactive/pom.xml
+++ b/spring-reactive-modules/spring-5-data-reactive/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    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="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>spring-5-data-reactive</artifactId>
     <name>spring-5-data-reactive</name>
@@ -42,6 +42,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
         </dependency>
         <dependency>
             <groupId>io.projectreactor</groupId>
@@ -99,6 +100,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
@@ -150,6 +160,7 @@
         <!-- This spring-boot.version is set manually, For upgrading this please refer http://team.baeldung.com/browse/JAVA-2802 -->
         <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
         <log4j2.version>2.17.1</log4j2.version>
+        <lombok.version>1.18.26</lombok.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-5-reactive-3/README.md b/spring-reactive-modules/spring-5-reactive-3/README.md
index 24a7c43ad3..38036f929b 100644
--- a/spring-reactive-modules/spring-5-reactive-3/README.md
+++ b/spring-reactive-modules/spring-5-reactive-3/README.md
@@ -5,4 +5,5 @@ This module contains articles about reactive Spring 5.
 - [Logging a Reactive Sequence](https://www.baeldung.com/spring-reactive-sequence-logging)
 - [Reading Flux Into a Single InputStream Using Spring Reactive WebClient](https://www.baeldung.com/spring-reactive-read-flux-into-inputstream)
 - [Spring Boot FeignClient vs. WebClient](https://www.baeldung.com/spring-boot-feignclient-vs-webclient)
+- [Cancel an Ongoing Flux in Spring WebFlux](https://www.baeldung.com/spring-webflux-cancel-flux)
 - More articles: [[<-- prev]](../spring-5-reactive-2)
diff --git a/spring-reactive-modules/spring-5-reactive-3/src/test/java/com/baeldung/cancelflux/CancelFluxUnitTest.java b/spring-reactive-modules/spring-5-reactive-3/src/test/java/com/baeldung/cancelflux/CancelFluxUnitTest.java
new file mode 100644
index 0000000000..e360c2d5e4
--- /dev/null
+++ b/spring-reactive-modules/spring-5-reactive-3/src/test/java/com/baeldung/cancelflux/CancelFluxUnitTest.java
@@ -0,0 +1,123 @@
+package com.baeldung.cancelflux;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+
+import java.io.PrintStream;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+
+import reactor.core.Disposable;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.SignalType;
+import reactor.test.StepVerifier;
+
+public class CancelFluxUnitTest {
+
+    @Test
+    void givenOngoingFlux_whentakeUntil_thenFluxCancels() {
+        Flux<Integer> sensorData = Flux.range(1, 10);
+        List<Integer> result = new ArrayList<>();
+
+        sensorData.takeUntil(reading -> reading == 8)
+          .subscribe(result::add);
+        assertThat(result).containsExactly(1, 2, 3, 4, 5, 6, 7, 8);
+    }
+
+    @Test
+    void givenOngoingFlux_whentakeWhile_thenFluxCancels() {
+        List<Integer> result = new ArrayList<>();
+        Flux<Integer> sensorData = Flux.range(1, 10)
+          .takeWhile(reading -> reading < 8)
+          .doOnNext(result::add);
+
+        sensorData.subscribe();
+        assertThat(result).containsExactly(1, 2, 3, 4, 5, 6, 7);
+    }
+
+    @Test
+    void givenOngoingFlux_whentake_thenFluxCancels() {
+        Flux<Integer> sensorData = Flux.range(1, Integer.MAX_VALUE);
+        List<Integer> result = new ArrayList<>();
+
+        sensorData.take(2)
+          .subscribe(result::add);
+        assertThat(result).containsExactly(1, 2);
+    }
+
+    @Test
+    void givenAnOnGoingFlux_whenTakeDurationElapsed_thenCancelsFlux() {
+        Flux<Integer> sensorData = Flux.interval(Duration.ZERO, Duration.ofSeconds(2))
+          .map(i -> i.intValue() + 10)
+          .take(5);
+
+        Flux<Integer> canceledByTimeout = sensorData.take(Duration.ofSeconds(3));
+
+        StepVerifier.create(canceledByTimeout)
+          .expectNext(10, 11)
+          .expectComplete()
+          .verify();
+    }
+
+    @Test
+    void givenAnOnGoingFlux_whenDispose_thenCancelsFluxExplicitly() throws InterruptedException {
+        Flux<Integer> flux = Flux.range(1, 10)
+          .delayElements(Duration.ofSeconds(1));
+
+        AtomicInteger count = new AtomicInteger(0);
+        Disposable disposable = flux.subscribe(i -> {
+            System.out.println("Received: " + i);
+            count.incrementAndGet();
+        }, e -> System.err.println("Error: " + e.getMessage()));
+
+        Thread.sleep(4500);
+        System.out.println("Will Dispose The flux Next");
+        disposable.dispose();
+        if (disposable.isDisposed()) {
+            System.out.println("Flux Disposed");
+        }
+        assertEquals(4, count.get());
+    }
+
+    @Test
+    void givenAFluxIsCanceled_whenDoOnCancelAndDoFinally_thenMessagePrinted() throws InterruptedException {
+
+        List<Integer> result = new ArrayList<>();
+        PrintStream mockPrintStream = mock(PrintStream.class);
+        System.setOut(mockPrintStream);
+
+        Flux<Integer> sensorData = Flux.interval(Duration.ofMillis(100))
+          .doOnCancel(() -> System.out.println("Flux Canceled"))
+          .doFinally(signalType -> {
+              if (signalType == SignalType.CANCEL) {
+                  System.out.println("Flux Completed due to Cancellation");
+              } else {
+                  System.out.println("Flux Completed due to Completion or Error");
+              }
+          })
+          .map(i -> ThreadLocalRandom.current()
+            .nextInt(1, 1001))
+          .doOnNext(result::add);
+
+        Disposable subscription = sensorData.subscribe();
+
+        Thread.sleep(1000);
+        subscription.dispose();
+
+        ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+        Mockito.verify(mockPrintStream, times(2))
+          .println(captor.capture());
+
+        assertThat(captor.getAllValues()).contains("Flux Canceled", "Flux Completed due to Cancellation");
+    }
+
+}
diff --git a/spring-reactive-modules/spring-5-reactive-3/src/test/java/com/baeldung/databuffer/DataBufferToInputStreamUnitTest.java b/spring-reactive-modules/spring-5-reactive-3/src/test/java/com/baeldung/databuffer/DataBufferToInputStreamUnitTest.java
index f30b4a8a3b..975a2d8698 100644
--- a/spring-reactive-modules/spring-5-reactive-3/src/test/java/com/baeldung/databuffer/DataBufferToInputStreamUnitTest.java
+++ b/spring-reactive-modules/spring-5-reactive-3/src/test/java/com/baeldung/databuffer/DataBufferToInputStreamUnitTest.java
@@ -17,9 +17,12 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.net.URI;
 import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 class DataBufferToInputStreamUnitTest {
     private String getResponseStub() throws IOException {
@@ -67,7 +70,7 @@ class DataBufferToInputStreamUnitTest {
 
     @Test
     public void testResponseAsInputStream() throws IOException, InterruptedException {
-        String mockUrl = Mockito.anyString();
+        String mockUrl = "http://mockurl.com";
         WebClient mockWebClient = getMockWebClient();
         InputStream inputStream = DataBufferToInputStream.getResponseAsInputStream(mockWebClient, mockUrl);
         byte[] expectedBytes = IOUtils.toByteArray(getResponseStubAsInputStream());
diff --git a/spring-reactive-modules/spring-5-reactive-client/pom.xml b/spring-reactive-modules/spring-5-reactive-client/pom.xml
index 16581d53af..a0e5f7794e 100644
--- a/spring-reactive-modules/spring-5-reactive-client/pom.xml
+++ b/spring-reactive-modules/spring-5-reactive-client/pom.xml
@@ -136,14 +136,6 @@
                     <layout>JAR</layout>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -189,7 +181,7 @@
         <geronimo-json_1.1_spec.version>1.0</geronimo-json_1.1_spec.version>
         <jetty-reactive-httpclient.version>1.1.6</jetty-reactive-httpclient.version>
         <okhttp.version>4.0.1</okhttp.version>
-        <reactor-test.version>3.2.10.RELEASE</reactor-test.version>
+        <reactor-test.version>3.5.3</reactor-test.version>
         <wiremock-standalone.version>2.26.0</wiremock-standalone.version>
     </properties>
 
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/WebClientLoggingIntegrationTest.java b/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/WebClientLoggingIntegrationTest.java
index dabfd22056..e1eefe4d61 100644
--- a/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/WebClientLoggingIntegrationTest.java
+++ b/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/WebClientLoggingIntegrationTest.java
@@ -49,7 +49,7 @@ public class WebClientLoggingIntegrationTest {
     private String sampleResponseBody;
 
     @BeforeEach
-    private void setup() throws Exception {
+    void setup() throws Exception {
 
         post = new Post("Learn WebClient logging with Baeldung!", "", 1);
         sampleResponseBody = new ObjectMapper().writeValueAsString(post);
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/web/ManualOauthRequestController.java b/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/web/ManualOauthRequestController.java
index d54d811032..c449a5991e 100644
--- a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/web/ManualOauthRequestController.java
+++ b/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/web/ManualOauthRequestController.java
@@ -1,12 +1,13 @@
 package com.baeldung.webclient.manualrequest.web;
 
+import java.util.Base64;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
-import org.springframework.util.Base64Utils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.reactive.function.BodyInserters;
@@ -41,7 +42,8 @@ public class ManualOauthRequestController {
         logger.info("Creating web client...");
         Mono<String> resource = client.post()
             .uri(tokenUri)
-            .header(HttpHeaders.AUTHORIZATION, "Basic " + Base64Utils.encodeToString((clientId + ":" + clientSecret).getBytes()))
+            .header(HttpHeaders.AUTHORIZATION, "Basic " + Base64.getEncoder()
+                .encodeToString((clientId + ":" + clientSecret).getBytes()))
             .body(BodyInserters.fromFormData(OAuth2ParameterNames.GRANT_TYPE, GrantType.CLIENT_CREDENTIALS.getValue()))
             .retrieve()
             .bodyToMono(JsonNode.class)
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/authresolver/AuthResolverIntegrationTest.java b/spring-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/authresolver/AuthResolverIntegrationTest.java
index 691243b3ea..9e0855d086 100644
--- a/spring-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/authresolver/AuthResolverIntegrationTest.java
+++ b/spring-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/authresolver/AuthResolverIntegrationTest.java
@@ -1,5 +1,7 @@
 package com.baeldung.reactive.authresolver;
 
+import java.util.Base64;
+
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -8,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.reactive.server.WebTestClient;
-import org.springframework.util.Base64Utils;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AuthResolverApplication.class)
@@ -22,7 +23,7 @@ public class AuthResolverIntegrationTest {
         testClient
           .get()
           .uri("/customer/welcome")
-          .header("Authorization", "Basic " + Base64Utils.encodeToString("customer1:pass1".getBytes()))
+          .header("Authorization", "Basic " + Base64.getEncoder().encodeToString("customer1:pass1".getBytes()))
           .exchange()
           .expectStatus()
           .isOk();
@@ -33,7 +34,7 @@ public class AuthResolverIntegrationTest {
         testClient
           .get()
           .uri("/customer/welcome")
-          .header("Authorization", "Basic " + Base64Utils.encodeToString("employee1:pass1".getBytes()))
+          .header("Authorization", "Basic " + Base64.getEncoder().encodeToString("employee1:pass1".getBytes()))
           .exchange()
           .expectStatus()
           .isUnauthorized();
@@ -44,7 +45,7 @@ public class AuthResolverIntegrationTest {
         testClient
           .get()
           .uri("/employee/welcome")
-          .header("Authorization", "Basic " + Base64Utils.encodeToString("employee1:pass1".getBytes()))
+          .header("Authorization", "Basic " + Base64.getEncoder().encodeToString("employee1:pass1".getBytes()))
           .exchange()
           .expectStatus()
           .isOk();
@@ -55,7 +56,7 @@ public class AuthResolverIntegrationTest {
         testClient
           .get()
           .uri("/employee/welcome")
-          .header("Authorization", "Basic " + Base64Utils.encodeToString("customer1:pass1".getBytes()))
+          .header("Authorization", "Basic " + Base64.getEncoder().encodeToString("customer1:pass1".getBytes()))
           .exchange()
           .expectStatus()
           .isUnauthorized();
diff --git a/spring-reactive-modules/spring-reactive-exceptions/pom.xml b/spring-reactive-modules/spring-reactive-exceptions/pom.xml
index 024a8332c2..fc08e07659 100644
--- a/spring-reactive-modules/spring-reactive-exceptions/pom.xml
+++ b/spring-reactive-modules/spring-reactive-exceptions/pom.xml
@@ -8,10 +8,11 @@
     <name>spring-reactive-exceptions</name>
     <description>A module to hold demo examples related to exception in Spring Reactive</description>
 
-    <parent>
-        <groupId>com.baeldung.spring.reactive</groupId>
-        <artifactId>spring-reactive-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+   <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-3</artifactId>   
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-3</relativePath>     
     </parent>
 
     <dependencies>
@@ -23,7 +24,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -42,14 +42,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                        </exclude>
-                    </excludes>
-                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/spring-reactive-modules/spring-reactive-exceptions/src/main/resources/application.yaml b/spring-reactive-modules/spring-reactive-exceptions/src/main/resources/application.yaml
index 5f3c8b82a9..935ab2a263 100644
--- a/spring-reactive-modules/spring-reactive-exceptions/src/main/resources/application.yaml
+++ b/spring-reactive-modules/spring-reactive-exceptions/src/main/resources/application.yaml
@@ -1,5 +1,3 @@
-spring:
-  codec:
-    max-in-memory-size: 500KB
-
+server:
+  port: 8080
 host: http://localhost:${server.port}
diff --git a/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeController.java b/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeController.java
index 23aacfdd95..646a93ac48 100644
--- a/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeController.java
+++ b/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/webflux/annotation/EmployeeController.java
@@ -22,17 +22,17 @@ public class EmployeeController {
     }
 
     @GetMapping("/{id}")
-    private Mono<Employee> getEmployeeById(@PathVariable String id) {
+    public Mono<Employee> getEmployeeById(@PathVariable String id) {
         return employeeRepository.findEmployeeById(id);
     }
 
     @GetMapping
-    private Flux<Employee> getAllEmployees() {
+    public Flux<Employee> getAllEmployees() {
         return employeeRepository.findAllEmployees();
     }
 
     @PostMapping("/update")
-    private Mono<Employee> updateEmployee(@RequestBody Employee employee) {
+    public Mono<Employee> updateEmployee(@RequestBody Employee employee) {
         return employeeRepository.updateEmployee(employee);
     }
 
diff --git a/spring-remoting-modules/pom.xml b/spring-remoting-modules/pom.xml
index c0f12d2f97..41d77c2969 100644
--- a/spring-remoting-modules/pom.xml
+++ b/spring-remoting-modules/pom.xml
@@ -37,4 +37,22 @@
         </dependencies>
     </dependencyManagement>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml
index 63458ef278..1939e00386 100644
--- a/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml
+++ b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml
@@ -58,6 +58,20 @@
         <!-- test -->
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <hessian.version>4.0.38</hessian.version>
     </properties>
diff --git a/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/pom.xml b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/pom.xml
index d64e8c94c1..68a70f24b6 100644
--- a/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/pom.xml
+++ b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/pom.xml
@@ -29,6 +29,20 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <hessian.version>4.0.38</hessian.version>
     </properties>
diff --git a/spring-scheduling/pom.xml b/spring-scheduling/pom.xml
index 8df35c4844..9010338fee 100644
--- a/spring-scheduling/pom.xml
+++ b/spring-scheduling/pom.xml
@@ -23,6 +23,7 @@
         <dependency>
             <groupId>org.springframework.retry</groupId>
             <artifactId>spring-retry</artifactId>
+            <version>${spring-retry.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -45,6 +46,7 @@
     </dependencies>
 
     <properties>
+        <spring-retry.version>2.0.0</spring-retry.version>
         <annotation-api.version>1.3.2</annotation-api.version>
     </properties>
 
diff --git a/spring-scheduling/src/main/java/com/baeldung/async/config/SpringAsyncConfig.java b/spring-scheduling/src/main/java/com/baeldung/async/config/SpringAsyncConfig.java
index 872f59ebb6..79d4dc8058 100644
--- a/spring-scheduling/src/main/java/com/baeldung/async/config/SpringAsyncConfig.java
+++ b/spring-scheduling/src/main/java/com/baeldung/async/config/SpringAsyncConfig.java
@@ -7,7 +7,6 @@ import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.scheduling.annotation.AsyncConfigurer;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
diff --git a/spring-scheduling/src/main/java/com/baeldung/springretry/MyService.java b/spring-scheduling/src/main/java/com/baeldung/springretry/MyService.java
index 40e2c419fc..25364442c9 100644
--- a/spring-scheduling/src/main/java/com/baeldung/springretry/MyService.java
+++ b/spring-scheduling/src/main/java/com/baeldung/springretry/MyService.java
@@ -2,7 +2,6 @@ package com.baeldung.springretry;
 
 import java.sql.SQLException;
 
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.retry.annotation.Backoff;
 import org.springframework.retry.annotation.Recover;
 import org.springframework.retry.annotation.Retryable;
@@ -13,13 +12,13 @@ public interface MyService {
     @Retryable
     void retryService();
 
-    @Retryable(value = SQLException.class)
+    @Retryable(retryFor = SQLException.class)
     void retryServiceWithRecovery(String sql) throws SQLException;
 
-    @Retryable(value = { SQLException.class }, maxAttempts = 2, backoff = @Backoff(delay = 100))
+    @Retryable(retryFor = SQLException.class , maxAttempts = 2, backoff = @Backoff(delay = 100))
     void retryServiceWithCustomization(String sql) throws SQLException;
 
-    @Retryable( value = SQLException.class, maxAttemptsExpression = "${retry.maxAttempts}",
+    @Retryable(retryFor = SQLException.class, maxAttemptsExpression = "${retry.maxAttempts}",
                         backoff = @Backoff(delayExpression = "${retry.maxDelay}"))
     void retryServiceWithExternalConfiguration(String sql) throws SQLException;
 
diff --git a/spring-scheduling/src/main/java/com/baeldung/springretry/MyServiceImpl.java b/spring-scheduling/src/main/java/com/baeldung/springretry/MyServiceImpl.java
index 7eb4328a47..060187804d 100644
--- a/spring-scheduling/src/main/java/com/baeldung/springretry/MyServiceImpl.java
+++ b/spring-scheduling/src/main/java/com/baeldung/springretry/MyServiceImpl.java
@@ -5,7 +5,7 @@ import java.sql.SQLException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 @Service
 public class MyServiceImpl implements MyService {
diff --git a/spring-scheduling/src/test/java/com/baeldung/springretry/SpringRetryIntegrationTest.java b/spring-scheduling/src/test/java/com/baeldung/springretry/SpringRetryIntegrationTest.java
index 33ce2fff74..c5dff82d9f 100644
--- a/spring-scheduling/src/test/java/com/baeldung/springretry/SpringRetryIntegrationTest.java
+++ b/spring-scheduling/src/test/java/com/baeldung/springretry/SpringRetryIntegrationTest.java
@@ -1,8 +1,14 @@
 package com.baeldung.springretry;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.retry.support.RetryTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -14,8 +20,10 @@ import java.sql.SQLException;
 @ContextConfiguration(classes = AppConfig.class, loader = AnnotationConfigContextLoader.class)
 public class SpringRetryIntegrationTest {
 
-    @Autowired
+    @SpyBean
     private MyService myService;
+    @Value("${retry.maxAttempts}")
+    private String maxAttempts;
 
     @Autowired
     private RetryTemplate retryTemplate;
@@ -33,11 +41,13 @@ public class SpringRetryIntegrationTest {
     @Test
     public void givenRetryServiceWithCustomization_whenCallWithException_thenRetryRecover() throws SQLException {
         myService.retryServiceWithCustomization(null);
+        verify(myService, times(Integer.parseInt(maxAttempts))).retryServiceWithCustomization(any());
     }
 
     @Test
     public void givenRetryServiceWithExternalConfiguration_whenCallWithException_thenRetryRecover() throws SQLException {
         myService.retryServiceWithExternalConfiguration(null);
+        verify(myService, times(Integer.parseInt(maxAttempts))).retryServiceWithExternalConfiguration(any());
     }
 
     @Test(expected = RuntimeException.class)
diff --git a/spring-security-modules/pom.xml b/spring-security-modules/pom.xml
index d6e30e8ab8..223f0894d5 100644
--- a/spring-security-modules/pom.xml
+++ b/spring-security-modules/pom.xml
@@ -49,6 +49,7 @@
         <module>spring-security-web-x509</module>
         <module>spring-security-opa</module>
         <module>spring-security-pkce</module>
+        <module>spring-security-azuread</module>
     </modules>
 
 </project>
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-azuread/README.md b/spring-security-modules/spring-security-azuread/README.md
new file mode 100644
index 0000000000..8b4d6d9666
--- /dev/null
+++ b/spring-security-modules/spring-security-azuread/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Authenticating Users with AzureAD in Spring Boot](https://www.baeldung.com/spring-boot-azuerad-authenticate-users)
diff --git a/spring-security-modules/spring-security-azuread/pom.xml b/spring-security-modules/spring-security-azuread/pom.xml
new file mode 100644
index 0000000000..c4dbbd14b9
--- /dev/null
+++ b/spring-security-modules/spring-security-azuread/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	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>
+	<parent>
+		<groupId>com.baeldung</groupId>
+		<artifactId>parent-boot-2</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../../parent-boot-2</relativePath>
+	</parent>
+	<artifactId>spring-security-azuread</artifactId>
+	
+	<properties>
+		<java.version>1.8</java.version>
+	</properties>
+	
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-oauth2-client</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<scope>runtime</scope>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<optional>true</optional>
+		</dependency>		
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-thymeleaf</artifactId>
+		</dependency>
+	</dependencies>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+						</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-azuread/src/main/java/com/baeldung/security/azuread/Application.java b/spring-security-modules/spring-security-azuread/src/main/java/com/baeldung/security/azuread/Application.java
new file mode 100644
index 0000000000..ac36bc1328
--- /dev/null
+++ b/spring-security-modules/spring-security-azuread/src/main/java/com/baeldung/security/azuread/Application.java
@@ -0,0 +1,14 @@
+package com.baeldung.security.azuread;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+
+@SpringBootApplication
+public class Application {
+    
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+}
diff --git a/spring-security-modules/spring-security-azuread/src/main/java/com/baeldung/security/azuread/config/JwtAuthorizationConfiguration.java b/spring-security-modules/spring-security-azuread/src/main/java/com/baeldung/security/azuread/config/JwtAuthorizationConfiguration.java
new file mode 100644
index 0000000000..4d82e930ae
--- /dev/null
+++ b/spring-security-modules/spring-security-azuread/src/main/java/com/baeldung/security/azuread/config/JwtAuthorizationConfiguration.java
@@ -0,0 +1,72 @@
+package com.baeldung.security.azuread.config;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest;
+import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService;
+import org.springframework.security.oauth2.client.registration.ClientRegistration.ProviderDetails;
+import org.springframework.security.oauth2.client.userinfo.OAuth2UserService;
+import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
+import org.springframework.security.oauth2.core.oidc.user.OidcUser;
+import org.springframework.security.web.SecurityFilterChain;
+
+import com.baeldung.security.azuread.support.GroupsClaimMapper;
+import com.baeldung.security.azuread.support.NamedOidcUser;
+
+@Configuration
+@EnableConfigurationProperties(JwtAuthorizationProperties.class)
+public class JwtAuthorizationConfiguration {
+    
+    
+    
+    @Bean
+    SecurityFilterChain customJwtSecurityChain(HttpSecurity http, JwtAuthorizationProperties props) throws Exception {
+        // @formatter:off
+        return http
+          .authorizeRequests( r -> r.anyRequest().authenticated())
+          .oauth2Login(oauth2 -> {
+              oauth2.userInfoEndpoint(ep -> 
+                ep.oidcUserService(customOidcUserService(props)));
+          })
+        .build();
+        // @formatter:on
+    }
+    
+    private OAuth2UserService<OidcUserRequest, OidcUser> customOidcUserService(JwtAuthorizationProperties props) {
+        final OidcUserService delegate = new OidcUserService();
+        final GroupsClaimMapper mapper = new GroupsClaimMapper(
+          props.getAuthoritiesPrefix(), 
+          props.getGroupsClaim(),
+          props.getGroupToAuthorities());
+        
+        return (userRequest) -> {
+            OidcUser oidcUser = delegate.loadUser(userRequest);
+            // Enrich standard authorities with groups 
+            Set<GrantedAuthority> mappedAuthorities = new HashSet<>();
+            mappedAuthorities.addAll(oidcUser.getAuthorities());
+            mappedAuthorities.addAll(mapper.mapAuthorities(oidcUser));
+            
+            oidcUser = new NamedOidcUser(mappedAuthorities, oidcUser.getIdToken(), oidcUser.getUserInfo(),oidcUser.getName());
+
+            return oidcUser;
+        };
+    }
+
+    
+    
+//    @Bean
+//    GrantedAuthoritiesMapper jwtAuthoritiesMapper(JwtAuthorizationProperties props) {
+//        return new MappingJwtGrantedAuthoritiesMapper(
+//          props.getAuthoritiesPrefix(),
+//          props.getGroupsClaim(), 
+//          props.getGroupToAuthorities());
+//    }
+    
+
+}
diff --git a/spring-security-modules/spring-security-azuread/src/main/java/com/baeldung/security/azuread/config/JwtAuthorizationProperties.java b/spring-security-modules/spring-security-azuread/src/main/java/com/baeldung/security/azuread/config/JwtAuthorizationProperties.java
new file mode 100644
index 0000000000..981be317a3
--- /dev/null
+++ b/spring-security-modules/spring-security-azuread/src/main/java/com/baeldung/security/azuread/config/JwtAuthorizationProperties.java
@@ -0,0 +1,68 @@
+package com.baeldung.security.azuread.config;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * @author Baeldung
+ *
+ */
+@ConfigurationProperties(prefix="baeldung.jwt.authorization")
+public class JwtAuthorizationProperties {
+    
+    // Claim that has the group list
+    private String groupsClaim = "groups";
+    
+    private String authoritiesPrefix = "ROLE_";
+    
+    // map groupIds to a list of authorities.
+    private Map<String,List<String>> groupToAuthorities = new HashMap<>();
+    
+    /**
+     * @return the groupsClaim
+     */
+    public String getGroupsClaim() {
+        return groupsClaim;
+    }
+    
+    /**
+     * @param groupsClaim the groupsClaim to set
+     */
+    public void setGroupsClaim(String groupsClaim) {
+        this.groupsClaim = groupsClaim;
+    }
+    
+    /**
+     * @return the groupToAuthorities
+     */
+    public Map<String, List<String>> getGroupToAuthorities() {
+        return groupToAuthorities;
+    }
+    
+    /**
+     * @param groupToAuthorities the groupToAuthorities to set
+     */
+    public void setGroupToAuthorities(Map<String, List<String>> groupToAuthorities) {
+        this.groupToAuthorities = groupToAuthorities;
+    }
+
+    /**
+     * @return the authoritiesPrefix
+     */
+    public String getAuthoritiesPrefix() {
+        return authoritiesPrefix;
+    }
+
+    /**
+     * @param authoritiesPrefix the authoritiesPrefix to set
+     */
+    public void setAuthoritiesPrefix(String authoritiesPrefix) {
+        this.authoritiesPrefix = authoritiesPrefix;
+    }
+    
+    
+
+}
diff --git a/spring-security-modules/spring-security-azuread/src/main/java/com/baeldung/security/azuread/controllers/IndexController.java b/spring-security-modules/spring-security-azuread/src/main/java/com/baeldung/security/azuread/controllers/IndexController.java
new file mode 100644
index 0000000000..d2cebd0231
--- /dev/null
+++ b/spring-security-modules/spring-security-azuread/src/main/java/com/baeldung/security/azuread/controllers/IndexController.java
@@ -0,0 +1,22 @@
+package com.baeldung.security.azuread.controllers;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Controller
+@RequestMapping("/")
+@Slf4j
+public class IndexController {
+
+    @GetMapping
+    public String index(Model model, Authentication user) {
+        log.info("GET /: user={}", user);
+        model.addAttribute("user", user);
+        return "index";
+    }
+}
diff --git a/spring-security-modules/spring-security-azuread/src/main/java/com/baeldung/security/azuread/support/GroupsClaimMapper.java b/spring-security-modules/spring-security-azuread/src/main/java/com/baeldung/security/azuread/support/GroupsClaimMapper.java
new file mode 100644
index 0000000000..2487cd9db3
--- /dev/null
+++ b/spring-security-modules/spring-security-azuread/src/main/java/com/baeldung/security/azuread/support/GroupsClaimMapper.java
@@ -0,0 +1,61 @@
+/**
+ * 
+ */
+package com.baeldung.security.azuread.support;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.authority.mapping.GrantedAuthoritiesMapper;
+import org.springframework.security.oauth2.core.ClaimAccessor;
+import org.springframework.security.oauth2.jwt.Jwt;
+
+/**
+ * @author Baeldung
+ *
+ */
+public class GroupsClaimMapper  {
+    
+    private final String authoritiesPrefix;
+    private final String groupsClaim;
+    private final Map<String, List<String>> groupToAuthorities;
+
+    public GroupsClaimMapper(String authoritiesPrefix, String groupsClaim, Map<String, List<String>> groupToAuthorities) {
+        this.authoritiesPrefix = authoritiesPrefix;
+        this.groupsClaim = groupsClaim;
+        this.groupToAuthorities = Collections.unmodifiableMap(groupToAuthorities);
+    }
+
+    public Collection<? extends GrantedAuthority> mapAuthorities(ClaimAccessor source) {
+        
+        List<String> groups = source.getClaimAsStringList(groupsClaim);
+        if ( groups == null || groups.isEmpty()) {
+            return Collections.emptyList();
+        }
+        
+        List<GrantedAuthority> result = new ArrayList<>();
+        for( String g : groups) {
+            List<String> authNames = groupToAuthorities.get(g);
+            if ( authNames == null ) {
+                continue;
+            }
+            
+            List<SimpleGrantedAuthority> mapped = authNames.stream()
+              .map( s -> authoritiesPrefix + s)
+              .map( SimpleGrantedAuthority::new)
+              .collect(Collectors.toList());
+            
+            result.addAll(mapped);
+        }
+        
+        return result;
+    }
+
+}
diff --git a/spring-security-modules/spring-security-azuread/src/main/java/com/baeldung/security/azuread/support/NamedOidcUser.java b/spring-security-modules/spring-security-azuread/src/main/java/com/baeldung/security/azuread/support/NamedOidcUser.java
new file mode 100644
index 0000000000..b29b04fe7b
--- /dev/null
+++ b/spring-security-modules/spring-security-azuread/src/main/java/com/baeldung/security/azuread/support/NamedOidcUser.java
@@ -0,0 +1,24 @@
+package com.baeldung.security.azuread.support;
+
+import java.util.Collection;
+
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.oauth2.core.oidc.OidcIdToken;
+import org.springframework.security.oauth2.core.oidc.OidcUserInfo;
+import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
+
+public class NamedOidcUser extends DefaultOidcUser {    
+    private static final long serialVersionUID = 1L;
+    private final String userName;
+
+    public NamedOidcUser(Collection<? extends GrantedAuthority> authorities, OidcIdToken idToken,
+                        OidcUserInfo userInfo, String userName) {        
+        super(authorities,idToken,userInfo);
+        this.userName= userName;
+    }
+
+    @Override
+    public String getName() {
+        return this.userName;
+    }
+}
diff --git a/spring-security-modules/spring-security-azuread/src/main/resources/application-azuread.yml b/spring-security-modules/spring-security-azuread/src/main/resources/application-azuread.yml
new file mode 100644
index 0000000000..5e65c381c8
--- /dev/null
+++ b/spring-security-modules/spring-security-azuread/src/main/resources/application-azuread.yml
@@ -0,0 +1,27 @@
+spring:
+  security:
+    oauth2:
+      client:
+        provider:
+          azure:
+            issuer-uri: https://login.microsoftonline.com/2e9fde3a-38ec-44f9-8bcd-c184dc1e8033/v2.0
+            user-name-attribute: name
+        registration:
+          azure-dev:
+            provider: azure
+            #client-id: "6035bfd4-22f0-437c-b76f-da729a916cbf"
+            #client-secret: "fo28Q~-aLbmQvonnZtzbgtSiqYstmBWEmGPAodmx"
+            client-id: your-client-id
+            client-secret: your-secret-id         
+            scope:
+            - openid
+            - email
+            - profile
+                    
+# Group mapping
+baeldung:
+  jwt:
+    authorization:
+      group-to-authorities:
+        "ceef656a-fca9-49b6-821b-f7543b7065cb": BAELDUNG_RW
+        "eaaecb69-ccbc-4143-b111-7dd1ce1d99f1": BAELDUNG_RO,BAELDUNG_ADMIN
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-azuread/src/main/resources/application.properties b/spring-security-modules/spring-security-azuread/src/main/resources/application.properties
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/spring-security-modules/spring-security-azuread/src/main/resources/application.properties
@@ -0,0 +1 @@
+
diff --git a/spring-security-modules/spring-security-azuread/src/main/resources/templates/index.html b/spring-security-modules/spring-security-azuread/src/main/resources/templates/index.html
new file mode 100644
index 0000000000..ca9a9bdbe8
--- /dev/null
+++ b/spring-security-modules/spring-security-azuread/src/main/resources/templates/index.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html data-theme="dark"	>
+<head>
+<meta charset="UTF-8">
+<title>Insert title here</title>
+<link rel="stylesheet" href="https://unpkg.com/@picocss/pico@latest/css/pico.min.css">
+</head>
+<body class="container">
+<h1>Hello, <span data-th-text="${user.name}">NOMO_NOMO</span></h1>
+
+<h2>User info:</h2>
+
+<table role="grid">
+	<thead>
+		<tr>
+			<th>Attribute</th>
+			<th>Value</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>Name</td>
+			<td data-th-text="${user.name}">user.name</td>
+		</tr>
+		<tr>
+			<td>Class</td>
+			<td data-th-text="${user.class}">user.class</td>
+		</tr>
+		<tr>
+			<td>Principal Class</td>
+			<td data-th-text="${user.principal.class}">user.principal.class</td>
+		</tr>
+		<tr>
+			<td>isAuthenticated?</td>
+			<td data-th-text="${user.authenticated}">user.authenticated</td>
+		</tr>
+		<tr>
+			<td>clientRegistrationId</td>
+			<td data-th-text="${user.authorizedClientRegistrationId}">user.authorizedClientregistrationId</td>
+		</tr>
+		<tr data-th-each="claim : ${user.principal.claims}">
+			<td >Claim: <span data-th-text="${claim.key}">key</span></td>
+			<td data-th-text="${claim.value}">value</td>
+		</tr>
+		<tr data-th-each="ga : ${user.authorities}">
+			<td >Granted Authority: <span data-th-text="${ga.class.simpleName}"></span></td>
+			<td data-th-text="${ga.authority}">authority</td>
+		</tr>
+		
+	</tbody>	
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-azuread/src/test/java/com/baeldung/security/azuread/ApplicationLiveTest.java b/spring-security-modules/spring-security-azuread/src/test/java/com/baeldung/security/azuread/ApplicationLiveTest.java
new file mode 100644
index 0000000000..8c941aa787
--- /dev/null
+++ b/spring-security-modules/spring-security-azuread/src/test/java/com/baeldung/security/azuread/ApplicationLiveTest.java
@@ -0,0 +1,62 @@
+package com.baeldung.security.azuread;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.net.URI;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.ActiveProfiles;
+
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
+@ActiveProfiles("azuread")
+class ApplicationLiveTest {
+    
+    @Autowired
+    TestRestTemplate rest;
+    
+    @LocalServerPort
+    int port;
+
+    @Test
+    void testWhenAccessRootPath_thenRedirectToAzureAD() {
+                
+        ResponseEntity<String> response = rest.getForEntity("http://localhost:" + port , String.class);               
+        HttpStatus st = response.getStatusCode();
+        assertThat(st)
+           .isEqualTo(HttpStatus.FOUND);
+        
+        URI location1 = response.getHeaders().getLocation();
+        assertThat(location1)
+          .isNotNull();
+        assertThat(location1.getPath())
+          .isEqualTo("/oauth2/authorization/azure-dev");
+        
+        assertThat(location1.getPort())
+          .isEqualTo(port);
+        
+        assertThat(location1.getHost())
+          .isEqualTo("localhost");
+        
+        // Now let't follow this redirect
+        response = rest.getForEntity(location1, String.class);
+        assertThat(st)
+        .isEqualTo(HttpStatus.FOUND);
+        URI location2 = response.getHeaders().getLocation();
+        assertThat(location2)
+          .isNotNull();
+        
+        assertThat(location2.getHost())
+          .describedAs("Should redirect to AzureAD")
+          .isEqualTo("login.microsoftonline.com");
+                 
+    }
+
+}
diff --git a/spring-security-modules/spring-security-azuread/src/test/java/com/baeldung/security/azuread/support/GroupsClaimMapperUnitTest.java b/spring-security-modules/spring-security-azuread/src/test/java/com/baeldung/security/azuread/support/GroupsClaimMapperUnitTest.java
new file mode 100644
index 0000000000..0a8f85d0d1
--- /dev/null
+++ b/spring-security-modules/spring-security-azuread/src/test/java/com/baeldung/security/azuread/support/GroupsClaimMapperUnitTest.java
@@ -0,0 +1,48 @@
+package com.baeldung.security.azuread.support;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.oauth2.core.ClaimAccessor;
+
+class GroupsClaimMapperUnitTest {
+    
+    private Map<String,List<String>> g2a = new HashMap<>();
+
+    @Test
+    void testWhenNoGroupClaimsPresent_thenNoAuthoritiesAdded() {
+        
+        ClaimAccessor source = mock(ClaimAccessor.class);
+        GroupsClaimMapper mapper = new GroupsClaimMapper("ROLE", "group", g2a);
+        
+        Collection<? extends GrantedAuthority> authorities = mapper.mapAuthorities(source);
+        assertThat(authorities)
+          .isNotNull()
+          .isEmpty();
+    }
+
+    @Test
+    void testWhenEmptyGroupClaimsPresent_thenNoAuthoritiesAdded() {
+        
+        ClaimAccessor source = mock(ClaimAccessor.class);
+        when(source.getClaimAsStringList("group"))
+          .thenReturn(Collections.emptyList());
+        
+        GroupsClaimMapper mapper = new GroupsClaimMapper("ROLE", "group", g2a);
+        
+        Collection<? extends GrantedAuthority> authorities = mapper.mapAuthorities(source);
+        assertThat(authorities)
+          .isNotNull()
+          .isEmpty();
+    }
+
+}
diff --git a/spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/authresolver/AuthResolverIntegrationTest.java b/spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/authresolver/AuthResolverIntegrationTest.java
index c87f8c1a3a..a0bc793a11 100644
--- a/spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/authresolver/AuthResolverIntegrationTest.java
+++ b/spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/authresolver/AuthResolverIntegrationTest.java
@@ -11,13 +11,14 @@ import org.springframework.security.web.FilterChainProxy;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.util.Base64Utils;
 import org.springframework.web.context.WebApplicationContext;
 
 import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import java.util.Base64;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AuthResolverApplication.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -44,7 +45,7 @@ public class AuthResolverIntegrationTest {
         this.mockMvc
           .perform(get("/customer/welcome")
             .header(
-              "Authorization", String.format("Basic %s", Base64Utils.encodeToString("customer1:pass1".getBytes()))
+              "Authorization", String.format("Basic %s", Base64.getEncoder().encodeToString("customer1:pass1".getBytes()))
             )
           )
           .andExpect(status().is2xxSuccessful());
@@ -55,7 +56,7 @@ public class AuthResolverIntegrationTest {
         this.mockMvc
           .perform(get("/customer/welcome")
             .header(
-              "Authorization", "Basic " + Base64Utils.encodeToString("employee1:pass1".getBytes()))
+              "Authorization", "Basic " + Base64.getEncoder().encodeToString("employee1:pass1".getBytes()))
           )
           .andExpect(status().isUnauthorized());
     }
@@ -65,7 +66,7 @@ public class AuthResolverIntegrationTest {
         this.mockMvc
           .perform(get("/employee/welcome")
             .header(
-              "Authorization", "Basic " + Base64Utils.encodeToString("employee1:pass1".getBytes()))
+              "Authorization", "Basic " + Base64.getEncoder().encodeToString("employee1:pass1".getBytes()))
           )
           .andExpect(status().is2xxSuccessful());
     }
@@ -75,7 +76,7 @@ public class AuthResolverIntegrationTest {
         this.mockMvc
           .perform(get("/employee/welcome")
             .header(
-              "Authorization", "Basic " + Base64Utils.encodeToString("customer1:pass1".getBytes()))
+              "Authorization", "Basic " + Base64.getEncoder().encodeToString("customer1:pass1".getBytes()))
           )
           .andExpect(status().isUnauthorized());
     }
diff --git a/spring-security-modules/spring-security-oauth2-testing/README.md b/spring-security-modules/spring-security-oauth2-testing/README.md
new file mode 100644
index 0000000000..4d1850867a
--- /dev/null
+++ b/spring-security-modules/spring-security-oauth2-testing/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Testing Spring OAuth2 Access-Control](https://www.baeldung.com/spring-oauth-testing-access-control)
diff --git a/spring-security-modules/spring-security-oauth2-testing/pom.xml b/spring-security-modules/spring-security-oauth2-testing/pom.xml
new file mode 100644
index 0000000000..93348cb48c
--- /dev/null
+++ b/spring-security-modules/spring-security-oauth2-testing/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>spring-security-oauth2-testing</artifactId>
+    <name>spring-security-oauth2-testing</name>
+    <packaging>pom</packaging>
+    <description>spring-security 6 oauth testing sample project</description>
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-3</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-3</relativePath>
+    </parent>
+    <properties>
+        <spring-addons.version>6.1.0</spring-addons.version>
+    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.c4-soft.springaddons</groupId>
+                <artifactId>spring-addons-oauth2-test</artifactId>
+                <version>${spring-addons.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <modules>
+        <module>reactive-resource-server</module>
+        <module>servlet-resource-server</module>
+    </modules>
+</project>
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/pom.xml b/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/pom.xml
new file mode 100644
index 0000000000..86f73cfdbf
--- /dev/null
+++ b/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>spring-security-oauth2-testing</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <groupId>com.baeldung.spring-security-modules.testing</groupId>
+    <artifactId>reactive-resource-server</artifactId>
+    <name>reactive-resource-server</name>
+    <description>Demo project for Spring Boot reactive resource-server</description>
+    <properties>
+        <java.version>17</java.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.c4-soft.springaddons</groupId>
+            <artifactId>spring-addons-oauth2-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/src/main/java/com/baeldung/ReactiveResourceServerApplication.java b/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/src/main/java/com/baeldung/ReactiveResourceServerApplication.java
new file mode 100644
index 0000000000..500d876bc4
--- /dev/null
+++ b/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/src/main/java/com/baeldung/ReactiveResourceServerApplication.java
@@ -0,0 +1,144 @@
+package com.baeldung;
+
+import java.nio.charset.Charset;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.io.buffer.DataBufferUtils;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.authentication.AnonymousAuthenticationToken;
+import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
+import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity;
+import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
+import org.springframework.security.config.web.server.ServerHttpSecurity;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.context.ReactiveSecurityContextHolder;
+import org.springframework.security.oauth2.core.oidc.StandardClaimNames;
+import org.springframework.security.oauth2.jwt.Jwt;
+import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
+import org.springframework.security.web.server.SecurityWebFilterChain;
+import org.springframework.security.web.server.context.NoOpServerSecurityContextRepository;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import lombok.RequiredArgsConstructor;
+import reactor.core.publisher.Mono;
+
+@SpringBootApplication
+public class ReactiveResourceServerApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ReactiveResourceServerApplication.class, args);
+    }
+
+    @Configuration
+    @EnableWebFluxSecurity
+    @EnableReactiveMethodSecurity
+    public class SecurityConfig {
+        @Bean
+        SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http, Converter<Jwt, Mono<Collection<GrantedAuthority>>> authoritiesConverter) {
+            http.oauth2ResourceServer()
+                .jwt()
+                .jwtAuthenticationConverter(jwt -> authoritiesConverter.convert(jwt)
+                    .map(authorities -> new JwtAuthenticationToken(jwt, authorities)));
+            http.securityContextRepository(NoOpServerSecurityContextRepository.getInstance())
+                .csrf()
+                .disable();
+            http.exceptionHandling()
+                .accessDeniedHandler((var exchange, var ex) -> exchange.getPrincipal()
+                    .flatMap(principal -> {
+                        final var response = exchange.getResponse();
+                        response.setStatusCode(principal instanceof AnonymousAuthenticationToken ? HttpStatus.UNAUTHORIZED : HttpStatus.FORBIDDEN);
+                        response.getHeaders()
+                            .setContentType(MediaType.TEXT_PLAIN);
+                        final var dataBufferFactory = response.bufferFactory();
+                        final var buffer = dataBufferFactory.wrap(ex.getMessage()
+                            .getBytes(Charset.defaultCharset()));
+                        return response.writeWith(Mono.just(buffer))
+                            .doOnError(error -> DataBufferUtils.release(buffer));
+                    }));
+
+            http.authorizeExchange()
+                .pathMatchers("/secured-route")
+                .hasRole("AUTHORIZED_PERSONNEL")
+                .anyExchange()
+                .authenticated();
+
+            return http.build();
+        }
+
+        static interface AuthoritiesConverter extends Converter<Jwt, Mono<Collection<GrantedAuthority>>> {
+        }
+
+        @Bean
+        AuthoritiesConverter realmRoles2AuthoritiesConverter() {
+            return (Jwt jwt) -> {
+                final var realmRoles = Optional.of(jwt.getClaimAsMap("realm_access"))
+                    .orElse(Map.of());
+                @SuppressWarnings("unchecked")
+                final var roles = (List<String>) realmRoles.getOrDefault("roles", List.of());
+                return Mono.just(roles.stream()
+                    .map(SimpleGrantedAuthority::new)
+                    .map(GrantedAuthority.class::cast)
+                    .toList());
+            };
+        }
+    }
+
+    @Service
+    public static class MessageService {
+
+        public Mono<String> greet() {
+            return ReactiveSecurityContextHolder.getContext()
+                .map(ctx -> {
+                    final var who = (JwtAuthenticationToken) ctx.getAuthentication();
+                    final var claims = who.getTokenAttributes();
+                    return "Hello %s! You are granted with %s.".formatted(claims.getOrDefault(StandardClaimNames.PREFERRED_USERNAME, claims.get(StandardClaimNames.SUB)), who.getAuthorities());
+                })
+                .switchIfEmpty(Mono.error(new AuthenticationCredentialsNotFoundException("Security context is empty")));
+        }
+
+        @PreAuthorize("hasRole('AUTHORIZED_PERSONNEL')")
+        public Mono<String> getSecret() {
+            return Mono.just("Only authorized personnel can read that");
+        }
+    }
+
+    @RestController
+    @RequiredArgsConstructor
+    public class GreetingController {
+        private final MessageService messageService;
+
+        @GetMapping("/greet")
+        public Mono<ResponseEntity<String>> greet() {
+            return messageService.greet()
+                .map(ResponseEntity::ok);
+        }
+
+        @GetMapping("/secured-route")
+        public Mono<ResponseEntity<String>> securedRoute() {
+            return messageService.getSecret()
+                .map(ResponseEntity::ok);
+        }
+
+        @GetMapping("/secured-method")
+        @PreAuthorize("hasRole('AUTHORIZED_PERSONNEL')")
+        public Mono<ResponseEntity<String>> securedMethod() {
+            return messageService.getSecret()
+                .map(ResponseEntity::ok);
+        }
+    }
+
+}
diff --git a/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/src/main/resources/application.yaml b/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/src/main/resources/application.yaml
new file mode 100644
index 0000000000..01e655e1b3
--- /dev/null
+++ b/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/src/main/resources/application.yaml
@@ -0,0 +1,6 @@
+spring:
+  security:
+    oauth2:
+      resourceserver:
+        jwt:
+          issuer-uri: https://localhost:8443/realms/master
diff --git a/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/src/test/java/com/baeldung/MessageServiceUnitTest.java b/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/src/test/java/com/baeldung/MessageServiceUnitTest.java
new file mode 100644
index 0000000000..97893bc1fb
--- /dev/null
+++ b/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/src/test/java/com/baeldung/MessageServiceUnitTest.java
@@ -0,0 +1,86 @@
+package com.baeldung;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Import;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
+import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity;
+import org.springframework.security.test.context.support.WithAnonymousUser;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import com.baeldung.ReactiveResourceServerApplication.MessageService;
+import com.c4_soft.springaddons.security.oauth2.test.annotations.OpenIdClaims;
+import com.c4_soft.springaddons.security.oauth2.test.annotations.WithMockJwtAuth;
+
+@Import({ MessageService.class })
+@ExtendWith(SpringExtension.class)
+@EnableReactiveMethodSecurity
+class MessageServiceUnitTest {
+    @Autowired
+    MessageService messageService;
+
+    /*----------------------------------------------------------------------------*/
+    /* greet()                                                                    */
+    /* Expects a JwtAuthenticationToken to be retrieved from the security-context */
+    /*----------------------------------------------------------------------------*/
+
+    @Test
+    void givenSecurityContextIsEmpty_whenGreet_thenThrowsAuthenticationCredentialsNotFoundException() {
+        assertThrows(AuthenticationCredentialsNotFoundException.class, () -> messageService.greet()
+            .block());
+    }
+
+    @Test
+    @WithAnonymousUser
+    void givenUserIsAnonymous_whenGreet_thenThrowsClassCastException() {
+        assertThrows(ClassCastException.class, () -> messageService.greet()
+            .block());
+    }
+
+    @Test
+    @WithMockJwtAuth(authorities = { "admin", "ROLE_AUTHORIZED_PERSONNEL" }, claims = @OpenIdClaims(preferredUsername = "ch4mpy"))
+    void givenSecurityContextIsPopulatedWithJwtAuthenticationToken_whenGreet_thenReturnGreetingWithPreferredUsernameAndAuthorities() {
+        assertEquals("Hello ch4mpy! You are granted with [admin, ROLE_AUTHORIZED_PERSONNEL].", messageService.greet()
+            .block());
+    }
+
+    @Test
+    @WithMockUser(authorities = { "admin", "ROLE_AUTHORIZED_PERSONNEL" }, username = "ch4mpy")
+    void givenSecurityContextIsPopulatedWithUsernamePasswordAuthenticationToken_whenGreet_thenThrowsClassCastException() {
+        assertThrows(ClassCastException.class, () -> messageService.greet()
+            .block());
+    }
+
+    /*--------------------------------------------------------------------*/
+    /* getSecret()                                                        */
+    /* is secured with "@PreAuthorize("hasRole('AUTHORIZED_PERSONNEL')")" */
+    /*--------------------------------------------------------------------*/
+
+    @Test
+    @WithAnonymousUser
+    void givenUserIsAnonymous_whenGetSecret_thenThrowsAccessDeniedException() {
+        assertThrows(AccessDeniedException.class, () -> messageService.getSecret()
+            .block());
+    }
+
+    @Test
+    @WithMockJwtAuth(authorities = { "admin", "ROLE_AUTHORIZED_PERSONNEL" }, claims = @OpenIdClaims(preferredUsername = "ch4mpy"))
+    void givenUserIsGrantedWithRoleAuthorizedPersonnel_whenGetSecret_thenReturnSecret() {
+        assertEquals("Only authorized personnel can read that", messageService.getSecret()
+            .block());
+    }
+
+    @Test
+    @WithMockJwtAuth(authorities = { "admin" }, claims = @OpenIdClaims(preferredUsername = "ch4mpy"))
+    void givenUserIsNotGrantedWithRoleAuthorizedPersonnel_whenGetSecret_thenThrowsAccessDeniedException() {
+        assertThrows(AccessDeniedException.class, () -> messageService.getSecret()
+            .block());
+    }
+
+}
diff --git a/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/src/test/java/com/baeldung/ReactiveResourceServerApplicationIntegrationTest.java b/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/src/test/java/com/baeldung/ReactiveResourceServerApplicationIntegrationTest.java
new file mode 100644
index 0000000000..1ee6fc7e87
--- /dev/null
+++ b/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/src/test/java/com/baeldung/ReactiveResourceServerApplicationIntegrationTest.java
@@ -0,0 +1,120 @@
+package com.baeldung;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.security.test.context.support.WithAnonymousUser;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+import com.c4_soft.springaddons.security.oauth2.test.annotations.OpenIdClaims;
+import com.c4_soft.springaddons.security.oauth2.test.annotations.WithMockJwtAuth;
+
+@SpringBootTest(webEnvironment = WebEnvironment.MOCK)
+@AutoConfigureWebTestClient
+class ReactiveResourceServerApplicationIntegrationTest {
+    @Autowired
+    WebTestClient api;
+
+    /*-----------------------------------------------------------------------------*/
+    /* /greet                                                                      */
+    /* This end-point secured with ".anyRequest().authenticated()" in SecurityConf */
+    /*-----------------------------------------------------------------------------*/
+
+    @Test
+    @WithAnonymousUser
+    void givenRequestIsAnonymous_whenGetGreet_thenUnauthorized() throws Exception {
+        api.get()
+            .uri("/greet")
+            .exchange()
+            .expectStatus()
+            .isUnauthorized();
+    }
+
+    @Test
+    @WithMockJwtAuth(authorities = { "admin", "ROLE_AUTHORIZED_PERSONNEL" }, claims = @OpenIdClaims(preferredUsername = "ch4mpy"))
+    void givenUserIsAuthenticated_whenGetGreet_thenOk() throws Exception {
+        api.get()
+            .uri("/greet")
+            .exchange()
+            .expectStatus()
+            .isOk()
+            .expectBody(String.class)
+            .isEqualTo("Hello ch4mpy! You are granted with [admin, ROLE_AUTHORIZED_PERSONNEL].");
+    }
+
+    /*---------------------------------------------------------------------------------------------------------------------*/
+    /* /secured-route                                                                                                      */
+    /* This end-point is secured with ".requestMatchers("/secured-route").hasRole("AUTHORIZED_PERSONNEL")" in SecurityConf */
+    /*---------------------------------------------------------------------------------------------------------------------*/
+
+    @Test
+    @WithAnonymousUser
+    void givenRequestIsAnonymous_whenGetSecuredRoute_thenUnauthorized() throws Exception {
+        api.get()
+            .uri("/secured-route")
+            .exchange()
+            .expectStatus()
+            .isUnauthorized();
+    }
+
+    @Test
+    @WithMockJwtAuth("ROLE_AUTHORIZED_PERSONNEL")
+    void givenUserIsGrantedWithRoleAuthorizedPersonnel_whenGetSecuredRoute_thenOk() throws Exception {
+        api.get()
+            .uri("/secured-route")
+            .exchange()
+            .expectStatus()
+            .isOk()
+            .expectBody(String.class)
+            .isEqualTo("Only authorized personnel can read that");
+    }
+
+    @Test
+    @WithMockJwtAuth("admin")
+    void givenUserIsNotGrantedWithRoleAuthorizedPersonnel_whenGetSecuredRoute_thenForbidden() throws Exception {
+        api.get()
+            .uri("/secured-route")
+            .exchange()
+            .expectStatus()
+            .isForbidden();
+    }
+
+    /*---------------------------------------------------------------------------------------------------------*/
+    /* /secured-method                                                                                         */
+    /* This end-point is secured with "@PreAuthorize("hasRole('AUTHORIZED_PERSONNEL')")" on @Controller method */
+    /*---------------------------------------------------------------------------------------------------------*/
+
+    @Test
+    @WithAnonymousUser
+    void givenRequestIsAnonymous_whenGetSecuredMethod_thenUnauthorized() throws Exception {
+        api.get()
+            .uri("/secured-method")
+            .exchange()
+            .expectStatus()
+            .isUnauthorized();
+    }
+
+    @Test
+    @WithMockJwtAuth("ROLE_AUTHORIZED_PERSONNEL")
+    void givenUserIsGrantedWithRoleAuthorizedPersonnel_whenGetSecuredMethod_thenOk() throws Exception {
+        api.get()
+            .uri("/secured-method")
+            .exchange()
+            .expectStatus()
+            .isOk()
+            .expectBody(String.class)
+            .isEqualTo("Only authorized personnel can read that");
+    }
+
+    @Test
+    @WithMockJwtAuth("admin")
+    void givenUserIsNotGrantedWithRoleAuthorizedPersonnel_whenGetSecuredMethod_thenForbidden() throws Exception {
+        api.get()
+            .uri("/secured-method")
+            .exchange()
+            .expectStatus()
+            .isForbidden();
+    }
+}
diff --git a/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/src/test/java/com/baeldung/SpringAddonsGreetingControllerUnitTest.java b/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/src/test/java/com/baeldung/SpringAddonsGreetingControllerUnitTest.java
new file mode 100644
index 0000000000..6f55f287d8
--- /dev/null
+++ b/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/src/test/java/com/baeldung/SpringAddonsGreetingControllerUnitTest.java
@@ -0,0 +1,142 @@
+package com.baeldung;
+
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.security.test.context.support.WithAnonymousUser;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+import com.baeldung.ReactiveResourceServerApplication.GreetingController;
+import com.baeldung.ReactiveResourceServerApplication.MessageService;
+import com.c4_soft.springaddons.security.oauth2.test.annotations.OpenIdClaims;
+import com.c4_soft.springaddons.security.oauth2.test.annotations.WithMockJwtAuth;
+
+import reactor.core.publisher.Mono;
+
+@WebFluxTest(controllers = GreetingController.class, properties = { "server.ssl.enabled=false" })
+class SpringAddonsGreetingControllerUnitTest {
+
+    @MockBean
+    MessageService messageService;
+
+    @Autowired
+    WebTestClient api;
+
+    /*-----------------------------------------------------------------------------*/
+    /* /greet                                                                      */
+    /* This end-point secured with ".anyRequest().authenticated()" in SecurityConf */
+    /*-----------------------------------------------------------------------------*/
+
+    @Test
+    @WithAnonymousUser
+    void givenRequestIsAnonymous_whenGetGreet_thenUnauthorized() throws Exception {
+        api.get()
+            .uri("/greet")
+            .exchange()
+            .expectStatus()
+            .isUnauthorized();
+    }
+
+    @Test
+    @WithMockJwtAuth(authorities = { "admin", "ROLE_AUTHORIZED_PERSONNEL" }, claims = @OpenIdClaims(preferredUsername = "ch4mpy"))
+    void givenUserIsAuthenticated_whenGetGreet_thenOk() throws Exception {
+        final var greeting = "Whatever the service returns";
+        when(messageService.greet()).thenReturn(Mono.just(greeting));
+
+        api.get()
+            .uri("/greet")
+            .exchange()
+            .expectStatus()
+            .isOk()
+            .expectBody(String.class)
+            .isEqualTo(greeting);
+
+        verify(messageService, times(1)).greet();
+    }
+
+    /*---------------------------------------------------------------------------------------------------------------------*/
+    /* /secured-route                                                                                                      */
+    /* This end-point is secured with ".requestMatchers("/secured-route").hasRole("AUTHORIZED_PERSONNEL")" in SecurityConf */
+    /*---------------------------------------------------------------------------------------------------------------------*/
+
+    @Test
+    @WithAnonymousUser
+    void givenRequestIsAnonymous_whenGetSecuredRoute_thenUnauthorized() throws Exception {
+        api.get()
+            .uri("/secured-route")
+            .exchange()
+            .expectStatus()
+            .isUnauthorized();
+    }
+
+    @Test
+    @WithMockJwtAuth("ROLE_AUTHORIZED_PERSONNEL")
+    void givenUserIsGrantedWithRoleAuthorizedPersonnel_whenGetSecuredRoute_thenOk() throws Exception {
+        final var secret = "Secret!";
+        when(messageService.getSecret()).thenReturn(Mono.just(secret));
+
+        api.get()
+            .uri("/secured-route")
+            .exchange()
+            .expectStatus()
+            .isOk()
+            .expectBody(String.class)
+            .isEqualTo(secret);
+    }
+
+    @Test
+    @WithMockJwtAuth("admin")
+    void givenUserIsNotGrantedWithRoleAuthorizedPersonnel_whenGetSecuredRoute_thenForbidden() throws Exception {
+        api.get()
+            .uri("/secured-route")
+            .exchange()
+            .expectStatus()
+            .isForbidden();
+    }
+
+    /*---------------------------------------------------------------------------------------------------------*/
+    /* /secured-method                                                                                         */
+    /* This end-point is secured with "@PreAuthorize("hasRole('AUTHORIZED_PERSONNEL')")" on @Controller method */
+    /*---------------------------------------------------------------------------------------------------------*/
+
+    @Test
+    @WithAnonymousUser
+    void givenRequestIsAnonymous_whenGetSecuredMethod_thenUnauthorized() throws Exception {
+        api.get()
+            .uri("/secured-method")
+            .exchange()
+            .expectStatus()
+            .isUnauthorized();
+    }
+
+    @Test
+    @WithMockJwtAuth("ROLE_AUTHORIZED_PERSONNEL")
+    void givenUserIsGrantedWithRoleAuthorizedPersonnel_whenGetSecuredMethod_thenOk() throws Exception {
+        final var secret = "Secret!";
+        when(messageService.getSecret()).thenReturn(Mono.just(secret));
+
+        api.get()
+            .uri("/secured-method")
+            .exchange()
+            .expectStatus()
+            .isOk()
+            .expectBody(String.class)
+            .isEqualTo(secret);
+    }
+
+    @Test
+    @WithMockJwtAuth("admin")
+    void givenUserIsNotGrantedWithRoleAuthorizedPersonnel_whenGetSecuredMethod_thenForbidden() throws Exception {
+        api.get()
+            .uri("/secured-method")
+            .exchange()
+            .expectStatus()
+            .isForbidden();
+    }
+
+}
diff --git a/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/src/test/java/com/baeldung/SpringSecurityTestGreetingControllerUnitTest.java b/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/src/test/java/com/baeldung/SpringSecurityTestGreetingControllerUnitTest.java
new file mode 100644
index 0000000000..e048481ce4
--- /dev/null
+++ b/spring-security-modules/spring-security-oauth2-testing/reactive-resource-server/src/test/java/com/baeldung/SpringSecurityTestGreetingControllerUnitTest.java
@@ -0,0 +1,149 @@
+package com.baeldung;
+
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.mockAuthentication;
+import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.mockJwt;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.security.authentication.AnonymousAuthenticationToken;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.oauth2.core.oidc.StandardClaimNames;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+import com.baeldung.ReactiveResourceServerApplication.GreetingController;
+import com.baeldung.ReactiveResourceServerApplication.MessageService;
+
+import reactor.core.publisher.Mono;
+
+@WebFluxTest(controllers = GreetingController.class, properties = { "server.ssl.enabled=false" })
+class SpringSecurityTestGreetingControllerUnitTest {
+    private static final AnonymousAuthenticationToken ANONYMOUS_AUTHENTICATION = new AnonymousAuthenticationToken("anonymous", "anonymousUser", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"));
+
+    @MockBean
+    MessageService messageService;
+
+    @Autowired
+    WebTestClient api;
+
+    /*-----------------------------------------------------------------------------*/
+    /* /greet                                                                      */
+    /* This end-point secured with ".anyRequest().authenticated()" in SecurityConf */
+    /*-----------------------------------------------------------------------------*/
+
+    @Test
+    void givenRequestIsAnonymous_whenGetGreet_thenUnauthorized() throws Exception {
+        api.mutateWith(mockAuthentication(ANONYMOUS_AUTHENTICATION))
+            .get()
+            .uri("/greet")
+            .exchange()
+            .expectStatus()
+            .isUnauthorized();
+    }
+
+    @Test
+    void givenUserIsAuthenticated_whenGetGreet_thenOk() throws Exception {
+        final var greeting = "Whatever the service returns";
+        when(messageService.greet()).thenReturn(Mono.just(greeting));
+
+        api.mutateWith(mockJwt().authorities(List.of(new SimpleGrantedAuthority("admin"), new SimpleGrantedAuthority("ROLE_AUTHORIZED_PERSONNEL")))
+            .jwt(jwt -> jwt.claim(StandardClaimNames.PREFERRED_USERNAME, "ch4mpy")))
+            .get()
+            .uri("/greet")
+            .exchange()
+            .expectStatus()
+            .isOk()
+            .expectBody(String.class)
+            .isEqualTo(greeting);
+
+        verify(messageService, times(1)).greet();
+    }
+
+    /*---------------------------------------------------------------------------------------------------------------------*/
+    /* /secured-route                                                                                                      */
+    /* This end-point is secured with ".requestMatchers("/secured-route").hasRole("AUTHORIZED_PERSONNEL")" in SecurityConf */
+    /*---------------------------------------------------------------------------------------------------------------------*/
+
+    @Test
+    void givenRequestIsAnonymous_whenGetSecuredRoute_thenUnauthorized() throws Exception {
+        api.mutateWith(mockAuthentication(ANONYMOUS_AUTHENTICATION))
+            .get()
+            .uri("/secured-route")
+            .exchange()
+            .expectStatus()
+            .isUnauthorized();
+    }
+
+    @Test
+    void givenUserIsGrantedWithRoleAuthorizedPersonnel_whenGetSecuredRoute_thenOk() throws Exception {
+        final var secret = "Secret!";
+        when(messageService.getSecret()).thenReturn(Mono.just(secret));
+
+        api.mutateWith(mockJwt().authorities(new SimpleGrantedAuthority("ROLE_AUTHORIZED_PERSONNEL")))
+            .get()
+            .uri("/secured-route")
+            .exchange()
+            .expectStatus()
+            .isOk()
+            .expectBody(String.class)
+            .isEqualTo(secret);
+    }
+
+    @Test
+    void givenUserIsNotGrantedWithRoleAuthorizedPersonnel_whenGetSecuredRoute_thenForbidden() throws Exception {
+        api.mutateWith(mockJwt().authorities(new SimpleGrantedAuthority("admin")))
+            .get()
+            .uri("/secured-route")
+            .exchange()
+            .expectStatus()
+            .isForbidden();
+    }
+
+    /*---------------------------------------------------------------------------------------------------------*/
+    /* /secured-method                                                                                         */
+    /* This end-point is secured with "@PreAuthorize("hasRole('AUTHORIZED_PERSONNEL')")" on @Controller method */
+    /*---------------------------------------------------------------------------------------------------------*/
+
+    @Test
+    void givenRequestIsAnonymous_whenGetSecuredMethod_thenUnauthorized() throws Exception {
+        api.mutateWith(mockAuthentication(ANONYMOUS_AUTHENTICATION))
+            .get()
+            .uri("/secured-method")
+            .exchange()
+            .expectStatus()
+            .isUnauthorized();
+    }
+
+    @Test
+    void givenUserIsGrantedWithRoleAuthorizedPersonnel_whenGetSecuredMethod_thenOk() throws Exception {
+        final var secret = "Secret!";
+        when(messageService.getSecret()).thenReturn(Mono.just(secret));
+
+        api.mutateWith(mockJwt().authorities(new SimpleGrantedAuthority("ROLE_AUTHORIZED_PERSONNEL")))
+            .get()
+            .uri("/secured-method")
+            .exchange()
+            .expectStatus()
+            .isOk()
+            .expectBody(String.class)
+            .isEqualTo(secret);
+    }
+
+    @Test
+    void givenUserIsNotGrantedWithRoleAuthorizedPersonnel_whenGetSecuredMethod_thenForbidden() throws Exception {
+        api.mutateWith(mockJwt().authorities(new SimpleGrantedAuthority("admin")))
+            .get()
+            .uri("/secured-method")
+            .exchange()
+            .expectStatus()
+            .isForbidden();
+    }
+
+}
diff --git a/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/pom.xml b/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/pom.xml
new file mode 100644
index 0000000000..271cc7dc18
--- /dev/null
+++ b/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>spring-security-oauth2-testing</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <groupId>com.baeldung.spring-security-modules.testing</groupId>
+    <artifactId>servlet-resource-server</artifactId>
+    <name>servlet-resource-server</name>
+    <description>Demo project for Spring Boot servlet resource-server</description>
+    <properties>
+        <java.version>17</java.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.c4-soft.springaddons</groupId>
+            <artifactId>spring-addons-oauth2-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/src/main/java/com/baeldung/ServletResourceServerApplication.java b/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/src/main/java/com/baeldung/ServletResourceServerApplication.java
new file mode 100644
index 0000000000..a30c60eab0
--- /dev/null
+++ b/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/src/main/java/com/baeldung/ServletResourceServerApplication.java
@@ -0,0 +1,126 @@
+package com.baeldung;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.oauth2.core.oidc.StandardClaimNames;
+import org.springframework.security.oauth2.jwt.Jwt;
+import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import lombok.RequiredArgsConstructor;
+
+@SpringBootApplication
+public class ServletResourceServerApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ServletResourceServerApplication.class, args);
+    }
+
+    @Configuration
+    @EnableMethodSecurity
+    @EnableWebSecurity
+    static class SecurityConf {
+        @Bean
+        SecurityFilterChain filterChain(HttpSecurity http, Converter<Jwt, Collection<GrantedAuthority>> authoritiesConverter) throws Exception {
+            http.oauth2ResourceServer()
+                .jwt()
+                .jwtAuthenticationConverter(jwt -> new JwtAuthenticationToken(jwt, authoritiesConverter.convert(jwt)));
+            http.sessionManagement()
+                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
+                .and()
+                .csrf()
+                .disable();
+            http.exceptionHandling()
+                .authenticationEntryPoint((request, response, authException) -> {
+                    response.addHeader(HttpHeaders.WWW_AUTHENTICATE, "Basic realm=\"Restricted Content\"");
+                    response.sendError(HttpStatus.UNAUTHORIZED.value(), HttpStatus.UNAUTHORIZED.getReasonPhrase());
+                });
+
+            http.authorizeHttpRequests()
+                .requestMatchers("/secured-route")
+                .hasRole("AUTHORIZED_PERSONNEL")
+                .anyRequest()
+                .authenticated();
+
+            return http.build();
+        }
+
+        static interface AuthoritiesConverter extends Converter<Jwt, Collection<GrantedAuthority>> {
+        }
+
+        @Bean
+        AuthoritiesConverter realmRoles2AuthoritiesConverter() {
+            return (Jwt jwt) -> {
+                final var realmRoles = Optional.of(jwt.getClaimAsMap("realm_access"))
+                    .orElse(Map.of());
+                @SuppressWarnings("unchecked")
+                final var roles = (List<String>) realmRoles.getOrDefault("roles", List.of());
+                return roles.stream()
+                    .map(SimpleGrantedAuthority::new)
+                    .map(GrantedAuthority.class::cast)
+                    .toList();
+            };
+        }
+    }
+
+    @Service
+    public static class MessageService {
+
+        public String greet() {
+            final var who = (JwtAuthenticationToken) SecurityContextHolder.getContext()
+                .getAuthentication();
+            final var claims = who.getTokenAttributes();
+            return "Hello %s! You are granted with %s.".formatted(claims.getOrDefault(StandardClaimNames.PREFERRED_USERNAME, claims.get(StandardClaimNames.SUB)), who.getAuthorities());
+        }
+
+        @PreAuthorize("hasRole('AUTHORIZED_PERSONNEL')")
+        public String getSecret() {
+            return "Only authorized personnel can read that";
+        }
+    }
+
+    @RestController
+    @RequiredArgsConstructor
+    public static class GreetingController {
+        private final MessageService messageService;
+
+        @GetMapping("/greet")
+        public ResponseEntity<String> greet() {
+            return ResponseEntity.ok(messageService.greet());
+        }
+
+        @GetMapping("/secured-route")
+        public ResponseEntity<String> securedRoute() {
+            return ResponseEntity.ok(messageService.getSecret());
+        }
+
+        @GetMapping("/secured-method")
+        @PreAuthorize("hasRole('AUTHORIZED_PERSONNEL')")
+        public ResponseEntity<String> securedMethod() {
+            return ResponseEntity.ok(messageService.getSecret());
+        }
+    }
+
+}
diff --git a/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/src/main/resources/application.properties b/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/src/main/resources/application.properties
new file mode 100644
index 0000000000..998f6303aa
--- /dev/null
+++ b/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.security.oauth2.resourceserver.jwt.issuer-uri=https://localhost:8443/realms/master
diff --git a/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/src/test/java/com/baeldung/MessageServiceUnitTest.java b/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/src/test/java/com/baeldung/MessageServiceUnitTest.java
new file mode 100644
index 0000000000..3c608d226e
--- /dev/null
+++ b/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/src/test/java/com/baeldung/MessageServiceUnitTest.java
@@ -0,0 +1,79 @@
+package com.baeldung;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Import;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
+import org.springframework.security.test.context.support.WithAnonymousUser;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import com.baeldung.ServletResourceServerApplication.MessageService;
+import com.c4_soft.springaddons.security.oauth2.test.annotations.OpenIdClaims;
+import com.c4_soft.springaddons.security.oauth2.test.annotations.WithMockJwtAuth;
+
+@Import({ MessageService.class })
+@ExtendWith(SpringExtension.class)
+@EnableMethodSecurity
+class MessageServiceUnitTest {
+    @Autowired
+    MessageService messageService;
+
+    /*----------------------------------------------------------------------------*/
+    /* greet()                                                                    */
+    /* Expects a JwtAuthenticationToken to be retrieved from the security-context */
+    /*----------------------------------------------------------------------------*/
+
+    @Test
+    void givenSecurityContextIsNotSet_whenGreet_thenThrowsAuthenticationCredentialsNotFoundException() {
+        assertThrows(AuthenticationCredentialsNotFoundException.class, () -> messageService.getSecret());
+    }
+
+    @Test
+    @WithAnonymousUser
+    void givenUserIsAnonymous_whenGreet_thenThrowsAccessDeniedException() {
+        assertThrows(AccessDeniedException.class, () -> messageService.getSecret());
+    }
+
+    @Test
+    @WithMockJwtAuth(authorities = { "admin", "ROLE_AUTHORIZED_PERSONNEL" }, claims = @OpenIdClaims(preferredUsername = "ch4mpy"))
+    void givenSecurityContextIsPopulatedWithJwtAuthenticationToken_whenGreet_thenReturnGreetingWithPreferredUsernameAndAuthorities() {
+        assertEquals("Hello ch4mpy! You are granted with [admin, ROLE_AUTHORIZED_PERSONNEL].", messageService.greet());
+    }
+
+    @Test
+    @WithMockUser(authorities = { "admin", "ROLE_AUTHORIZED_PERSONNEL" }, username = "ch4mpy")
+    void givenSecurityContextIsPopulatedWithUsernamePasswordAuthenticationToken_whenGreet_thenThrowsClassCastException() {
+        assertThrows(ClassCastException.class, () -> messageService.greet());
+    }
+
+    /*--------------------------------------------------------------------*/
+    /* getSecret()                                                        */
+    /* is secured with "@PreAuthorize("hasRole('AUTHORIZED_PERSONNEL')")" */
+    /*--------------------------------------------------------------------*/
+
+    @Test
+    @WithAnonymousUser
+    void givenUserIsAnonymous_whenGetSecret_thenThrowsAccessDeniedException() {
+        assertThrows(AccessDeniedException.class, () -> messageService.getSecret());
+    }
+
+    @Test
+    @WithMockJwtAuth(authorities = { "admin", "ROLE_AUTHORIZED_PERSONNEL" }, claims = @OpenIdClaims(preferredUsername = "ch4mpy"))
+    void givenUserIsGrantedWithRoleAuthorizedPersonnel_whenGetSecret_thenReturnSecret() {
+        assertEquals("Only authorized personnel can read that", messageService.getSecret());
+    }
+
+    @Test
+    @WithMockJwtAuth(authorities = { "admin" }, claims = @OpenIdClaims(preferredUsername = "ch4mpy"))
+    void givenUserIsNotGrantedWithRoleAuthorizedPersonnel_whenGetSecret_thenThrowsAccessDeniedException() {
+        assertThrows(AccessDeniedException.class, () -> messageService.getSecret());
+    }
+
+}
diff --git a/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/src/test/java/com/baeldung/ServletResourceServerApplicationIntegrationTest.java b/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/src/test/java/com/baeldung/ServletResourceServerApplicationIntegrationTest.java
new file mode 100644
index 0000000000..5bb539741f
--- /dev/null
+++ b/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/src/test/java/com/baeldung/ServletResourceServerApplicationIntegrationTest.java
@@ -0,0 +1,98 @@
+package com.baeldung;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.security.test.context.support.WithAnonymousUser;
+import org.springframework.test.web.servlet.MockMvc;
+
+import com.c4_soft.springaddons.security.oauth2.test.annotations.OpenIdClaims;
+import com.c4_soft.springaddons.security.oauth2.test.annotations.WithMockJwtAuth;
+
+@SpringBootTest(webEnvironment = WebEnvironment.MOCK)
+@AutoConfigureMockMvc
+class ServletResourceServerApplicationIntegrationTest {
+    @Autowired
+    MockMvc api;
+
+    /*-----------------------------------------------------------------------------*/
+    /* /greet                                                                      */
+    /* This end-point secured with ".anyRequest().authenticated()" in SecurityConf */
+    /*-----------------------------------------------------------------------------*/
+
+    @Test
+    @WithAnonymousUser
+    void givenRequestIsAnonymous_whenGetGreet_thenUnauthorized() throws Exception {
+        api.perform(get("/greet"))
+            .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    @WithMockJwtAuth(authorities = { "admin", "ROLE_AUTHORIZED_PERSONNEL" }, claims = @OpenIdClaims(preferredUsername = "ch4mpy"))
+    void givenUserIsAuthenticated_whenGetGreet_thenOk() throws Exception {
+        api.perform(get("/greet"))
+            .andExpect(status().isOk())
+            .andExpect(content().string("Hello ch4mpy! You are granted with [admin, ROLE_AUTHORIZED_PERSONNEL]."));
+    }
+
+    /*---------------------------------------------------------------------------------------------------------------------*/
+    /* /secured-route                                                                                                      */
+    /* This end-point is secured with ".requestMatchers("/secured-route").hasRole("AUTHORIZED_PERSONNEL")" in SecurityConf */
+    /*---------------------------------------------------------------------------------------------------------------------*/
+
+    @Test
+    @WithAnonymousUser
+    void givenRequestIsAnonymous_whenGetSecuredRoute_thenUnauthorized() throws Exception {
+        api.perform(get("/secured-route"))
+            .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    @WithMockJwtAuth("ROLE_AUTHORIZED_PERSONNEL")
+    void givenUserIsGrantedWithRoleAuthorizedPersonnel_whenGetSecuredRoute_thenOk() throws Exception {
+        api.perform(get("/secured-route"))
+            .andExpect(status().isOk())
+            .andExpect(content().string("Only authorized personnel can read that"));
+    }
+
+    @Test
+    @WithMockJwtAuth("admin")
+    void givenUserIsNotGrantedWithRoleAuthorizedPersonnel_whenGetSecuredRoute_thenForbidden() throws Exception {
+        api.perform(get("/secured-route"))
+            .andExpect(status().isForbidden());
+    }
+
+    /*---------------------------------------------------------------------------------------------------------*/
+    /* /secured-method                                                                                         */
+    /* This end-point is secured with "@PreAuthorize("hasRole('AUTHORIZED_PERSONNEL')")" on @Controller method */
+    /*---------------------------------------------------------------------------------------------------------*/
+
+    @Test
+    @WithAnonymousUser
+    void givenRequestIsAnonymous_whenGetSecuredMethod_thenUnauthorized() throws Exception {
+        api.perform(get("/secured-method"))
+            .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    @WithMockJwtAuth("ROLE_AUTHORIZED_PERSONNEL")
+    void givenUserIsGrantedWithRoleAuthorizedPersonnel_whenGetSecuredMethod_thenOk() throws Exception {
+        api.perform(get("/secured-method"))
+            .andExpect(status().isOk())
+            .andExpect(content().string("Only authorized personnel can read that"));
+    }
+
+    @Test
+    @WithMockJwtAuth("admin")
+    void givenUserIsNotGrantedWithRoleAuthorizedPersonnel_whenGetSecuredMethod_thenForbidden() throws Exception {
+        api.perform(get("/secured-method"))
+            .andExpect(status().isForbidden());
+    }
+
+}
diff --git a/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/src/test/java/com/baeldung/SpringAddonsGreetingControllerUnitTest.java b/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/src/test/java/com/baeldung/SpringAddonsGreetingControllerUnitTest.java
new file mode 100644
index 0000000000..9162768930
--- /dev/null
+++ b/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/src/test/java/com/baeldung/SpringAddonsGreetingControllerUnitTest.java
@@ -0,0 +1,116 @@
+package com.baeldung;
+
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.security.test.context.support.WithAnonymousUser;
+import org.springframework.test.web.servlet.MockMvc;
+
+import com.baeldung.ServletResourceServerApplication.GreetingController;
+import com.baeldung.ServletResourceServerApplication.MessageService;
+import com.c4_soft.springaddons.security.oauth2.test.annotations.OpenIdClaims;
+import com.c4_soft.springaddons.security.oauth2.test.annotations.WithMockJwtAuth;
+
+@WebMvcTest(controllers = GreetingController.class, properties = { "server.ssl.enabled=false" })
+class SpringAddonsGreetingControllerUnitTest {
+
+    @MockBean
+    MessageService messageService;
+
+    @Autowired
+    MockMvc api;
+
+    /*-----------------------------------------------------------------------------*/
+    /* /greet                                                                      */
+    /* This end-point secured with ".anyRequest().authenticated()" in SecurityConf */
+    /*-----------------------------------------------------------------------------*/
+
+    @Test
+    @WithAnonymousUser
+    void givenRequestIsAnonymous_whenGetGreet_thenUnauthorized() throws Exception {
+        api.perform(get("/greet"))
+            .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    @WithMockJwtAuth(authorities = { "admin", "ROLE_AUTHORIZED_PERSONNEL" }, claims = @OpenIdClaims(preferredUsername = "ch4mpy"))
+    void givenUserIsAuthenticated_whenGetGreet_thenOk() throws Exception {
+        final var greeting = "Whatever the service returns";
+        when(messageService.greet()).thenReturn(greeting);
+
+        api.perform(get("/greet"))
+            .andExpect(status().isOk())
+            .andExpect(content().string(greeting));
+
+        verify(messageService, times(1)).greet();
+    }
+
+    /*---------------------------------------------------------------------------------------------------------------------*/
+    /* /secured-route                                                                                                      */
+    /* This end-point is secured with ".requestMatchers("/secured-route").hasRole("AUTHORIZED_PERSONNEL")" in SecurityConf */
+    /*---------------------------------------------------------------------------------------------------------------------*/
+
+    @Test
+    @WithAnonymousUser
+    void givenRequestIsAnonymous_whenGetSecuredRoute_thenUnauthorized() throws Exception {
+        api.perform(get("/secured-route"))
+            .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    @WithMockJwtAuth({ "admin", "ROLE_AUTHORIZED_PERSONNEL" })
+    void givenUserIsGrantedWithRoleAuthorizedPersonnel_whenGetSecuredRoute_thenOk() throws Exception {
+        final var secret = "Secret!";
+        when(messageService.getSecret()).thenReturn(secret);
+
+        api.perform(get("/secured-route"))
+            .andExpect(status().isOk())
+            .andExpect(content().string(secret));
+    }
+
+    @Test
+    @WithMockJwtAuth({ "admin" })
+    void givenUserIsNotGrantedWithRoleAuthorizedPersonnel_whenGetSecuredRoute_thenForbidden() throws Exception {
+        api.perform(get("/secured-route"))
+            .andExpect(status().isForbidden());
+    }
+
+    /*---------------------------------------------------------------------------------------------------------*/
+    /* /secured-method                                                                                         */
+    /* This end-point is secured with "@PreAuthorize("hasRole('AUTHORIZED_PERSONNEL')")" on @Controller method */
+    /*---------------------------------------------------------------------------------------------------------*/
+
+    @Test
+    @WithAnonymousUser
+    void givenRequestIsAnonymous_whenGetSecuredMethod_thenUnauthorized() throws Exception {
+        api.perform(get("/secured-method"))
+            .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    @WithMockJwtAuth({ "admin", "ROLE_AUTHORIZED_PERSONNEL" })
+    void givenUserIsGrantedWithRoleAuthorizedPersonnel_whenGetSecuredMethod_thenOk() throws Exception {
+        final var secret = "Secret!";
+        when(messageService.getSecret()).thenReturn(secret);
+
+        api.perform(get("/secured-method"))
+            .andExpect(status().isOk())
+            .andExpect(content().string(secret));
+    }
+
+    @Test
+    @WithMockJwtAuth(authorities = { "admin" })
+    void givenUserIsNotGrantedWithRoleAuthorizedPersonnel_whenGetSecuredMethod_thenForbidden() throws Exception {
+        api.perform(get("/secured-method"))
+            .andExpect(status().isForbidden());
+    }
+
+}
diff --git a/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/src/test/java/com/baeldung/SpringSecurityTestGreetingControllerUnitTest.java b/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/src/test/java/com/baeldung/SpringSecurityTestGreetingControllerUnitTest.java
new file mode 100644
index 0000000000..0e710bcc9f
--- /dev/null
+++ b/spring-security-modules/spring-security-oauth2-testing/servlet-resource-server/src/test/java/com/baeldung/SpringSecurityTestGreetingControllerUnitTest.java
@@ -0,0 +1,112 @@
+package com.baeldung;
+
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.anonymous;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.jwt;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.oauth2.core.oidc.StandardClaimNames;
+import org.springframework.test.web.servlet.MockMvc;
+
+import com.baeldung.ServletResourceServerApplication.GreetingController;
+import com.baeldung.ServletResourceServerApplication.MessageService;
+
+@WebMvcTest(controllers = GreetingController.class, properties = { "server.ssl.enabled=false" })
+class SpringSecurityTestGreetingControllerUnitTest {
+
+    @MockBean
+    MessageService messageService;
+
+    @Autowired
+    MockMvc api;
+
+    /*-----------------------------------------------------------------------------*/
+    /* /greet                                                                      */
+    /* This end-point secured with ".anyRequest().authenticated()" in SecurityConf */
+    /*-----------------------------------------------------------------------------*/
+
+    @Test
+    void givenRequestIsAnonymous_whenGetGreet_thenUnauthorized() throws Exception {
+        api.perform(get("/greet").with(anonymous()))
+            .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    void givenUserIsAuthenticated_whenGetGreet_thenOk() throws Exception {
+        final var greeting = "Whatever the service returns";
+        when(messageService.greet()).thenReturn(greeting);
+
+        api.perform(get("/greet").with(jwt().authorities(List.of(new SimpleGrantedAuthority("admin"), new SimpleGrantedAuthority("ROLE_AUTHORIZED_PERSONNEL")))
+            .jwt(jwt -> jwt.claim(StandardClaimNames.PREFERRED_USERNAME, "ch4mpy"))))
+            .andExpect(status().isOk())
+            .andExpect(content().string(greeting));
+
+        verify(messageService, times(1)).greet();
+    }
+
+    /*---------------------------------------------------------------------------------------------------------------------*/
+    /* /secured-route                                                                                                      */
+    /* This end-point is secured with ".requestMatchers("/secured-route").hasRole("AUTHORIZED_PERSONNEL")" in SecurityConf */
+    /*---------------------------------------------------------------------------------------------------------------------*/
+
+    @Test
+    void givenRequestIsAnonymous_whenGetSecuredRoute_thenUnauthorized() throws Exception {
+        api.perform(get("/secured-route").with(anonymous()))
+            .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    void givenUserIsGrantedWithRoleAuthorizedPersonnel_whenGetSecuredRoute_thenOk() throws Exception {
+        final var secret = "Secret!";
+        when(messageService.getSecret()).thenReturn(secret);
+
+        api.perform(get("/secured-route").with(jwt().authorities(new SimpleGrantedAuthority("ROLE_AUTHORIZED_PERSONNEL"))))
+            .andExpect(status().isOk())
+            .andExpect(content().string(secret));
+    }
+
+    @Test
+    void givenUserIsNotGrantedWithRoleAuthorizedPersonnel_whenGetSecuredRoute_thenForbidden() throws Exception {
+        api.perform(get("/secured-route").with(jwt().authorities(new SimpleGrantedAuthority("admin"))))
+            .andExpect(status().isForbidden());
+    }
+
+    /*---------------------------------------------------------------------------------------------------------*/
+    /* /secured-method                                                                                         */
+    /* This end-point is secured with "@PreAuthorize("hasRole('AUTHORIZED_PERSONNEL')")" on @Controller method */
+    /*---------------------------------------------------------------------------------------------------------*/
+
+    @Test
+    void givenRequestIsAnonymous_whenGetSecuredMethod_thenUnauthorized() throws Exception {
+        api.perform(get("/secured-method").with(anonymous()))
+            .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    void givenUserIsGrantedWithRoleAuthorizedPersonnel_whenGetSecuredMethod_thenOk() throws Exception {
+        final var secret = "Secret!";
+        when(messageService.getSecret()).thenReturn(secret);
+
+        api.perform(get("/secured-method").with(jwt().authorities(new SimpleGrantedAuthority("ROLE_AUTHORIZED_PERSONNEL"))))
+            .andExpect(status().isOk())
+            .andExpect(content().string(secret));
+    }
+
+    @Test
+    void givenUserIsNotGrantedWithRoleAuthorizedPersonnel_whenGetSecuredMethod_thenForbidden() throws Exception {
+        api.perform(get("/secured-method").with(jwt().authorities(new SimpleGrantedAuthority("admin"))))
+            .andExpect(status().isForbidden());
+    }
+
+}
diff --git a/spring-security-modules/spring-security-saml/README.md b/spring-security-modules/spring-security-saml/README.md
index 271b29632e..b6a11ed91b 100644
--- a/spring-security-modules/spring-security-saml/README.md
+++ b/spring-security-modules/spring-security-saml/README.md
@@ -1,3 +1,4 @@
 ### Relevant Articles:
 
 - [A Guide to SAML with Spring Security](https://www.baeldung.com/spring-security-saml)
+- [SAML with Spring Boot and Spring Security](https://www.baeldung.com/spring-security-saml)
diff --git a/spring-security-modules/spring-security-saml2/.mvn/wrapper/maven-wrapper.properties b/spring-security-modules/spring-security-saml2/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000000..b74bf7fcd6
--- /dev/null
+++ b/spring-security-modules/spring-security-saml2/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
diff --git a/spring-security-modules/spring-security-saml2/mvnw b/spring-security-modules/spring-security-saml2/mvnw
new file mode 100644
index 0000000000..8a8fb2282d
--- /dev/null
+++ b/spring-security-modules/spring-security-saml2/mvnw
@@ -0,0 +1,316 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /usr/local/etc/mavenrc ] ; then
+    . /usr/local/etc/mavenrc
+  fi
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`\\unset -f command; \\command -v java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/spring-security-modules/spring-security-saml2/mvnw.cmd b/spring-security-modules/spring-security-saml2/mvnw.cmd
new file mode 100644
index 0000000000..1d8ab018ea
--- /dev/null
+++ b/spring-security-modules/spring-security-saml2/mvnw.cmd
@@ -0,0 +1,188 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% ^
+  %JVM_CONFIG_MAVEN_PROPS% ^
+  %MAVEN_OPTS% ^
+  %MAVEN_DEBUG_OPTS% ^
+  -classpath %WRAPPER_JAR% ^
+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
+
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+
+cmd /C exit /B %ERROR_CODE%
diff --git a/spring-security-modules/spring-security-saml2/pom.xml b/spring-security-modules/spring-security-saml2/pom.xml
new file mode 100644
index 0000000000..43a6099022
--- /dev/null
+++ b/spring-security-modules/spring-security-saml2/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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>spring-security-saml2</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>spring-security-saml2</name>
+    
+    <repositories>
+        <repository>
+            <id>shib-build-releases</id>
+            <name>Shibboleth Build Releases Repository</name>
+            <url>https://build.shibboleth.net/nexus/content/repositories/releases/</url>
+        </repository>
+    </repositories>
+    
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-3</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-3</relativePath>
+    </parent>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf.extras</groupId>
+            <artifactId>thymeleaf-extras-springsecurity6</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opensaml</groupId>
+            <artifactId>opensaml-core</artifactId>
+            <version>${opensaml.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opensaml</groupId>
+            <artifactId>opensaml-saml-impl</artifactId>
+            <version>${opensaml.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opensaml</groupId>
+            <artifactId>opensaml-saml-api</artifactId>
+            <version>${opensaml.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-saml2-service-provider</artifactId>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <properties>
+        <java.version>17</java.version>
+        <opensaml.version>4.1.1</opensaml.version>
+    </properties>
+
+</project>
diff --git a/spring-security-modules/spring-security-saml2/src/main/java/com/baeldung/saml/Application.java b/spring-security-modules/spring-security-saml2/src/main/java/com/baeldung/saml/Application.java
new file mode 100644
index 0000000000..30447f93fc
--- /dev/null
+++ b/spring-security-modules/spring-security-saml2/src/main/java/com/baeldung/saml/Application.java
@@ -0,0 +1,12 @@
+package com.baeldung.saml;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+}
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-saml2/src/main/java/com/baeldung/saml/MainController.java b/spring-security-modules/spring-security-saml2/src/main/java/com/baeldung/saml/MainController.java
new file mode 100644
index 0000000000..21bc424930
--- /dev/null
+++ b/spring-security-modules/spring-security-saml2/src/main/java/com/baeldung/saml/MainController.java
@@ -0,0 +1,19 @@
+package com.baeldung.saml;
+
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticatedPrincipal;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class MainController {
+
+    @GetMapping("/")
+    public String index(Model model, @AuthenticationPrincipal Saml2AuthenticatedPrincipal principal) {
+        String emailAddress = principal.getFirstAttribute("email");
+        model.addAttribute("emailAddress", emailAddress);
+        model.addAttribute("userAttributes", principal.getAttributes());
+        return "index";
+    }
+}
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-saml2/src/main/java/com/baeldung/saml/SecurityConfig.java b/spring-security-modules/spring-security-saml2/src/main/java/com/baeldung/saml/SecurityConfig.java
new file mode 100644
index 0000000000..9078953d02
--- /dev/null
+++ b/spring-security-modules/spring-security-saml2/src/main/java/com/baeldung/saml/SecurityConfig.java
@@ -0,0 +1,38 @@
+package com.baeldung.saml;
+
+import static org.springframework.security.config.Customizer.withDefaults;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.saml2.provider.service.metadata.OpenSamlMetadataResolver;
+import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
+import org.springframework.security.saml2.provider.service.web.DefaultRelyingPartyRegistrationResolver;
+import org.springframework.security.saml2.provider.service.web.Saml2MetadataFilter;
+import org.springframework.security.saml2.provider.service.web.authentication.Saml2WebSsoAuthenticationFilter;
+import org.springframework.security.web.DefaultSecurityFilterChain;
+import org.springframework.security.web.SecurityFilterChain;
+
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig {
+    
+    @Autowired
+    private RelyingPartyRegistrationRepository relyingPartyRegistrationRepository;
+
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+        DefaultRelyingPartyRegistrationResolver relyingPartyRegistrationResolver = new DefaultRelyingPartyRegistrationResolver(this.relyingPartyRegistrationRepository);
+        Saml2MetadataFilter filter = new Saml2MetadataFilter(relyingPartyRegistrationResolver, new OpenSamlMetadataResolver());        
+        
+        http.authorizeHttpRequests(authorize -> authorize.anyRequest()
+          .authenticated())
+          .saml2Login(withDefaults())
+          .saml2Logout(withDefaults())
+          .addFilterBefore(filter, Saml2WebSsoAuthenticationFilter.class);
+        DefaultSecurityFilterChain chain = http.build();
+        return chain;
+    }
+}
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-saml2/src/main/resources/application.yml b/spring-security-modules/spring-security-saml2/src/main/resources/application.yml
new file mode 100644
index 0000000000..75b9612b47
--- /dev/null
+++ b/spring-security-modules/spring-security-saml2/src/main/resources/application.yml
@@ -0,0 +1,16 @@
+spring:
+  security:
+    saml2:
+      relyingparty:
+        registration:
+          okta:
+            signing:
+              credentials:
+                - private-key-location: classpath:local.key
+                  certificate-location: classpath:local.crt
+            singlelogout:
+              url: https://dev-56617222.okta.com/app/dev-56617222_springbootsaml_1/exk8b5jr6vYQqVXp45d7/slo/saml
+              binding: POST
+              response-url: "{baseUrl}/logout/saml2/slo"
+            assertingparty:
+              metadata-uri: "classpath:metadata/metadata-idp-okta.xml"
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-saml2/src/main/resources/local.crt b/spring-security-modules/spring-security-saml2/src/main/resources/local.crt
new file mode 100644
index 0000000000..5c2d2ef6e1
--- /dev/null
+++ b/spring-security-modules/spring-security-saml2/src/main/resources/local.crt
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID0zCCArugAwIBAgIUZUPwSIv1Qo6ipHBb7dPLIB0p2wEwDQYJKoZIhvcNAQEL
+BQAweTELMAkGA1UEBhMCUEsxEzARBgNVBAgMClNvbWUtU3RhdGUxGDAWBgNVBAoM
+D3NraWxsc3VpdGVzLmNvbTEYMBYGA1UEAwwPc2tpbGxzdWl0ZXMuY29tMSEwHwYJ
+KoZIhvcNAQkBFhJtdWFzaWY4MEBnbWFpbC5jb20wHhcNMjMwMjEyMTkwODAwWhcN
+MjQwMjEyMTkwODAwWjB5MQswCQYDVQQGEwJQSzETMBEGA1UECAwKU29tZS1TdGF0
+ZTEYMBYGA1UECgwPc2tpbGxzdWl0ZXMuY29tMRgwFgYDVQQDDA9za2lsbHN1aXRl
+cy5jb20xITAfBgkqhkiG9w0BCQEWEm11YXNpZjgwQGdtYWlsLmNvbTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBANuEo5Dmc4BSY4kKQhVd1jYwuwDxQQaH
+0Jeb2dgb+tnPNLhUMygQczTst/JiMjySHIHrgSvFe6BUCOqBb+lXZJlvFGQucVMA
+JgRhsT59oRGuZUvicyTt7esEehp1Rqx77FDeAN+ZRf5lk8iCM3QfDvtrJOh+QEl4
+MKLgJLw5Wrj3JYh8NsUwAkiAvlGNURXwM4Azogy8Ix6WUK8UaarErJB/S3/zhzPJ
+Dafp8UNgckS5IeYPsuWWyV//ri4FtAYKW2R11WarLJkuYRiLQeFQ95EuyXd6NQ1+
+cx1y8/8B6MCibXup//gsr71H40FCgAx+09iRmilEM9my6B0zP7EnwjMCAwEAAaNT
+MFEwHQYDVR0OBBYEFIlHP6JdPAzZorbbNFcFdM16vj2oMB8GA1UdIwQYMBaAFIlH
+P6JdPAzZorbbNFcFdM16vj2oMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+BQADggEBAB7Zm1n6498V9EP9pCgcyPjtGXcqBrU7JTgieKMgMm3vwGJPoR5s4kbM
+fppQGlqq140ErU78Tly14jGk2bbFjQngy9cY/colxwe7HeqKbyQ1HXfttaPHuZfH
+2TgJC7EeJ20yHCCOibA+DgCwt4yZurS3le4ilNhOkoUBdxVQkaH8rueb8gbtZfKs
+6ArGha90GT2ZwXjA32BERACa68IRpl+vokb2bEPeiVKa+rvPPt++yMcWRkXeOl2w
+SoHNhxPlZkg3F5pQ5qQOQ6N+6X+DQj9p4FRr2m05CpCODsqqHju2XQN6LvZS35Xu
+rvMRkpysY2cYLaJ6vZGVcfueMwAmoJU=
+-----END CERTIFICATE-----
diff --git a/spring-security-modules/spring-security-saml2/src/main/resources/local.key b/spring-security-modules/spring-security-saml2/src/main/resources/local.key
new file mode 100644
index 0000000000..c19f503b95
--- /dev/null
+++ b/spring-security-modules/spring-security-saml2/src/main/resources/local.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDbhKOQ5nOAUmOJ
+CkIVXdY2MLsA8UEGh9CXm9nYG/rZzzS4VDMoEHM07LfyYjI8khyB64ErxXugVAjq
+gW/pV2SZbxRkLnFTACYEYbE+faERrmVL4nMk7e3rBHoadUase+xQ3gDfmUX+ZZPI
+gjN0Hw77ayTofkBJeDCi4CS8OVq49yWIfDbFMAJIgL5RjVEV8DOAM6IMvCMellCv
+FGmqxKyQf0t/84czyQ2n6fFDYHJEuSHmD7Lllslf/64uBbQGCltkddVmqyyZLmEY
+i0HhUPeRLsl3ejUNfnMdcvP/AejAom17qf/4LK+9R+NBQoAMftPYkZopRDPZsugd
+Mz+xJ8IzAgMBAAECggEAfMv5WUVKYKd2ItCMJS2FvKUTi0OcniPUOHzH6g5uHCmq
+ZSipNJu1g18YbFnbCYhfYJUMiF/rGojr0LXpc5TVgk0eIJ4umus4scEATPCLA0xM
+FkoU/+esHLIc4LHPjfudq5Oql3PB0RDaZWFv8xI9KD4Pa4Vq8tm7fL1E5SUOKJx7
+M3Xjf6LuBqGI4x27tXWgQqDwaAdSY9ycbM0W04A/UKqOqpKtNZ6MxGGL7i5Cxo8H
+8A/5YXmgdaDzrYKIdy6sL1cVu6wT4P7m2Wvyg+aIWJ7P3Wx1rCW2Dja1Pz5WFhWM
+CmKSvvGqFIa++BCyiS5CmDavpzBTvsvnGAKwq03jcQKBgQD0oVvWFujhxEo5k4Nh
+WvBZpGU0CSyeorLd6asxqxNxnq+sahKow7xFQNmXIrklKvPtEv/P+aqBARG/+jEQ
+SeP4lX3xbuICWJS2rKfuOc5FmZTEDdTBOG4tYrzCDz/kz5uEvWRebwBi1KXBBCfV
+yozPEhGC+vdRsrzszlGJmcbkVwKBgQDluH4JYYoboJfeyg8OehYyjD7foFFReqwb
+dVp2XqfvXvb4KsxagycqMrfoBAcQDZGaBuJAxQMtZn3XdM0qApjxmgZ9qspkI9w/
+MLWbhq/5MqgoiSCEt5BOKt5obInJpR5drK2RXWNfEwkXptnsHDRPyjAq++UOWj+c
+tW0UARlHhQKBgQDuwFT7G5zqS0MN8nR1HeYZ9yJ2qMWNhckAYEAe15LAf1mA8n2H
+jJFBHcu/f7onFka/CJ32gvrvsPV74ljkRtliEbS7X7bhB0cNCnFTRcOVlhDlT4Jn
+mgWd8hG7bFq1nBFyec1thPRhgJzNRpsCQw8uQboplXqvl7xfefWGUDkXPQKBgQDH
+Ue0J9rf+gLlFdczaotPfyBBFuLTWHbp3mLuFOVw9NgjUC06Euoeg9aDcj6IRK7TK
+EG8AA/Fd0zAdYhsh+F78QsifATHa8cKIkZsB9zt43ZtKkLDGdv+e01NnB8YGUF6o
+qMtw9bbjJ4EcJImxdEdvc9+XbDiy21uWfVTHpqxogQKBgQCtMpVN0ViPL3Q6FB/x
+VR0E2Ct1i7GSfMEVt+T2dgk6uAXBeS9bW9/rmJ5VfwmsEMvngOEBUkUL8Zy+a3SW
+D+9u5144cQ9NYyC23fT3VEW5w0Bd6GTH26GmIO7UZOCQ6n/c+lXtTez1RrKeF8uy
+oYdCjFgW8kaAdHfHduYf5PdlbQ==
+-----END PRIVATE KEY-----
diff --git a/spring-security-modules/spring-security-saml2/src/main/resources/metadata/metadata-idp-okta.xml b/spring-security-modules/spring-security-saml2/src/main/resources/metadata/metadata-idp-okta.xml
new file mode 100644
index 0000000000..83976805c4
--- /dev/null
+++ b/spring-security-modules/spring-security-saml2/src/main/resources/metadata/metadata-idp-okta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><md:EntityDescriptor entityID="http://www.okta.com/exk8fja0pn7zO0b165d7" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><md:KeyDescriptor use="signing"><ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:X509Data><ds:X509Certificate>MIIDqDCCApCgAwIBAgIGAYZ6plFwMA0GCSqGSIb3DQEBCwUAMIGUMQswCQYDVQQGEwJVUzETMBEG
+A1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwET2t0YTEU
+MBIGA1UECwwLU1NPUHJvdmlkZXIxFTATBgNVBAMMDGRldi01NjYxNzIyMjEcMBoGCSqGSIb3DQEJ
+ARYNaW5mb0Bva3RhLmNvbTAeFw0yMzAyMjIxOTQxNDVaFw0zMzAyMjIxOTQyNDVaMIGUMQswCQYD
+VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsG
+A1UECgwET2t0YTEUMBIGA1UECwwLU1NPUHJvdmlkZXIxFTATBgNVBAMMDGRldi01NjYxNzIyMjEc
+MBoGCSqGSIb3DQEJARYNaW5mb0Bva3RhLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMCoER+Qlx6xBBUAcIxRk5ItmfldF+Rc+z+FCY/Ow7+cNBOIenRGfQLirQMwKzvZAg2o52xm
+OrtqsHX3NLEnSQDyQp/sE7MueHQCGcDnCAQEeOVbDSPW7bDOeK/qNyecTPKZreL70TQLPpeA9x7l
+WA59zxOX9or9BLuQJrXKOU/cZ4BXzue351R2qmuj7IqbXmsbetKegVFShYJZ9e9ta42OK1T8oDez
+dKZbPj5el1kj2jJ08GzO3TDg9j5B21x3sz2bxg6vFMP7e10hgLicxKVw1P5ZG995wUA+E8YbFehi
+YXRlcJiiKhmjRvHFl1F5vM4DPLaL4b8BJ1E21Byhb2cCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
+FMy00eWU4klEdV2PhoOPZE8Phj6tVDtEjr+ol7L7RJh6u2WPwLm6U9vE9wQ0/OYhOjThUsZqxqjL
+SqhZeMiFwohL6K5cmW2wTkxgfICyPY9g3BVDtogsZgbI0clIG5slwgiy9Kn7wQpSHWDvpEZXwmyV
+KodcWIpgBf0dUdBhsx+o34eG7ajsLb9HEisF0ntxlKdG2LJqlkJBtiUgI2Wo2jNshfzA7Cp9cNio
++j3f1dwyWmmwWkyxGkEw8UwuwKMDHfuAwyBmZJmmG9zkHMlHkgQxxq3iI8Bs9E3lKYXtwLE7K+xe
+rTdWegAfIP7LXC3JKN1N/Meke5FJLXmWAMXKIw==</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev-56617222.okta.com/app/dev-56617222_baeldungspringsecuritysaml2app_1/exk8fja0pn7zO0b165d7/slo/saml"/><md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev-56617222.okta.com/app/dev-56617222_baeldungspringsecuritysaml2app_1/exk8fja0pn7zO0b165d7/slo/saml"/><md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat><md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat><md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev-56617222.okta.com/app/dev-56617222_baeldungspringsecuritysaml2app_1/exk8fja0pn7zO0b165d7/sso/saml"/><md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev-56617222.okta.com/app/dev-56617222_baeldungspringsecuritysaml2app_1/exk8fja0pn7zO0b165d7/sso/saml"/></md:IDPSSODescriptor></md:EntityDescriptor>
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-saml2/src/main/resources/templates/index.html b/spring-security-modules/spring-security-saml2/src/main/resources/templates/index.html
new file mode 100644
index 0000000000..7c02dd47d4
--- /dev/null
+++ b/spring-security-modules/spring-security-saml2/src/main/resources/templates/index.html
@@ -0,0 +1,51 @@
+<!doctype html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="https://www.thymeleaf.org"
+    xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
+
+<head>
+    <title>Baeldung Example for Spring Security - SAML 2.0 Login/Logout</title>
+    <meta charset="utf-8" />
+    <style>
+        span,
+        dt {
+            font-weight: bold;
+        }
+    </style>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
+        integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+</head>
+
+<body>
+    <div class="container">
+        <ul class="nav">
+            <li class="nav-item">
+                <form th:action="@{/logout}" method="post">
+                    <button class="btn btn-primary" id="rp_logout_button" type="submit">
+                        Logout
+                    </button>
+                </form>
+            </li>
+        </ul>
+    </div>
+    <main role="main" class="container">
+        <h1 class="mt-5">Baeldung Example for SAML 2.0 Login/Logout with Spring Security</h1>
+        <p class="lead">You are successfully logged in as <span sec:authentication="name"></span></p>
+        <h2 class="mt-2">User Identity Attributes</h2>
+        <table class='table table-striped'>
+            <thead>
+                <tr>
+                    <th>Attribute</th>
+                    <th>Value</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr th:each="userAttribute : ${userAttributes}">
+                    <th th:text="${userAttribute.key}"></th>
+                    <td th:text="${userAttribute.value}"></td>
+                </tr>
+            </tbody>
+        </table>
+    </main>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-web-boot-2/README.md b/spring-security-modules/spring-security-web-boot-2/README.md
index f5fc3a890d..c768ba924b 100644
--- a/spring-security-modules/spring-security-web-boot-2/README.md
+++ b/spring-security-modules/spring-security-web-boot-2/README.md
@@ -14,4 +14,5 @@ The "REST With Spring" Classes: http://github.learnspringsecurity.com
 - [Spring Security: Exploring JDBC Authentication](https://www.baeldung.com/spring-security-jdbc-authentication)
 - [Spring Security Custom Logout Handler](https://www.baeldung.com/spring-security-custom-logout-handler)
 - [Redirecting Logged-in Users with Spring Security](https://www.baeldung.com/spring-security-redirect-logged-in)
-- More articles: [[<-- prev]](/spring-security-modules/spring-security-web-boot-1)
+
+More articles: [[<-- prev]](/spring-security-modules/spring-security-web-boot-1) [[next -->]](/spring-security-modules/spring-security-web-boot-3)
diff --git a/spring-security-modules/spring-security-web-boot-3/README.md b/spring-security-modules/spring-security-web-boot-3/README.md
index 400039dbfe..830abd2c99 100644
--- a/spring-security-modules/spring-security-web-boot-3/README.md
+++ b/spring-security-modules/spring-security-web-boot-3/README.md
@@ -14,4 +14,5 @@ The "REST With Spring" Classes: http://github.learnspringsecurity.com
 - [Content Security Policy with Spring Security](https://www.baeldung.com/spring-security-csp)
 - [Enable Logging for Spring Security](https://www.baeldung.com/spring-security-enable-logging)
 - [Authentication With Spring Security and MongoDB](https://www.baeldung.com/spring-security-authentication-mongodb)
-- More articles: [[<-- prev]](/spring-security-modules/spring-security-web-boot-2)
+
+More articles: [[<-- prev]](/spring-security-modules/spring-security-web-boot-2) [[next -->]](/spring-security-modules/spring-security-web-boot-4)
diff --git a/spring-security-modules/spring-security-web-boot-4/README.md b/spring-security-modules/spring-security-web-boot-4/README.md
index 26b19e7b33..af8ed4e76a 100644
--- a/spring-security-modules/spring-security-web-boot-4/README.md
+++ b/spring-security-modules/spring-security-web-boot-4/README.md
@@ -8,5 +8,6 @@ The "REST With Spring" Classes: http://github.learnspringsecurity.com
 ### Relevant Articles:
 
 - [Spring Security: Upgrading the Deprecated WebSecurityConfigurerAdapter](https://www.baeldung.com/spring-deprecated-websecurityconfigureradapter)
-- More articles: [[<-- prev]](/spring-security-modules/spring-security-web-boot-3)
 - [Spring @EnableMethodSecurity Annotation](https://www.baeldung.com/spring-enablemethodsecurity)
+
+More articles: [[<-- prev]](/spring-security-modules/spring-security-web-boot-3)
diff --git a/spring-security-modules/spring-security-web-boot-4/src/main/java/com/baeldung/securityfilterchain/configuration/SecurityConfig.java b/spring-security-modules/spring-security-web-boot-4/src/main/java/com/baeldung/securityfilterchain/configuration/SecurityConfig.java
index 4d3bec2ad2..5a8f4c1c02 100644
--- a/spring-security-modules/spring-security-web-boot-4/src/main/java/com/baeldung/securityfilterchain/configuration/SecurityConfig.java
+++ b/spring-security-modules/spring-security-web-boot-4/src/main/java/com/baeldung/securityfilterchain/configuration/SecurityConfig.java
@@ -29,7 +29,7 @@ public class SecurityConfig {
           .antMatchers("/user/**")
           .hasAnyRole("USER", "ADMIN")
           .antMatchers("/login/**")
-          .anonymous()
+          .permitAll()
           .anyRequest()
           .authenticated()
           .and()
diff --git a/spring-swagger-codegen/spring-openapi-generator-api-client/src/main/java/com/baeldung/petstore/client/invoker/auth/HttpBasicAuth.java b/spring-swagger-codegen/spring-openapi-generator-api-client/src/main/java/com/baeldung/petstore/client/invoker/auth/HttpBasicAuth.java
index 4c1dad6e7c..fea7b0532b 100644
--- a/spring-swagger-codegen/spring-openapi-generator-api-client/src/main/java/com/baeldung/petstore/client/invoker/auth/HttpBasicAuth.java
+++ b/spring-swagger-codegen/spring-openapi-generator-api-client/src/main/java/com/baeldung/petstore/client/invoker/auth/HttpBasicAuth.java
@@ -1,9 +1,9 @@
 package com.baeldung.petstore.client.invoker.auth;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 
 import org.springframework.http.HttpHeaders;
-import org.springframework.util.Base64Utils;
 import org.springframework.util.MultiValueMap;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2020-03-15T06:14:01.568992-05:00[America/Chicago]")
@@ -33,6 +33,7 @@ public class HttpBasicAuth implements Authentication {
             return;
         }
         String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
-        headerParams.add(HttpHeaders.AUTHORIZATION, "Basic " + Base64Utils.encodeToString(str.getBytes(StandardCharsets.UTF_8)));
+        headerParams.add(HttpHeaders.AUTHORIZATION, "Basic " + Base64.getEncoder()
+            .encodeToString(str.getBytes(StandardCharsets.UTF_8)));
     }
 }
diff --git a/spring-swagger-codegen/spring-swagger-codegen-api-client/src/main/java/com/baeldung/petstore/client/invoker/auth/HttpBasicAuth.java b/spring-swagger-codegen/spring-swagger-codegen-api-client/src/main/java/com/baeldung/petstore/client/invoker/auth/HttpBasicAuth.java
index 16c88a4bc6..23c1dbc4c2 100644
--- a/spring-swagger-codegen/spring-swagger-codegen-api-client/src/main/java/com/baeldung/petstore/client/invoker/auth/HttpBasicAuth.java
+++ b/spring-swagger-codegen/spring-swagger-codegen-api-client/src/main/java/com/baeldung/petstore/client/invoker/auth/HttpBasicAuth.java
@@ -1,10 +1,9 @@
 package com.baeldung.petstore.client.invoker.auth;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 
 import org.springframework.http.HttpHeaders;
-import org.springframework.util.Base64Utils;
 import org.springframework.util.MultiValueMap;
 
 @javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2017-08-29T12:04:37.072+02:00")
@@ -34,6 +33,7 @@ public class HttpBasicAuth implements Authentication {
             return;
         }
         String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
-        headerParams.add(HttpHeaders.AUTHORIZATION, "Basic " + Base64Utils.encodeToString(str.getBytes(StandardCharsets.UTF_8)));
+        headerParams.add(HttpHeaders.AUTHORIZATION, "Basic " + Base64.getEncoder()
+            .encodeToString(str.getBytes(StandardCharsets.UTF_8)));
     }
 }
diff --git a/spring-vault/pom.xml b/spring-vault/pom.xml
index faf4b33e08..7b89db2302 100644
--- a/spring-vault/pom.xml
+++ b/spring-vault/pom.xml
@@ -54,7 +54,8 @@
     </dependencies>
 
     <properties>
-        <spring.vault.core.version>2.3.2</spring.vault.core.version>
+        <spring.vault.core.version>3.0.2</spring.vault.core.version>
+        <java.version>17</java.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java b/spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java
index 75bdd382cb..d9718252cb 100644
--- a/spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java
+++ b/spring-vault/src/main/java/com/baeldung/springvault/CredentialsService.java
@@ -5,54 +5,54 @@ import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.vault.core.VaultKeyValueOperations;
+import org.springframework.vault.core.VaultKeyValueOperationsSupport;
 import org.springframework.vault.core.VaultTemplate;
 import org.springframework.vault.support.VaultResponseSupport;
 
 /**
  * Sample service to demonstrate storing and retrieval of secrets.
- * 
+ *
  * NOTE: We need to configure Vault and provide the Vault uri in the properties file.
  *
  */
 @Service
 public class CredentialsService {
+    private final VaultTemplate vaultTemplate;
+    private final VaultKeyValueOperations vaultKeyValueOperations;
+    private final CredentialsRepository credentialsRepository;
 
     @Autowired
-    private VaultTemplate vaultTemplate;
-
-    @Autowired
-    private CredentialsRepository credentialsRepository;
+    public CredentialsService(VaultTemplate vaultTemplate, CredentialsRepository credentialsRepository) {
+        this.vaultTemplate = vaultTemplate;
+        this.credentialsRepository = credentialsRepository;
+        this.vaultKeyValueOperations = vaultTemplate.opsForKeyValue("credentials/myapp", VaultKeyValueOperationsSupport.KeyValueBackend.KV_2);
+    }
 
     /**
-    *  To Secure Credentials
-    * @param credentials
-    * @return VaultResponse
-    * @throws URISyntaxException
-    */
-    public void secureCredentials(Credentials credentials) throws URISyntaxException {
-
-        vaultTemplate.write("credentials/myapp", credentials);
+     *  To Secure Credentials
+     * @param credentials
+     * @return VaultResponse
+     * @throws URISyntaxException
+     */
+    public void secureCredentials(Credentials credentials) {
+        vaultKeyValueOperations.put(credentials.getUsername(), credentials);
     }
 
     /**
      * To Retrieve Credentials
      * @return Credentials
-     * @throws URISyntaxException
      */
-    public Credentials accessCredentials() throws URISyntaxException {
-
-        VaultResponseSupport<Credentials> response = vaultTemplate.read("credentials/myapp", Credentials.class);
+    public Credentials accessCredentials(String username) {
+        VaultResponseSupport<Credentials> response = vaultKeyValueOperations.get(username, Credentials.class);
         return response.getData();
     }
 
     public Credentials saveCredentials(Credentials credentials) {
-
         return credentialsRepository.save(credentials);
     }
 
     public Optional<Credentials> findById(String username) {
-
         return credentialsRepository.findById(username);
     }
-
 }
diff --git a/spring-vault/src/main/java/com/baeldung/springvault/VaultEnvironmentConfig.java b/spring-vault/src/main/java/com/baeldung/springvault/VaultEnvironmentConfig.java
index 4f5777e94c..91c1062131 100644
--- a/spring-vault/src/main/java/com/baeldung/springvault/VaultEnvironmentConfig.java
+++ b/spring-vault/src/main/java/com/baeldung/springvault/VaultEnvironmentConfig.java
@@ -3,10 +3,6 @@ package com.baeldung.springvault;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
-import org.springframework.vault.authentication.ClientAuthentication;
-import org.springframework.vault.authentication.TokenAuthentication;
-import org.springframework.vault.client.VaultEndpoint;
-import org.springframework.vault.config.AbstractVaultConfiguration;
 import org.springframework.vault.config.EnvironmentVaultConfiguration;
 
 /**
diff --git a/spring-vault/src/test/java/com/baeldung/springvault/SpringContextLiveTest.java b/spring-vault/src/test/java/com/baeldung/springvault/SpringContextLiveTest.java
index 8139522745..4b7a4e2c1c 100644
--- a/spring-vault/src/test/java/com/baeldung/springvault/SpringContextLiveTest.java
+++ b/spring-vault/src/test/java/com/baeldung/springvault/SpringContextLiveTest.java
@@ -1,10 +1,10 @@
 package com.baeldung.springvault;
 
-import com.baeldung.springvault.SpringVaultApplication;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.vault.repository.configuration.EnableVaultRepositories;
 
 /**
  * This live test requires:
@@ -17,6 +17,7 @@ import org.springframework.test.context.junit4.SpringRunner;
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SpringVaultApplication.class)
+@EnableVaultRepositories
 public class SpringContextLiveTest {
 
     @Test
diff --git a/spring-vault/src/test/java/com/baeldung/springvault/VaultInitializer.java b/spring-vault/src/test/java/com/baeldung/springvault/VaultInitializer.java
index a823a4cd27..cf6b425581 100644
--- a/spring-vault/src/test/java/com/baeldung/springvault/VaultInitializer.java
+++ b/spring-vault/src/test/java/com/baeldung/springvault/VaultInitializer.java
@@ -7,11 +7,12 @@ import java.io.InputStreamReader;
 import java.util.Map;
 
 /**
- * 
+ *
  * This is a test class to initialize Vault.
  */
 public class VaultInitializer implements Closeable {
 
+    public static final String API_VERSION = "v1";
     private static final String UNSEAL_KEY = "Unseal Key:";
     private static final String ROOT_TOKEN = "Root Token:";
 
@@ -27,7 +28,7 @@ public class VaultInitializer implements Closeable {
         return unSealKey;
     }
 
-    public static final VaultInitializer initializeValut() {
+    public static final VaultInitializer initializeVault() {
         VaultInitializer vaultProcess = new VaultInitializer();
         vaultProcess.start();
         // Secrets is by default enabled.
@@ -37,8 +38,9 @@ public class VaultInitializer implements Closeable {
 
     @SuppressWarnings("unused")
     private void enableSecrets() {
-        System.out.println("Enabling Secrets at path credentials/myapp...");
-        ProcessBuilder pb = new ProcessBuilder("vault", "secrets", "enable", "-path=credentials/myapp", "kv");
+        System.out.println("Enabling Secrets at path secret/...");
+        ProcessBuilder pb = new ProcessBuilder("vault", "secrets", "enable", "-path=credentials/myapp/", String.format("kv-%s", API_VERSION)); ;
+
         Map<String, String> map = pb.environment();
         map.put("VAULT_ADDR", "http://127.0.0.1:8200");
         try {
@@ -106,8 +108,7 @@ public class VaultInitializer implements Closeable {
 
     @Override
     public void close() throws IOException {
-
-        System.out.println("stoping vault");
+        System.out.println("stopping vault");
         vaultProcess.destroy();
     }
 }
diff --git a/spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationManualTest.java b/spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationManualTest.java
new file mode 100644
index 0000000000..9913a7dc5c
--- /dev/null
+++ b/spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationManualTest.java
@@ -0,0 +1,103 @@
+package com.baeldung.springvault;
+
+import static com.baeldung.springvault.VaultInitializer.API_VERSION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.net.URISyntaxException;
+import java.util.Optional;
+
+import org.junit.Before;
+import org.junit.Assume;
+import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+import org.springframework.vault.core.VaultTemplate;
+import org.springframework.vault.repository.configuration.EnableVaultRepositories;
+
+/**
+ * These tests are requiring the {@code vault} command to be installed and available in the executing
+ * platform. So, if you intend to run them in your environment, the please install the vault and then
+ * run the ignored tests.
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = CredentialsService.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@ContextConfiguration(classes = VaultTestConfiguration.class, loader = AnnotationConfigContextLoader.class)
+@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
+@EnableVaultRepositories
+public class VaultIntegrationManualTest {
+    @Autowired
+    private CredentialsRepository credentialsRepository;
+
+    @Autowired
+    private VaultTemplate vaultTemplate;
+
+    private CredentialsService credentialsService;
+
+    @Before
+    public void setup() {
+        this.credentialsService = new CredentialsService(vaultTemplate, credentialsRepository);
+    }
+
+    /**
+     * Test to secure credentials.
+     *
+     * @throws URISyntaxException
+     */
+    @Test
+    public void givenCredentials_whenSecureCredentials_thenCredentialsSecuredSuccessfully() throws URISyntaxException {
+        // Given
+        Credentials credentials = new Credentials("username", "password");
+        // When
+        credentialsService.secureCredentials(credentials);
+        // Then
+        Credentials storedCredentials = credentialsService.accessCredentials(credentials.getUsername());
+        Assertions.assertNotNull(storedCredentials);
+        Assertions.assertEquals(credentials.getUsername(), storedCredentials.getUsername());
+        Assertions.assertEquals(credentials.getPassword(), storedCredentials.getPassword());
+    }
+
+    @Test
+    public void givenCredentials_whenSave_thenReturnCredentials() throws InterruptedException {
+        Assume.assumeTrue("v1".equals(API_VERSION));
+
+        credentialsService = new CredentialsService(vaultTemplate, credentialsRepository);
+        // Given
+        Credentials credentials = new Credentials("login", "password");
+
+        // When
+        Credentials savedCredentials = credentialsService.saveCredentials(credentials);
+
+        // Then
+        assertNotNull(savedCredentials);
+        assertEquals(credentials.getUsername(), savedCredentials.getUsername());
+        assertEquals(credentials.getPassword(), savedCredentials.getPassword());
+    }
+
+    @Test
+    public void givenId_whenFindById_thenReturnCredentials() {
+        // Given
+        Assume.assumeTrue("v1".equals(API_VERSION));
+        Credentials expectedCredentials = new Credentials("login", "p@ssw@rd");
+        credentialsService.saveCredentials(expectedCredentials);
+
+        // When
+        Optional<Credentials> retrievedCredentials = credentialsService.findById(expectedCredentials.getUsername());
+
+        // Then
+        assertNotNull(retrievedCredentials);
+        assertNotNull(retrievedCredentials.get());
+        assertEquals(expectedCredentials.getUsername(), retrievedCredentials.get()
+            .getUsername());
+        assertEquals(expectedCredentials.getPassword(), retrievedCredentials.get()
+            .getPassword());
+    }
+
+}
diff --git a/spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationTest.java b/spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationTest.java
deleted file mode 100644
index 7987ae9904..0000000000
--- a/spring-vault/src/test/java/com/baeldung/springvault/VaultIntegrationTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.baeldung.springvault;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import java.net.URISyntaxException;
-import java.util.Optional;
-
-import org.junit.FixMethodOrder;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
-import org.mockito.Mockito;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.annotation.DirtiesContext.ClassMode;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
-
-/**
- * These tests are requiring the {@code vault} command to be installed and available in the executing
- * platform. So, if you intend to run them in your environment, the please install the vault and then
- * run the ignored tests.
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = CredentialsService.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ContextConfiguration(classes = VaultTestConfiguration.class, loader = AnnotationConfigContextLoader.class)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
-public class VaultIntegrationTest {
-
-    @Autowired
-    private CredentialsService credentialsService;
-
-    @MockBean
-    private CredentialsRepository credentialsRepository;
-
-    /**
-     * Test to secure credentials.
-     *
-     * @throws URISyntaxException
-     */
-    @Test
-    @Ignore
-    public void givenCredentials_whenSecureCredentials_thenCredentialsSecured() throws URISyntaxException {
-        try {
-            // Given
-            Credentials credentials = new Credentials("username", "password");
-
-            // When
-            credentialsService.secureCredentials(credentials);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    /**
-     * Test to access credentials
-     *
-     * @throws URISyntaxException
-     */
-    @Test
-    @Ignore
-    public void whenAccessCredentials_thenCredentialsRetrieved() throws URISyntaxException {
-
-        // Given
-        Credentials credentials = credentialsService.accessCredentials();
-
-        // Then
-        assertNotNull(credentials);
-        assertEquals("username", credentials.getUsername());
-        assertEquals("password", credentials.getPassword());
-    }
-
-    @Test
-    @Ignore
-    public void givenCredentials_whenSave_thenReturnCredentials() {
-        // Given
-        Credentials credentials = new Credentials("login", "password");
-        Mockito.when(credentialsRepository.save(credentials))
-            .thenReturn(credentials);
-
-        // When
-        Credentials savedCredentials = credentialsService.saveCredentials(credentials);
-
-        // Then
-        assertNotNull(savedCredentials);
-        assertEquals(savedCredentials.getUsername(), credentials.getUsername());
-        assertEquals(savedCredentials.getPassword(), credentials.getPassword());
-    }
-
-    @Test
-    @Ignore
-    public void givenId_whenFindById_thenReturnCredentials() {
-        // Given
-        Credentials credentials = new Credentials("login", "p@ssw@rd");
-        Mockito.when(credentialsRepository.findById("login"))
-            .thenReturn(Optional.of(credentials));
-
-        // When
-        Optional<Credentials> returnedCredentials = credentialsService.findById("login");
-
-        // Then
-        assertNotNull(returnedCredentials);
-        assertNotNull(returnedCredentials.get());
-        assertEquals(returnedCredentials.get()
-            .getUsername(), credentials.getUsername());
-        assertEquals(returnedCredentials.get()
-            .getPassword(), credentials.getPassword());
-    }
-
-}
diff --git a/spring-vault/src/test/java/com/baeldung/springvault/VaultTestConfiguration.java b/spring-vault/src/test/java/com/baeldung/springvault/VaultTestConfiguration.java
index 42f0bfbce9..2e3651d646 100644
--- a/spring-vault/src/test/java/com/baeldung/springvault/VaultTestConfiguration.java
+++ b/spring-vault/src/test/java/com/baeldung/springvault/VaultTestConfiguration.java
@@ -5,6 +5,7 @@ import java.net.URISyntaxException;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.vault.annotation.VaultPropertySource;
 import org.springframework.vault.authentication.TokenAuthentication;
 import org.springframework.vault.client.VaultEndpoint;
 import org.springframework.vault.core.VaultTemplate;
@@ -14,7 +15,7 @@ public class VaultTestConfiguration {
 
     @Bean
     public VaultInitializer vaultInitializer() {
-        VaultInitializer vaultInitializer = VaultInitializer.initializeValut();
+        VaultInitializer vaultInitializer = VaultInitializer.initializeVault();
         return vaultInitializer;
     }
 
@@ -24,6 +25,5 @@ public class VaultTestConfiguration {
         VaultInitializer vaultInitializer = vaultInitializer();
         VaultTemplate vaultTemplate = new VaultTemplate(VaultEndpoint.from(new URI("http://localhost:8200")), new TokenAuthentication(vaultInitializer.getRootToken()));
         return vaultTemplate;
-
     }
 }
diff --git a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/config/WebConfig.java b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/config/WebConfig.java
index 9901915b03..e9b59a2b23 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/config/WebConfig.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/main/java/com/baeldung/config/WebConfig.java
@@ -41,47 +41,4 @@ public class WebConfig {
     public ObjectMapper objectMapper() {
         return new ObjectMapper();
     }
-
-    // Thymeleaf configuration
-    @Bean
-    public ViewResolver thymeleafViewResolver() {
-
-        ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
-
-        viewResolver.setTemplateEngine(thymeleafTemplateEngine());
-        viewResolver.setCharacterEncoding("UTF-8");
-        viewResolver.setOrder(0);
-
-        return viewResolver;
-    }
-
-    // Thymeleaf template engine with Spring integration
-    @Bean
-    public SpringTemplateEngine thymeleafTemplateEngine() {
-
-        SpringTemplateEngine templateEngine = new SpringTemplateEngine();
-        templateEngine.setTemplateResolver(thymeleafTemplateResolver());
-        templateEngine.setEnableSpringELCompiler(true);
-
-        return templateEngine;
-    }
-
-    @Bean
-    public SpringResourceTemplateResolver springResourceTemplateResolver() {
-        return new SpringResourceTemplateResolver();
-    }
-
-    @Bean
-    public ITemplateResolver thymeleafTemplateResolver() {
-
-        ClassLoaderTemplateResolver templateResolver = new ClassLoaderTemplateResolver();
-
-        templateResolver.setPrefix("/templates/");
-        templateResolver.setCacheable(false);
-        templateResolver.setSuffix(".html");
-        templateResolver.setTemplateMode(TemplateMode.HTML);
-        templateResolver.setCharacterEncoding("UTF-8");
-
-        return templateResolver;
-    }
 }
diff --git a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/PassParametersControllerIntegrationTest.java b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/PassParametersControllerIntegrationTest.java
index c1311acba0..7408ae825d 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/PassParametersControllerIntegrationTest.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/controller/PassParametersControllerIntegrationTest.java
@@ -39,7 +39,7 @@ public class PassParametersControllerIntegrationTest {
         ModelAndView mv = this.mockMvc.perform(MockMvcRequestBuilders.get("/showViewPage")).andReturn().getModelAndView();
 
         //Validate view
-        Assert.assertEquals(mv.getViewName(), "viewPage");
+        Assert.assertEquals(mv.getViewName(), "view/viewPage");
 
         //Validate attribute
         Assert.assertEquals(mv.getModelMap().get("message").toString(), "Baeldung");
@@ -50,7 +50,7 @@ public class PassParametersControllerIntegrationTest {
         ModelAndView mv = this.mockMvc.perform(MockMvcRequestBuilders.get("/printViewPage")).andReturn().getModelAndView();
 
         //Validate view
-        Assert.assertEquals(mv.getViewName(), "viewPage");
+        Assert.assertEquals(mv.getViewName(), "view/viewPage");
 
         //Validate attribute
         Assert.assertEquals(mv.getModelMap().get("message").toString(), "Baeldung");
@@ -61,7 +61,7 @@ public class PassParametersControllerIntegrationTest {
         ModelAndView mv = this.mockMvc.perform(MockMvcRequestBuilders.get("/goToViewPage")).andReturn().getModelAndView();
 
         //Validate view
-        Assert.assertEquals(mv.getViewName(), "viewPage");
+        Assert.assertEquals(mv.getViewName(), "view/viewPage");
 
         //Validate attribute
         Assert.assertEquals(mv.getModelMap().get("message").toString(), "Baeldung");
diff --git a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithRequiredAttributeIntegrationTest.java b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithRequiredAttributeIntegrationTest.java
index 6e087a1640..e7d864d9be 100644
--- a/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithRequiredAttributeIntegrationTest.java
+++ b/spring-web-modules/spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithRequiredAttributeIntegrationTest.java
@@ -34,17 +34,16 @@ public class ArticleViewerControllerWithRequiredAttributeIntegrationTest {
         int articleId = 5;
         
         this.mockMvc
-            .perform(MockMvcRequestBuilders.get("/article/{id}", articleId))
+            .perform(MockMvcRequestBuilders.get("/requiredAttribute/article/{id}", articleId))
             .andExpect(MockMvcResultMatchers.status().isOk())
             .andExpect(MockMvcResultMatchers.jsonPath("$.id").value(articleId));
-               
     }
 
     @Test
-    public void whenIdPathVariableIsNotPassed_thenResponse500() throws Exception {
+    public void whenIdPathVariableIsNotPassed_thenResponseOK() throws Exception {
         this.mockMvc
-            .perform(MockMvcRequestBuilders.get("/article"))
-            .andExpect(MockMvcResultMatchers.status().isInternalServerError());
+            .perform(MockMvcRequestBuilders.get("/requiredAttribute/article"))
+            .andExpect(MockMvcResultMatchers.status().isOk());
                
     }
 }
\ No newline at end of file
diff --git a/spring-web-modules/spring-thymeleaf-5/README.md b/spring-web-modules/spring-thymeleaf-5/README.md
index c06b47d240..7e2f8c37b4 100644
--- a/spring-web-modules/spring-thymeleaf-5/README.md
+++ b/spring-web-modules/spring-thymeleaf-5/README.md
@@ -10,4 +10,5 @@ This module contains articles about Spring with Thymeleaf
 - [Upload Image With Spring Boot and Thymeleaf](https://www.baeldung.com/spring-boot-thymeleaf-image-upload)
 - [Getting a URL Attribute Value in Thymeleaf](https://www.baeldung.com/thymeleaf-url-attribute-value)
 - [Expression Types in Thymeleaf](https://www.baeldung.com/java-thymeleaf-expression-types)
+- [Difference Between th:text and th:value in Thymeleaf](https://www.baeldung.com/java-thymeleaf-text-vs-value)
 - [[<-- prev]](/spring-thymeleaf)
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/attributes/AttributeController.java b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/attributes/AttributeController.java
new file mode 100644
index 0000000000..b7725fd992
--- /dev/null
+++ b/spring-web-modules/spring-thymeleaf-5/src/main/java/com/baeldung/thymeleaf/attributes/AttributeController.java
@@ -0,0 +1,30 @@
+package com.baeldung.thymeleaf.attributes;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("/attributes")
+public class AttributeController {
+
+    private static final Logger logger = LoggerFactory.getLogger(AttributeController.class);
+
+    @GetMapping
+    public String show(Model model) {
+        model.addAttribute("title", "Baeldung");
+        model.addAttribute("email", "default@example.com");
+        return "attributes/index";
+    }
+
+    @PostMapping
+    public String submit(String email) {
+        logger.info("Email: {}", email);
+        return "redirect:attributes";
+    }
+
+}
diff --git a/spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/attributes/index.html b/spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/attributes/index.html
new file mode 100644
index 0000000000..ed55b61a8a
--- /dev/null
+++ b/spring-web-modules/spring-thymeleaf-5/src/main/resources/templates/attributes/index.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>Difference Between th:text and th:value in Thymeleaf</title>
+</head>
+<body>
+
+<h1 th:text="${title} ?: 'Default title'"/>
+
+<form th:action="@{/attributes}" method="post">
+    <label>Email:
+        <input name="email" type="email" th:value="${email}">
+    </label>
+    <input type="submit" value="Submit"/>
+</form>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/terraform/README.md b/terraform-modules/README.md
similarity index 100%
rename from terraform/README.md
rename to terraform-modules/README.md
diff --git a/terraform/best-practices/README.md b/terraform-modules/best-practices/README.md
similarity index 100%
rename from terraform/best-practices/README.md
rename to terraform-modules/best-practices/README.md
diff --git a/terraform/best-practices/ec2-simple/.gitignore b/terraform-modules/best-practices/ec2-simple/.gitignore
similarity index 100%
rename from terraform/best-practices/ec2-simple/.gitignore
rename to terraform-modules/best-practices/ec2-simple/.gitignore
diff --git a/terraform/best-practices/ec2-simple/SETUP.md b/terraform-modules/best-practices/ec2-simple/SETUP.md
similarity index 100%
rename from terraform/best-practices/ec2-simple/SETUP.md
rename to terraform-modules/best-practices/ec2-simple/SETUP.md
diff --git a/terraform/best-practices/ec2-simple/main.tf b/terraform-modules/best-practices/ec2-simple/main.tf
similarity index 100%
rename from terraform/best-practices/ec2-simple/main.tf
rename to terraform-modules/best-practices/ec2-simple/main.tf
diff --git a/terraform/best-practices/ec2-simple/providers.tf b/terraform-modules/best-practices/ec2-simple/providers.tf
similarity index 100%
rename from terraform/best-practices/ec2-simple/providers.tf
rename to terraform-modules/best-practices/ec2-simple/providers.tf
diff --git a/terraform/best-practices/ec2-simple/variables.tf b/terraform-modules/best-practices/ec2-simple/variables.tf
similarity index 100%
rename from terraform/best-practices/ec2-simple/variables.tf
rename to terraform-modules/best-practices/ec2-simple/variables.tf
diff --git a/terraform/best-practices/k8s-basic/.gitignore b/terraform-modules/best-practices/k8s-basic/.gitignore
similarity index 100%
rename from terraform/best-practices/k8s-basic/.gitignore
rename to terraform-modules/best-practices/k8s-basic/.gitignore
diff --git a/terraform/best-practices/k8s-basic/SETUP.md b/terraform-modules/best-practices/k8s-basic/SETUP.md
similarity index 100%
rename from terraform/best-practices/k8s-basic/SETUP.md
rename to terraform-modules/best-practices/k8s-basic/SETUP.md
diff --git a/terraform/best-practices/k8s-basic/main.tf b/terraform-modules/best-practices/k8s-basic/main.tf
similarity index 100%
rename from terraform/best-practices/k8s-basic/main.tf
rename to terraform-modules/best-practices/k8s-basic/main.tf
diff --git a/terraform/best-practices/k8s-basic/providers.tf b/terraform-modules/best-practices/k8s-basic/providers.tf
similarity index 100%
rename from terraform/best-practices/k8s-basic/providers.tf
rename to terraform-modules/best-practices/k8s-basic/providers.tf
diff --git a/terraform/best-practices/k8s-basic/variables.tf b/terraform-modules/best-practices/k8s-basic/variables.tf
similarity index 100%
rename from terraform/best-practices/k8s-basic/variables.tf
rename to terraform-modules/best-practices/k8s-basic/variables.tf
diff --git a/terraform/best-practices/k8s-modules/.gitignore b/terraform-modules/best-practices/k8s-modules/.gitignore
similarity index 100%
rename from terraform/best-practices/k8s-modules/.gitignore
rename to terraform-modules/best-practices/k8s-modules/.gitignore
diff --git a/terraform/best-practices/k8s-modules/SETUP.md b/terraform-modules/best-practices/k8s-modules/SETUP.md
similarity index 100%
rename from terraform/best-practices/k8s-modules/SETUP.md
rename to terraform-modules/best-practices/k8s-modules/SETUP.md
diff --git a/terraform/best-practices/k8s-modules/main.tf b/terraform-modules/best-practices/k8s-modules/main.tf
similarity index 100%
rename from terraform/best-practices/k8s-modules/main.tf
rename to terraform-modules/best-practices/k8s-modules/main.tf
diff --git a/terraform/best-practices/k8s-modules/modules/SvcCustomer/main.tf b/terraform-modules/best-practices/k8s-modules/modules/SvcCustomer/main.tf
similarity index 100%
rename from terraform/best-practices/k8s-modules/modules/SvcCustomer/main.tf
rename to terraform-modules/best-practices/k8s-modules/modules/SvcCustomer/main.tf
diff --git a/terraform/best-practices/k8s-modules/modules/SvcCustomer/outputs.tf b/terraform-modules/best-practices/k8s-modules/modules/SvcCustomer/outputs.tf
similarity index 100%
rename from terraform/best-practices/k8s-modules/modules/SvcCustomer/outputs.tf
rename to terraform-modules/best-practices/k8s-modules/modules/SvcCustomer/outputs.tf
diff --git a/terraform/best-practices/k8s-modules/modules/SvcCustomer/variables.tf b/terraform-modules/best-practices/k8s-modules/modules/SvcCustomer/variables.tf
similarity index 100%
rename from terraform/best-practices/k8s-modules/modules/SvcCustomer/variables.tf
rename to terraform-modules/best-practices/k8s-modules/modules/SvcCustomer/variables.tf
diff --git a/terraform/best-practices/k8s-modules/modules/SvcFeedback/main.tf b/terraform-modules/best-practices/k8s-modules/modules/SvcFeedback/main.tf
similarity index 100%
rename from terraform/best-practices/k8s-modules/modules/SvcFeedback/main.tf
rename to terraform-modules/best-practices/k8s-modules/modules/SvcFeedback/main.tf
diff --git a/terraform/best-practices/k8s-modules/modules/SvcFeedback/outputs.tf b/terraform-modules/best-practices/k8s-modules/modules/SvcFeedback/outputs.tf
similarity index 100%
rename from terraform/best-practices/k8s-modules/modules/SvcFeedback/outputs.tf
rename to terraform-modules/best-practices/k8s-modules/modules/SvcFeedback/outputs.tf
diff --git a/terraform/best-practices/k8s-modules/modules/SvcFeedback/variables.tf b/terraform-modules/best-practices/k8s-modules/modules/SvcFeedback/variables.tf
similarity index 100%
rename from terraform/best-practices/k8s-modules/modules/SvcFeedback/variables.tf
rename to terraform-modules/best-practices/k8s-modules/modules/SvcFeedback/variables.tf
diff --git a/terraform/best-practices/k8s-modules/modules/ingress/www.petshop.com.br/main.tf b/terraform-modules/best-practices/k8s-modules/modules/ingress/www.petshop.com.br/main.tf
similarity index 100%
rename from terraform/best-practices/k8s-modules/modules/ingress/www.petshop.com.br/main.tf
rename to terraform-modules/best-practices/k8s-modules/modules/ingress/www.petshop.com.br/main.tf
diff --git a/terraform/best-practices/k8s-modules/modules/ingress/www.petshop.com.br/outputs.tf b/terraform-modules/best-practices/k8s-modules/modules/ingress/www.petshop.com.br/outputs.tf
similarity index 100%
rename from terraform/best-practices/k8s-modules/modules/ingress/www.petshop.com.br/outputs.tf
rename to terraform-modules/best-practices/k8s-modules/modules/ingress/www.petshop.com.br/outputs.tf
diff --git a/terraform/best-practices/k8s-modules/modules/ingress/www.petshop.com.br/variables.tf b/terraform-modules/best-practices/k8s-modules/modules/ingress/www.petshop.com.br/variables.tf
similarity index 100%
rename from terraform/best-practices/k8s-modules/modules/ingress/www.petshop.com.br/variables.tf
rename to terraform-modules/best-practices/k8s-modules/modules/ingress/www.petshop.com.br/variables.tf
diff --git a/terraform/best-practices/k8s-modules/provider.tf b/terraform-modules/best-practices/k8s-modules/provider.tf
similarity index 100%
rename from terraform/best-practices/k8s-modules/provider.tf
rename to terraform-modules/best-practices/k8s-modules/provider.tf
diff --git a/terraform/hello-terraform/.gitignore b/terraform-modules/hello-terraform/.gitignore
similarity index 100%
rename from terraform/hello-terraform/.gitignore
rename to terraform-modules/hello-terraform/.gitignore
diff --git a/terraform/hello-terraform/main.tf b/terraform-modules/hello-terraform/main.tf
similarity index 100%
rename from terraform/hello-terraform/main.tf
rename to terraform-modules/hello-terraform/main.tf
diff --git a/testing-modules/gatling-java/Jenkinsfile b/testing-modules/gatling-java/Jenkinsfile
new file mode 100644
index 0000000000..0786788406
--- /dev/null
+++ b/testing-modules/gatling-java/Jenkinsfile
@@ -0,0 +1,20 @@
+pipeline {
+    agent any
+    stages {
+        stage("Build Maven") {
+            steps {
+                sh 'mvn -B clean package'
+            }
+        }
+        stage("Run Gatling") {
+            steps {
+                sh 'mvn gatling:test'
+            }
+            post {
+                always {
+                    gatlingArchive()
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/gatling-java/README.md b/testing-modules/gatling-java/README.md
new file mode 100644
index 0000000000..4bc07b1910
--- /dev/null
+++ b/testing-modules/gatling-java/README.md
@@ -0,0 +1,7 @@
+### Relevant Articles:
+- [Load Testing Rest Endpoint Using Gatling](https://www.baeldung.com/gatling-load-testing-rest-endpoint)
+
+
+
+### Running a simualtion
+ To run the simulation from command prompt use mvn gatling:test
diff --git a/testing-modules/gatling-java/pom.xml b/testing-modules/gatling-java/pom.xml
new file mode 100644
index 0000000000..c759928cc5
--- /dev/null
+++ b/testing-modules/gatling-java/pom.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>
+    <groupId>org.baeldung</groupId>
+    <artifactId>gatling-java</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>gatling-java</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>testing-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>io.gatling</groupId>
+            <artifactId>gatling-app</artifactId>
+            <version>${gatling.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.gatling.highcharts</groupId>
+            <artifactId>gatling-charts-highcharts</artifactId>
+            <version>${gatling.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.24</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.javafaker</groupId>
+            <artifactId>javafaker</artifactId>
+            <version>${faker.version}</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>net.alchim31.maven</groupId>
+                    <artifactId>scala-maven-plugin</artifactId>
+                    <version>${scala-maven-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>io.gatling</groupId>
+                <artifactId>gatling-maven-plugin</artifactId>
+                <version>${gatling-maven-plugin.version}</version>
+                <configuration>
+                    <simulationClass>org.baeldung.EmployeeRegistrationSimulation</simulationClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <encoding>UTF-8</encoding>
+        <gatling.version>3.9.0</gatling.version>
+        <gatling-maven-plugin.version>4.2.9</gatling-maven-plugin.version>
+        <faker.version>1.0.2</faker.version>
+        <spring.version>2.7.5</spring.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/testing-modules/gatling-java/src/main/java/org/baeldung/Address.java b/testing-modules/gatling-java/src/main/java/org/baeldung/Address.java
new file mode 100644
index 0000000000..2a8e6c60dc
--- /dev/null
+++ b/testing-modules/gatling-java/src/main/java/org/baeldung/Address.java
@@ -0,0 +1,13 @@
+package org.baeldung;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Builder
+@Data
+public class Address {
+    private String postCode;
+    private String Street;
+    private String houseNo;
+    private String city;
+}
diff --git a/testing-modules/gatling-java/src/main/java/org/baeldung/Application.java b/testing-modules/gatling-java/src/main/java/org/baeldung/Application.java
new file mode 100644
index 0000000000..fce18fe70c
--- /dev/null
+++ b/testing-modules/gatling-java/src/main/java/org/baeldung/Application.java
@@ -0,0 +1,12 @@
+package org.baeldung;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/gatling-java/src/main/java/org/baeldung/Employee.java b/testing-modules/gatling-java/src/main/java/org/baeldung/Employee.java
new file mode 100644
index 0000000000..c52130b175
--- /dev/null
+++ b/testing-modules/gatling-java/src/main/java/org/baeldung/Employee.java
@@ -0,0 +1,16 @@
+package org.baeldung;
+
+import java.util.Set;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class Employee {
+    private String empName;
+    private Address address;
+    private String id;
+    private Set<String> projects;
+
+}
diff --git a/testing-modules/gatling-java/src/main/java/org/baeldung/EmployeeController.java b/testing-modules/gatling-java/src/main/java/org/baeldung/EmployeeController.java
new file mode 100644
index 0000000000..ce5d558d8e
--- /dev/null
+++ b/testing-modules/gatling-java/src/main/java/org/baeldung/EmployeeController.java
@@ -0,0 +1,99 @@
+package org.baeldung;
+
+import java.net.URI;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ThreadLocalRandom;
+
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RestController
+@RequestMapping("/api/employees")
+public class EmployeeController {
+
+    @GetMapping(produces = { MediaType.APPLICATION_JSON_VALUE })
+    public List<Employee> getAllEmployees() {
+        return createEmployees();
+    }
+
+    @GetMapping("/{id}")
+    public Employee getEmployeeWithId(@PathVariable("id") Long id) {
+        log.info("Getting employee with ID '{}'", id);
+
+        List<Employee> allEmployees = createEmployees();
+        return allEmployees.get(ThreadLocalRandom.current()
+          .nextInt(0, allEmployees.size()));
+    }
+
+    @PostMapping(consumes = { MediaType.APPLICATION_JSON_VALUE })
+    public ResponseEntity<Void> addEmployee(@RequestBody EmployeeCreationRequest request, UriComponentsBuilder uriComponentsBuilder) {
+
+        log.info("Creating new employee with employeeName: {}", request.getEmpName());
+
+        URI location = uriComponentsBuilder.path("/api/employees/{id}")
+          .buildAndExpand("99")
+          .toUri();
+        return ResponseEntity.created(location)
+          .build();
+    }
+
+    private List<Employee> createEmployees() {
+
+        Set<String> projects = new HashSet<String>();
+        projects.add("proj1");
+        projects.add("proj2");
+
+        Employee employee1 = Employee.builder()
+          .id(UUID.randomUUID()
+            .toString())
+          .address(Address.builder()
+            .houseNo("1")
+            .city("London")
+            .postCode("HP17")
+            .build())
+          .projects(projects)
+          .empName("Andy")
+          .build();
+
+        Employee employee2 = Employee.builder()
+          .id(UUID.randomUUID()
+            .toString())
+          .address(Address.builder()
+            .houseNo("2")
+            .city("Cardiff")
+            .postCode("CF12")
+            .build())
+          .projects(projects)
+          .empName("Bob")
+          .build();
+
+        Employee employee3 = Employee.builder()
+          .id(UUID.randomUUID()
+            .toString())
+          .address(Address.builder()
+            .houseNo("4")
+            .city("Burmingham")
+            .postCode("BA4")
+            .build())
+          .projects(projects)
+          .empName("Clive")
+          .build();
+
+        return Arrays.asList(employee1, employee2, employee3);
+
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/gatling-java/src/main/java/org/baeldung/EmployeeCreationRequest.java b/testing-modules/gatling-java/src/main/java/org/baeldung/EmployeeCreationRequest.java
new file mode 100644
index 0000000000..72c5e1ec27
--- /dev/null
+++ b/testing-modules/gatling-java/src/main/java/org/baeldung/EmployeeCreationRequest.java
@@ -0,0 +1,29 @@
+package org.baeldung;
+
+public class EmployeeCreationRequest {
+
+    private String empName;
+
+    private String empNumber;
+
+    public String getEmpName() {
+        return empName;
+    }
+
+    public void setEmpName(String empName) {
+        this.empName = empName;
+    }
+
+    @Override
+    public String toString() {
+        return "org.baeldung.EmployeeCreationRequest{" + "employeename='" + empName + '\'' + '}';
+    }
+
+    public String getEmpNumber() {
+        return empNumber;
+    }
+
+    public void setEmpNumber(String empNumber) {
+        this.empNumber = empNumber;
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/gatling-java/src/test/java/org/baeldung/EmployeeRegistrationSimulation.java b/testing-modules/gatling-java/src/test/java/org/baeldung/EmployeeRegistrationSimulation.java
new file mode 100644
index 0000000000..de59273bbd
--- /dev/null
+++ b/testing-modules/gatling-java/src/test/java/org/baeldung/EmployeeRegistrationSimulation.java
@@ -0,0 +1,87 @@
+package org.baeldung;
+
+import static io.gatling.javaapi.core.CoreDsl.StringBody;
+import static io.gatling.javaapi.core.CoreDsl.global;
+import static io.gatling.javaapi.core.CoreDsl.rampUsersPerSec;
+import static io.gatling.javaapi.http.HttpDsl.header;
+import static io.gatling.javaapi.http.HttpDsl.http;
+import static io.gatling.javaapi.http.HttpDsl.status;
+
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import com.github.javafaker.Faker;
+
+import io.gatling.javaapi.core.CoreDsl;
+import io.gatling.javaapi.core.OpenInjectionStep.RampRate.RampRateOpenInjectionStep;
+import io.gatling.javaapi.core.ScenarioBuilder;
+import io.gatling.javaapi.core.Simulation;
+import io.gatling.javaapi.http.HttpDsl;
+import io.gatling.javaapi.http.HttpProtocolBuilder;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class EmployeeRegistrationSimulation extends Simulation {
+
+    private static final HttpProtocolBuilder HTTP_PROTOCOL_BUILDER = setupProtocolForSimulation();
+
+    private static final Iterator<Map<String, Object>> FEED_DATA = setupTestFeedData();
+
+    private static final ScenarioBuilder POST_SCENARIO_BUILDER = buildPostScenario();
+
+    public EmployeeRegistrationSimulation() {
+
+        setUp(POST_SCENARIO_BUILDER.injectOpen(postEndpointInjectionProfile())
+          .protocols(HTTP_PROTOCOL_BUILDER)).assertions(global().responseTime()
+          .max()
+          .lte(10000), global().successfulRequests()
+          .percent()
+          .gt(90d));
+    }
+
+    private RampRateOpenInjectionStep postEndpointInjectionProfile() {
+        int totalDesiredUserCount = 200;
+        double userRampUpPerInterval = 50;
+        double rampUpIntervalSeconds = 30;
+
+        int totalRampUptimeSeconds = 120;
+        int steadyStateDurationSeconds = 300;
+        return rampUsersPerSec(userRampUpPerInterval / (rampUpIntervalSeconds / 60)).to(totalDesiredUserCount)
+          .during(Duration.ofSeconds(totalRampUptimeSeconds + steadyStateDurationSeconds));
+    }
+
+    private static HttpProtocolBuilder setupProtocolForSimulation() {
+        return HttpDsl.http.baseUrl("http://localhost:8080")
+          .acceptHeader("application/json")
+          .maxConnectionsPerHost(10)
+          .userAgentHeader("Gatling/Performance Test");
+    }
+
+    private static Iterator<Map<String, Object>> setupTestFeedData() {
+        Faker faker = new Faker();
+        Iterator<Map<String, Object>> iterator;
+        iterator = Stream.generate(() -> {
+              Map<String, Object> stringObjectMap = new HashMap<>();
+              stringObjectMap.put("empName", faker.name()
+                .fullName());
+              return stringObjectMap;
+          })
+          .iterator();
+        return iterator;
+    }
+
+    private static ScenarioBuilder buildPostScenario() {
+        return CoreDsl.scenario("Load Test Creating User")
+          .feed(FEED_DATA)
+          .exec(http("create-employee-request").post("/api/employees")
+            .header("Content-Type", "application/json")
+            .body(StringBody("{ \"empName\": \"${empName}\" }"))
+            .check(status().is(201))
+            .check(header("Location").saveAs("location")))
+          .exec(http("get-employee-request").get(session -> session.getString("location"))
+            .check(status().is(200)));
+    }
+}
diff --git a/testing-modules/gatling-java/src/test/resources/gatling.conf b/testing-modules/gatling-java/src/test/resources/gatling.conf
new file mode 100644
index 0000000000..6ebfd6e820
--- /dev/null
+++ b/testing-modules/gatling-java/src/test/resources/gatling.conf
@@ -0,0 +1,127 @@
+    #########################
+# Gatling Configuration #
+#########################
+
+# This file contains all the settings configurable for Gatling with their default values
+
+gatling {
+  core {
+    #outputDirectoryBaseName = "" # The prefix for each simulation result folder (then suffixed by the report generation timestamp)
+    #runDescription = ""          # The description for this simulation run, displayed in each report
+    #encoding = "utf-8"           # Encoding to use throughout Gatling for file and string manipulation
+    #simulationClass = ""         # The FQCN of the simulation to run (when used in conjunction with noReports, the simulation for which assertions will be validated)
+    #mute = false                 # When set to true, don't ask for simulation name nor run description (currently only used by Gatling SBT plugin)
+    #elFileBodiesCacheMaxCapacity = 200        # Cache size for request body EL templates, set to 0 to disable
+    #rawFileBodiesCacheMaxCapacity = 200       # Cache size for request body Raw templates, set to 0 to disable
+    #rawFileBodiesInMemoryMaxSize = 1000       # Below this limit, raw file bodies will be cached in memory
+
+    extract {
+      regex {
+        #cacheMaxCapacity = 200 # Cache size for the compiled regexes, set to 0 to disable caching
+      }
+      xpath {
+        #cacheMaxCapacity = 200 # Cache size for the compiled XPath queries,  set to 0 to disable caching
+      }
+      jsonPath {
+        #cacheMaxCapacity = 200 # Cache size for the compiled jsonPath queries, set to 0 to disable caching
+        #preferJackson = false  # When set to true, prefer Jackson over Boon for JSON-related operations
+      }
+      css {
+        #cacheMaxCapacity = 200 # Cache size for the compiled CSS selectors queries,  set to 0 to disable caching
+      }
+    }
+
+    directory {
+      #data = user-files/data               # Folder where user's data (e.g. files used by Feeders) is located
+      #bodies = user-files/bodies           # Folder where bodies are located
+      #simulations = user-files/simulations # Folder where the bundle's simulations are located
+      #reportsOnly = ""                     # If set, name of report folder to look for in order to generate its report
+      #binaries = ""                        # If set, name of the folder where compiles classes are located: Defaults to GATLING_HOME/target.
+      #results = results                    # Name of the folder where all reports folder are located
+    }
+  }
+  charting {
+    #noReports = false       # When set to true, don't generate HTML reports
+    #maxPlotPerSeries = 1000 # Number of points per graph in Gatling reports
+    #useGroupDurationMetric = false  # Switch group timings from cumulated response time to group duration.
+    indicators {
+      #lowerBound = 800      # Lower bound for the requests' response time to track in the reports and the console summary
+      #higherBound = 1200    # Higher bound for the requests' response time to track in the reports and the console summary
+      #percentile1 = 50      # Value for the 1st percentile to track in the reports, the console summary and Graphite
+      #percentile2 = 75      # Value for the 2nd percentile to track in the reports, the console summary and Graphite
+      #percentile3 = 95      # Value for the 3rd percentile to track in the reports, the console summary and Graphite
+      #percentile4 = 99      # Value for the 4th percentile to track in the reports, the console summary and Graphite
+    }
+  }
+  http {
+    #fetchedCssCacheMaxCapacity = 200          # Cache size for CSS parsed content, set to 0 to disable
+    #fetchedHtmlCacheMaxCapacity = 200         # Cache size for HTML parsed content, set to 0 to disable
+    #perUserCacheMaxCapacity = 200             # Per virtual user cache size, set to 0 to disable
+    #warmUpUrl = "http://gatling.io"           # The URL to use to warm-up the HTTP stack (blank means disabled)
+    #enableGA = true                           # Very light Google Analytics, please support
+    ssl {
+      keyStore {
+        #type = ""      # Type of SSLContext's KeyManagers store
+        #file = ""      # Location of SSLContext's KeyManagers store
+        #password = ""  # Password for SSLContext's KeyManagers store
+        #algorithm = "" # Algorithm used SSLContext's KeyManagers store
+      }
+      trustStore {
+        #type = ""      # Type of SSLContext's TrustManagers store
+        #file = ""      # Location of SSLContext's TrustManagers store
+        #password = ""  # Password for SSLContext's TrustManagers store
+        #algorithm = "" # Algorithm used by SSLContext's TrustManagers store
+      }
+    }
+    ahc {
+      #keepAlive = true                                # Allow pooling HTTP connections (keep-alive header automatically added)
+      #connectTimeout = 60000                          # Timeout when establishing a connection
+      #pooledConnectionIdleTimeout = 60000             # Timeout when a connection stays unused in the pool
+      #readTimeout = 60000                             # Timeout when a used connection stays idle
+      #maxRetry = 2                                    # Number of times that a request should be tried again
+      #requestTimeout = 60000                          # Timeout of the requests
+      #acceptAnyCertificate = true                     # When set to true, doesn't validate SSL certificates
+      #httpClientCodecMaxInitialLineLength = 4096      # Maximum length of the initial line of the response (e.g. "HTTP/1.0 200 OK")
+      #httpClientCodecMaxHeaderSize = 8192             # Maximum size, in bytes, of each request's headers
+      #httpClientCodecMaxChunkSize = 8192              # Maximum length of the content or each chunk
+      #webSocketMaxFrameSize = 10240000                # Maximum frame payload size
+      #sslEnabledProtocols = [TLSv1.2, TLSv1.1, TLSv1] # Array of enabled protocols for HTTPS, if empty use the JDK defaults
+      #sslEnabledCipherSuites = []                     # Array of enabled cipher suites for HTTPS, if empty  use the JDK defaults
+      #sslSessionCacheSize = 0                         # SSLSession cache size, set to 0 to use JDK's default
+      #sslSessionTimeout = 0                           # SSLSession timeout in seconds, set to 0 to use JDK's default (24h)
+      #useOpenSsl = false                              # if OpenSSL should be used instead of JSSE (requires tcnative jar)
+      #useNativeTransport = false                      # if native transport should be used instead of Java NIO (requires netty-transport-native-epoll, currently Linux only)
+      #usePooledMemory = true                          # if Gatling should use pooled memory
+      #tcpNoDelay = true
+      #soReuseAddress = false
+      #soLinger = -1
+      #soSndBuf = -1
+      #soRcvBuf = -1
+    }
+    dns {
+      #queryTimeout = 5000                             # Timeout of each DNS query in millis
+      #maxQueriesPerResolve = 3                        # Maximum allowed number of DNS queries for a given name resolution
+    }
+  }
+  data {
+    #writers = [console, file]      # The list of DataWriters to which Gatling write simulation data (currently supported : console, file, graphite, jdbc)
+    console {
+      #light = false                # When set to true, displays a light version without detailed request stats
+    }
+    file {
+      #bufferSize = 8192            # FileDataWriter's internal data buffer size, in bytes
+    }
+    leak {
+      #noActivityTimeout = 30  # Period, in seconds, for which Gatling may have no activity before considering a leak may be happening
+    }
+    graphite {
+      #light = false              # only send the all* stats
+      #host = "localhost"         # The host where the Carbon server is located
+      #port = 2003                # The port to which the Carbon server listens to (2003 is default for plaintext, 2004 is default for pickle)
+      #protocol = "tcp"           # The protocol used to send data to Carbon (currently supported : "tcp", "udp")
+      #rootPathPrefix = "gatling" # The common prefix of all metrics sent to Graphite
+      #bufferSize = 8192          # GraphiteDataWriter's internal data buffer size, in bytes
+      #writeInterval = 1          # GraphiteDataWriter's write interval, in seconds
+    }
+  }
+}
diff --git a/testing-modules/gatling-java/src/test/resources/logback.xml b/testing-modules/gatling-java/src/test/resources/logback.xml
new file mode 100644
index 0000000000..b9ba6255a0
--- /dev/null
+++ b/testing-modules/gatling-java/src/test/resources/logback.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%-5level] %logger{15} - %msg%n%rEx</pattern>
+            <immediateFlush>false</immediateFlush>
+        </encoder>
+    </appender>
+
+    <!-- Uncomment for logging ALL HTTP request and responses -->
+    <!-- 	<logger name="io.gatling.http.ahc" level="TRACE" /> -->
+    <!--    <logger name="io.gatling.http.response" level="TRACE" /> -->
+    <!-- Uncomment for logging ONLY FAILED HTTP request and responses -->
+    <!-- 	<logger name="io.gatling.http.ahc" level="DEBUG" /> -->
+    <!--    <logger name="io.gatling.http.response" level="DEBUG" /> -->
+
+    <root level="WARN">
+        <appender-ref ref="CONSOLE" />
+    </root>
+
+</configuration>
diff --git a/testing-modules/instancio/pom.xml b/testing-modules/instancio/pom.xml
index 137da91897..7687ce282d 100644
--- a/testing-modules/instancio/pom.xml
+++ b/testing-modules/instancio/pom.xml
@@ -51,8 +51,8 @@
     </dependencies>
 
     <properties>
-        <instancio.version>2.6.0</instancio.version>
+        <instancio.version>2.9.0</instancio.version>
         <jackson.version>2.14.1</jackson.version>
         <junit-jupiter.version>5.9.2</junit-jupiter.version>
     </properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/DivisibilityUnitTest.java b/testing-modules/junit-4/src/test/java/com/baeldung/junit/DivisibilityUnitTest.java
similarity index 90%
rename from core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/DivisibilityUnitTest.java
rename to testing-modules/junit-4/src/test/java/com/baeldung/junit/DivisibilityUnitTest.java
index b8fe701f57..3bdc8787f5 100644
--- a/core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/DivisibilityUnitTest.java
+++ b/testing-modules/junit-4/src/test/java/com/baeldung/junit/DivisibilityUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.junit4vstestng;
+package com.baeldung.junit;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/RegistrationUnitTest.java b/testing-modules/junit-4/src/test/java/com/baeldung/junit/RegistrationUnitTest.java
similarity index 89%
rename from core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/RegistrationUnitTest.java
rename to testing-modules/junit-4/src/test/java/com/baeldung/junit/RegistrationUnitTest.java
index 08a9f1e1c4..b52c565a9d 100644
--- a/core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/RegistrationUnitTest.java
+++ b/testing-modules/junit-4/src/test/java/com/baeldung/junit/RegistrationUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.junit4vstestng;
+package com.baeldung.junit;
 
 import org.junit.Test;
 import org.slf4j.Logger;
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/SignInUnitTest.java b/testing-modules/junit-4/src/test/java/com/baeldung/junit/SignInUnitTest.java
similarity index 89%
rename from core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/SignInUnitTest.java
rename to testing-modules/junit-4/src/test/java/com/baeldung/junit/SignInUnitTest.java
index a49fb454ea..145eb0d835 100644
--- a/core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/SignInUnitTest.java
+++ b/testing-modules/junit-4/src/test/java/com/baeldung/junit/SignInUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.junit4vstestng;
+package com.baeldung.junit;
 
 import org.junit.Test;
 import org.slf4j.Logger;
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/StringCaseUnitTest.java b/testing-modules/junit-4/src/test/java/com/baeldung/junit/StringCaseUnitTest.java
similarity index 91%
rename from core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/StringCaseUnitTest.java
rename to testing-modules/junit-4/src/test/java/com/baeldung/junit/StringCaseUnitTest.java
index 16a881f7e7..a76fe97161 100644
--- a/core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/StringCaseUnitTest.java
+++ b/testing-modules/junit-4/src/test/java/com/baeldung/junit/StringCaseUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.junit4vstestng;
+package com.baeldung.junit;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/ParametrizedUnitTest.java b/testing-modules/junit-4/src/test/java/com/baeldung/junitparams/ParametrizedUnitTest.java
similarity index 92%
rename from core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/ParametrizedUnitTest.java
rename to testing-modules/junit-4/src/test/java/com/baeldung/junitparams/ParametrizedUnitTest.java
index b46d4e895d..4e5a59eb22 100644
--- a/core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/ParametrizedUnitTest.java
+++ b/testing-modules/junit-4/src/test/java/com/baeldung/junitparams/ParametrizedUnitTest.java
@@ -1,7 +1,6 @@
-package com.baeldung.junit4vstestng;
+package com.baeldung.junitparams;
 
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/SuiteUnitTest.java b/testing-modules/junit-4/src/test/java/com/baeldung/runfromjava/SuiteUnitTest.java
similarity index 61%
rename from core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/SuiteUnitTest.java
rename to testing-modules/junit-4/src/test/java/com/baeldung/runfromjava/SuiteUnitTest.java
index 3e02309636..67093b8a62 100644
--- a/core-java-modules/core-java/src/test/java/com/baeldung/junit4vstestng/SuiteUnitTest.java
+++ b/testing-modules/junit-4/src/test/java/com/baeldung/runfromjava/SuiteUnitTest.java
@@ -1,7 +1,9 @@
-package com.baeldung.junit4vstestng;
+package com.baeldung.runfromjava;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
+import com.baeldung.junit.RegistrationUnitTest;
+import com.baeldung.junit.SignInUnitTest;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({ RegistrationUnitTest.class, SignInUnitTest.class })
diff --git a/testing-modules/junit-5-advanced/README.md b/testing-modules/junit-5-advanced/README.md
index 9b3a5fa299..a89bcd2de2 100644
--- a/testing-modules/junit-5-advanced/README.md
+++ b/testing-modules/junit-5-advanced/README.md
@@ -8,3 +8,4 @@
 - [Parallel Test Execution for JUnit 5](https://www.baeldung.com/junit-5-parallel-tests)
 - [JUnit – Testing Methods That Call System.exit()](https://www.baeldung.com/junit-system-exit)
 - [Single Assert Call for Multiple Properties in Java Unit Testing](https://www.baeldung.com/java-testing-single-assert-multiple-properties)
+- [Creating a Test Suite With JUnit](https://www.baeldung.com/java-junit-test-suite)
diff --git a/testing-modules/junit-5-advanced/pom.xml b/testing-modules/junit-5-advanced/pom.xml
index bfc490b03e..5a65b0f6f3 100644
--- a/testing-modules/junit-5-advanced/pom.xml
+++ b/testing-modules/junit-5-advanced/pom.xml
@@ -33,6 +33,19 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-suite</artifactId>
+            <version>${junit-platform.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit-platform.version}</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -45,6 +58,9 @@
                         -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
                     </argLine>
                     <disableXmlReport>true</disableXmlReport>
+                    <excludes>
+                        <exclude>**/testsuite/**/*UnitTest.java</exclude>
+                    </excludes>
                 </configuration>
             </plugin>
         </plugins>
@@ -53,6 +69,7 @@
     <properties>
         <jmockit.version>1.49</jmockit.version>
         <assertj.version>3.24.2</assertj.version>
+        <junit-platform.version>1.9.2</junit-platform.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/ClassOneUnitTest.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/ClassOneUnitTest.java
new file mode 100644
index 0000000000..4ce092796e
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/ClassOneUnitTest.java
@@ -0,0 +1,13 @@
+package com.baeldung.testsuite;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class ClassOneUnitTest {
+
+    @Test
+    public void whenTrue_thenTrue() {
+        Assertions.assertTrue(true);
+    }
+
+}
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/ClassThreeUnitTest.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/ClassThreeUnitTest.java
new file mode 100644
index 0000000000..b686ef5773
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/ClassThreeUnitTest.java
@@ -0,0 +1,13 @@
+package com.baeldung.testsuite;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+public class ClassThreeUnitTest {
+    @Test
+    @Tag("slow")
+    public void whenTrue_thenTrue() {
+        Assertions.assertTrue(true);
+    }
+}
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/package-info.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/package-info.java
new file mode 100644
index 0000000000..53c8ea5e8a
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Dummy tests - showing Junit Suite functionality
+ */
+package com.baeldung.testsuite;
\ No newline at end of file
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/subpackage/ClassTwoUnitTest.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/subpackage/ClassTwoUnitTest.java
new file mode 100644
index 0000000000..bb63fcda63
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/subpackage/ClassTwoUnitTest.java
@@ -0,0 +1,11 @@
+package com.baeldung.testsuite.subpackage;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class ClassTwoUnitTest {
+    @Test
+    public void whenTrue_thenTrue() {
+        Assertions.assertTrue(true);
+    }
+}
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitClassNamePatternsSuite.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitClassNamePatternsSuite.java
new file mode 100644
index 0000000000..aa17e26069
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitClassNamePatternsSuite.java
@@ -0,0 +1,14 @@
+package com.baeldung.testsuite.suites;
+
+import org.junit.platform.suite.api.ExcludeClassNamePatterns;
+import org.junit.platform.suite.api.IncludeClassNamePatterns;
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectPackages("com.baeldung.testsuite")
+@IncludeClassNamePatterns("com.baeldung.testsuite.Class.*UnitTest")
+@ExcludeClassNamePatterns("com.baeldung.testsuite.ClassTwoUnitTest")
+public class JUnitClassNamePatternsSuite {
+    // runs ClassOneUnitTest and ClassThreeUnitTest
+}
\ No newline at end of file
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitExcludePackagesSuite.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitExcludePackagesSuite.java
new file mode 100644
index 0000000000..47cd993f8a
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitExcludePackagesSuite.java
@@ -0,0 +1,12 @@
+package com.baeldung.testsuite.suites;
+
+import org.junit.platform.suite.api.ExcludePackages;
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectPackages("com.baeldung.testsuite")
+@ExcludePackages("com.baeldung.testsuite.subpackage")
+public class JUnitExcludePackagesSuite {
+    // runs ClassOneUnitTest and ClassThreeUnitTest
+}
\ No newline at end of file
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitRunWithSuite.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitRunWithSuite.java
new file mode 100644
index 0000000000..ad098fb305
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitRunWithSuite.java
@@ -0,0 +1,16 @@
+package com.baeldung.testsuite.suites;
+
+import com.baeldung.testsuite.ClassOneUnitTest;
+import com.baeldung.testsuite.subpackage.ClassTwoUnitTest;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.SuiteDisplayName;
+import org.junit.runner.RunWith;
+
+@RunWith(JUnitPlatform.class)
+@SuiteDisplayName("My Test Suite")
+@SelectClasses({ClassOneUnitTest.class, ClassTwoUnitTest.class})
+public class JUnitRunWithSuite {
+    // runs ClassOneUnitTest and ClassTwoUnitTest
+    // equivalent to JUnitSelectClassesSuite
+}
\ No newline at end of file
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitSelectClassesSuite.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitSelectClassesSuite.java
new file mode 100644
index 0000000000..dc2b78ac53
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitSelectClassesSuite.java
@@ -0,0 +1,14 @@
+package com.baeldung.testsuite.suites;
+
+import com.baeldung.testsuite.ClassOneUnitTest;
+import com.baeldung.testsuite.subpackage.ClassTwoUnitTest;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.api.SuiteDisplayName;
+
+@Suite
+@SuiteDisplayName("My Test Suite")
+@SelectClasses({ClassOneUnitTest.class, ClassTwoUnitTest.class})
+public class JUnitSelectClassesSuite {
+    // runs ClassOneUnitTest and ClassTwoUnitTest
+}
\ No newline at end of file
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitSelectPackagesSuite.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitSelectPackagesSuite.java
new file mode 100644
index 0000000000..26562a18d7
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitSelectPackagesSuite.java
@@ -0,0 +1,10 @@
+package com.baeldung.testsuite.suites;
+
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectPackages({"com.baeldung.testsuite", "com.baeldung.testsuitetwo"})
+public class JUnitSelectPackagesSuite {
+    // runs ClassOneUnitTest, ClassTwoUnitTest and ClassThreeUnitTest
+}
\ No newline at end of file
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitTestExcludeTagsSuite.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitTestExcludeTagsSuite.java
new file mode 100644
index 0000000000..5ae32fc0b5
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitTestExcludeTagsSuite.java
@@ -0,0 +1,12 @@
+package com.baeldung.testsuite.suites;
+
+import org.junit.platform.suite.api.ExcludeTags;
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectPackages("com.baeldung.testsuite")
+@ExcludeTags("slow")
+public class JUnitTestExcludeTagsSuite {
+    // runs ClassOneUnitTest, ClassTwoUnitTest
+}
\ No newline at end of file
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitTestIncludePackagesSuite.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitTestIncludePackagesSuite.java
new file mode 100644
index 0000000000..b5442aff35
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitTestIncludePackagesSuite.java
@@ -0,0 +1,12 @@
+package com.baeldung.testsuite.suites;
+
+import org.junit.platform.suite.api.IncludePackages;
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectPackages("com.baeldung.testsuite")
+@IncludePackages("com.baeldung.testsuite.subpackage")
+public class JUnitTestIncludePackagesSuite {
+    // runs ClassTwoUnitTest
+}
\ No newline at end of file
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitTestIncludeTagsSuite.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitTestIncludeTagsSuite.java
new file mode 100644
index 0000000000..1cfce4bd7a
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/testsuite/suites/JUnitTestIncludeTagsSuite.java
@@ -0,0 +1,12 @@
+package com.baeldung.testsuite.suites;
+
+import org.junit.platform.suite.api.IncludeTags;
+import org.junit.platform.suite.api.SelectPackages;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectPackages("com.baeldung.testsuite")
+@IncludeTags("slow")
+public class JUnitTestIncludeTagsSuite {
+    // runs ClassTwoUnitTest
+}
\ No newline at end of file
diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/extensions/tempdir/TemporaryDirectoryWithCleanupUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/extensions/tempdir/TemporaryDirectoryWithCleanupUnitTest.java
new file mode 100644
index 0000000000..739212ec04
--- /dev/null
+++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/extensions/tempdir/TemporaryDirectoryWithCleanupUnitTest.java
@@ -0,0 +1,36 @@
+package com.baeldung.extensions.tempdir;
+
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.nio.file.Path;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.io.CleanupMode.NEVER;
+
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class TemporaryDirectoryWithCleanupUnitTest {
+
+    private Path theTempDirToBeChecked = null;
+
+    @Test
+    @Order(1)
+    void whenTestMethodWithTempDirNeverCleanup_thenSetInstanceVariable(@TempDir(cleanup = NEVER) Path tempDir) {
+        theTempDirToBeChecked = tempDir;
+        System.out.println(tempDir.toFile().getAbsolutePath());
+    }
+
+    @Test
+    @Order(2)
+    void whenTestMethodWithTempDirNeverCleanup_thenTempDirShouldNotBeRemoved() {
+        assertNotNull(theTempDirToBeChecked);
+        assertTrue(theTempDirToBeChecked.toFile().isDirectory());
+    }
+
+}
\ No newline at end of file
diff --git a/testing-modules/junit5-annotations/README.md b/testing-modules/junit5-annotations/README.md
index 49d596607c..53e409151b 100644
--- a/testing-modules/junit5-annotations/README.md
+++ b/testing-modules/junit5-annotations/README.md
@@ -9,3 +9,4 @@ This module contains articles about JUnit 5 Annotations
 - [Guide to JUnit 5 Parameterized Tests](https://www.baeldung.com/parameterized-tests-junit-5)
 - [Writing Templates for Test Cases Using JUnit 5](https://www.baeldung.com/junit5-test-templates)
 - [JUnit 5 @Nested Test Classes](https://www.baeldung.com/junit-5-nested-test-classes)
+- [A Guide to @Timeout Annotation in JUnit 5](https://www.baeldung.com/java-junit-5-timeout-annotation)
diff --git a/testing-modules/junit5-annotations/pom.xml b/testing-modules/junit5-annotations/pom.xml
index a4035a23f1..847baa827c 100644
--- a/testing-modules/junit5-annotations/pom.xml
+++ b/testing-modules/junit5-annotations/pom.xml
@@ -15,6 +15,12 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-engine</artifactId>
@@ -39,7 +45,7 @@
     </dependencies>
 
     <properties>
-        <log4j2.version>2.17.1</log4j2.version>
+        <log4j2.version>2.19.0</log4j2.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/testing-modules/junit5-annotations/src/test/java/com/baeldung/junit5/conditional/ConditionalAnnotationsUnitTest.java b/testing-modules/junit5-annotations/src/test/java/com/baeldung/junit5/conditional/ConditionalAnnotationsUnitTest.java
index 0d4013116f..f4d0807dc3 100644
--- a/testing-modules/junit5-annotations/src/test/java/com/baeldung/junit5/conditional/ConditionalAnnotationsUnitTest.java
+++ b/testing-modules/junit5-annotations/src/test/java/com/baeldung/junit5/conditional/ConditionalAnnotationsUnitTest.java
@@ -2,18 +2,7 @@ package com.baeldung.junit5.conditional;
 
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledForJreRange;
-import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-import org.junit.jupiter.api.condition.DisabledOnJre;
-import org.junit.jupiter.api.condition.DisabledOnOs;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
-import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-import org.junit.jupiter.api.condition.EnabledOnJre;
-import org.junit.jupiter.api.condition.EnabledOnOs;
-import org.junit.jupiter.api.condition.JRE;
-import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.condition.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,6 +33,18 @@ public class ConditionalAnnotationsUnitTest {
         LOGGER.debug("runs with java 10 and 11");
     }
 
+    @Test
+    @EnabledInNativeImage
+    void shouldOnlyRunWithinNativeImage() {
+        LOGGER.debug("Should run only within native images.");
+    }
+
+    @Test
+    @DisabledInNativeImage
+    void shouldNeverRunWithinNativeImage() {
+        LOGGER.debug("Shouldn't run within native images.");
+    }
+
     @Test
     @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_13)
     public void shouldOnlyRunOnJava8UntilJava13() {
diff --git a/testing-modules/junit5-annotations/src/test/java/com/baeldung/junit5/timeout/TimeoutUnitTest.java b/testing-modules/junit5-annotations/src/test/java/com/baeldung/junit5/timeout/TimeoutUnitTest.java
new file mode 100644
index 0000000000..b952dcf09f
--- /dev/null
+++ b/testing-modules/junit5-annotations/src/test/java/com/baeldung/junit5/timeout/TimeoutUnitTest.java
@@ -0,0 +1,79 @@
+package com.baeldung.junit5.timeout;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.util.concurrent.TimeUnit;
+
+
+@Timeout(5)
+class TimeoutUnitTest {
+
+	@Test
+	@Timeout(1)
+	void shouldFailAfterOneSecond() {
+		slowMethod();
+	}
+
+	@Test
+	@Timeout(value = 5, unit = TimeUnit.MINUTES, threadMode = Timeout.ThreadMode.SEPARATE_THREAD)
+	void shouldUseADifferentThread() {
+		System.out.println(Thread.currentThread().getName());
+		slowMethod();
+	}
+
+	@Test
+	void shouldFailAfterDefaultTimeoutOfFiveSeconds() {
+		slowMethod();
+	}
+
+	@Test
+	@Timeout(value = 2, unit = TimeUnit.MINUTES)
+	void shouldFailAfterTwoMinutes() {
+		slowMethod();
+	}
+
+	@Timeout(1)
+	@ParameterizedTest
+	@ValueSource(ints = {1, 2, 3, 4, 5})
+	void eachTestShouldFailAfterOneSecond(int input) {
+		slowMethod();
+	}
+
+	@Nested
+	class NestedClassWithoutTimeout {
+		@Test
+		void shouldFailAfterParentsDefaultTimeoutOfFiveSeconds() {
+			slowMethod();
+		}
+	}
+
+	@Nested
+	@Timeout(3)
+	class NestedClassWithTimeout {
+
+		@Test
+		void shouldFailAfterNestedClassTimeoutOfThreeSeconds() {
+			slowMethod();
+		}
+
+		@Test
+		@Timeout(1)
+		void shouldFailAfterOneSecond() {
+			slowMethod();
+		}
+	}
+
+	private void slowMethod() {
+		try {
+//			Thread.sleep(10_000);
+//			just for demonstration purposes
+//			tests cannot fail on the pipeline, bue we need failing examples in the article
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+}
diff --git a/testing-modules/mockito-simple/pom.xml b/testing-modules/mockito-simple/pom.xml
index 3bfca2db2a..29c7966a08 100644
--- a/testing-modules/mockito-simple/pom.xml
+++ b/testing-modules/mockito-simple/pom.xml
@@ -57,7 +57,7 @@
     <properties>
         <spring-framework.version>5.3.20</spring-framework.version>
         <!-- testing -->
-        <mockito.version>4.6.1</mockito.version>
+        <mockito.version>4.8.0</mockito.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockFinalsUnitTest.java b/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockFinalsUnitTest.java
index a4b2bd03b4..8abd51bb85 100644
--- a/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockFinalsUnitTest.java
+++ b/testing-modules/mockito-simple/src/test/java/com/baeldung/mockito/MockFinalsUnitTest.java
@@ -3,8 +3,10 @@ package com.baeldung.mockito;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.withSettings;
 
 import org.junit.jupiter.api.Test;
+import org.mockito.MockMakers;
 
 class MockFinalsUnitTest {
 
@@ -29,4 +31,14 @@ class MockFinalsUnitTest {
 
         assertThat(mock.size()).isNotEqualTo(finalList.size());
     }
+
+    @Test
+    public void whenMockFinalMethodMockWorks_withInlineMockMaker() {
+        MyList myList = new MyList();
+
+        MyList mock = mock(MyList.class, withSettings().mockMaker(MockMakers.INLINE));
+        when(mock.finalMethod()).thenReturn(1);
+
+        assertThat(mock.finalMethod()).isNotEqualTo(myList.finalMethod());
+    }
 }
diff --git a/testing-modules/pom.xml b/testing-modules/pom.xml
index 64546b5064..8fb7a93a02 100644
--- a/testing-modules/pom.xml
+++ b/testing-modules/pom.xml
@@ -40,6 +40,7 @@
         <module>rest-assured</module>
         <module>rest-testing</module>
         <module>selenium-junit-testng</module>
+        <module>selenium-webdriver</module>
         <module>spring-mockito</module>
         <module>spring-testing-2</module>
         <module>spring-testing</module>
@@ -51,6 +52,7 @@
         <module>xmlunit-2</module>
         <module>zerocode</module>
         <module>mockito-2</module>
+        <module>gatling-java</module>
     </modules>
 
 </project>
\ No newline at end of file
diff --git a/testing-modules/selenium-junit-testng/README.md b/testing-modules/selenium-junit-testng/README.md
index 65eb269056..e262fb326f 100644
--- a/testing-modules/selenium-junit-testng/README.md
+++ b/testing-modules/selenium-junit-testng/README.md
@@ -8,6 +8,9 @@
 - [Running Selenium Scripts with JMeter](https://www.baeldung.com/selenium-jmeter)
 - [Fixing Selenium WebDriver Executable Path Error](https://www.baeldung.com/java-selenium-webdriver-path-error)
 - [Handle Browser Tabs With Selenium](https://www.baeldung.com/java-handle-browser-tabs-selenium)
+- [Implicit Wait vs Explicit Wait in Selenium Webdriver](https://www.baeldung.com/selenium-implicit-explicit-wait)
+- [StaleElementReferenceException in Selenium](https://www.baeldung.com/selenium-staleelementreferenceexception)
+- [Retrieve the Value of an HTML Input in Selenium WebDriver](https://www.baeldung.com/java-selenium-html-input-value)
 
 #### Notes:
 - to run the live tests for the article *Fixing Selenium WebDriver Executable Path Error*, follow the manual setup described 
diff --git a/testing-modules/selenium-junit-testng/pom.xml b/testing-modules/selenium-junit-testng/pom.xml
index f0a2e43eeb..517dc48dde 100644
--- a/testing-modules/selenium-junit-testng/pom.xml
+++ b/testing-modules/selenium-junit-testng/pom.xml
@@ -57,9 +57,9 @@
 
     <properties>
         <testng.version>6.10</testng.version>
-        <selenium-java.version>4.6.0</selenium-java.version>
+        <selenium-java.version>4.8.3</selenium-java.version>
         <ashot.version>1.5.4</ashot.version>
-        <webdrivermanager.version>5.3.0</webdrivermanager.version>
+        <webdrivermanager.version>5.3.2</webdrivermanager.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/stale/RobustWebDriver.java b/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/stale/RobustWebDriver.java
new file mode 100644
index 0000000000..211480dce3
--- /dev/null
+++ b/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/stale/RobustWebDriver.java
@@ -0,0 +1,86 @@
+package com.baeldung.selenium.stale;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class RobustWebDriver implements WebDriver {
+
+    private final WebDriver originalWebDriver;
+
+    public RobustWebDriver(WebDriver webDriver) {
+        this.originalWebDriver = webDriver;
+    }
+
+    @Override
+    public void get(String url) {
+        this.originalWebDriver.get(url);
+    }
+
+    @Override
+    public String getCurrentUrl() {
+        return this.originalWebDriver.getCurrentUrl();
+    }
+
+    @Override
+    public String getTitle() {
+        return this.originalWebDriver.getTitle();
+    }
+
+    @Override
+    public List<WebElement> findElements(By by) {
+        return this.originalWebDriver.findElements(by)
+                .stream().map(e -> new RobustWebElement(e, by, this))
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public WebElement findElement(By by) {
+        return new RobustWebElement(this.originalWebDriver.findElement(by), by, this);
+    }
+
+    @Override
+    public String getPageSource() {
+        return this.originalWebDriver.getPageSource();
+    }
+
+    @Override
+    public void close() {
+        this.originalWebDriver.close();
+
+    }
+
+    @Override
+    public void quit() {
+        this.originalWebDriver.quit();
+    }
+
+    @Override
+    public Set<String> getWindowHandles() {
+        return this.originalWebDriver.getWindowHandles();
+    }
+
+    @Override
+    public String getWindowHandle() {
+        return this.originalWebDriver.getWindowHandle();
+    }
+
+    @Override
+    public TargetLocator switchTo() {
+        return this.originalWebDriver.switchTo();
+    }
+
+    @Override
+    public Navigation navigate() {
+        return this.originalWebDriver.navigate();
+    }
+
+    @Override
+    public Options manage() {
+        return this.originalWebDriver.manage();
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/stale/RobustWebElement.java b/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/stale/RobustWebElement.java
new file mode 100644
index 0000000000..fa65e60349
--- /dev/null
+++ b/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/stale/RobustWebElement.java
@@ -0,0 +1,176 @@
+package com.baeldung.selenium.stale;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.Dimension;
+import org.openqa.selenium.OutputType;
+import org.openqa.selenium.Point;
+import org.openqa.selenium.Rectangle;
+import org.openqa.selenium.StaleElementReferenceException;
+import org.openqa.selenium.WebDriverException;
+import org.openqa.selenium.WebElement;
+
+import java.util.List;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+public class RobustWebElement implements WebElement {
+
+    private WebElement originalElement;
+    private final RobustWebDriver driver;
+    private final By by;
+
+    private static final int MAX_RETRIES = 10;
+    private static final String SERE = "Element is no longer attached to the DOM";
+
+    public RobustWebElement(WebElement element, By by, RobustWebDriver driver) {
+        this.originalElement = element;
+        this.by = by;
+        this.driver = driver;
+    }
+
+    @Override
+    public void click() {
+        executeMethodWithRetries(WebElement::click);
+    }
+
+    @Override
+    public void submit() {
+        executeMethodWithRetries(WebElement::submit);
+    }
+
+    @Override
+    public void sendKeys(CharSequence... keysToSend) {
+        executeMethodWithRetriesVoid(WebElement::sendKeys, keysToSend);
+    }
+
+    @Override
+    public void clear() {
+        executeMethodWithRetries(WebElement::clear);
+    }
+
+    @Override
+    public String getTagName() {
+        return executeMethodWithRetries(WebElement::getTagName);
+    }
+
+    @Override
+    public String getAttribute(String name) {
+        return executeMethodWithRetries(WebElement::getAttribute, name);
+    }
+
+    @Override
+    public boolean isSelected() {
+        return executeMethodWithRetries(WebElement::isSelected);
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return executeMethodWithRetries(WebElement::isEnabled);
+    }
+
+    @Override
+    public String getText() {
+        return executeMethodWithRetries(WebElement::getText);
+    }
+
+    @Override
+    public List<WebElement> findElements(By by) {
+        return executeMethodWithRetries(WebElement::findElements, by);
+    }
+
+    @Override
+    public WebElement findElement(By by) {
+        return executeMethodWithRetries(WebElement::findElement, by);
+    }
+
+    @Override
+    public boolean isDisplayed() {
+        return executeMethodWithRetries(WebElement::isDisplayed);
+    }
+
+    @Override
+    public Point getLocation() {
+        return executeMethodWithRetries(WebElement::getLocation);
+    }
+
+    @Override
+    public Dimension getSize() {
+        return executeMethodWithRetries(WebElement::getSize);
+    }
+
+    @Override
+    public Rectangle getRect() {
+        return executeMethodWithRetries(WebElement::getRect);
+    }
+
+    @Override
+    public String getCssValue(String propertyName) {
+        return executeMethodWithRetries(WebElement::getCssValue, propertyName);
+    }
+
+
+    @Override
+    public <X> X getScreenshotAs(OutputType<X> target) throws WebDriverException {
+        return executeMethodWithRetries(WebElement::getScreenshotAs, target);
+    }
+
+    private void executeMethodWithRetries(Consumer<WebElement> method) {
+        int retries = 0;
+        while (retries < MAX_RETRIES) {
+            try {
+                WebElementUtils.callMethod(originalElement, method);
+                return;
+            } catch (StaleElementReferenceException ex) {
+                refreshElement();
+            }
+            retries++;
+        }
+        throw new StaleElementReferenceException(SERE);
+    }
+
+    private <T> T executeMethodWithRetries(Function<WebElement, T> method) {
+        int retries = 0;
+        while (retries < MAX_RETRIES) {
+            try {
+                return WebElementUtils.callMethodWithReturn(originalElement, method);
+            } catch (StaleElementReferenceException ex) {
+                refreshElement();
+            }
+            retries++;
+        }
+        throw new StaleElementReferenceException(SERE);
+    }
+
+    private <U> void executeMethodWithRetriesVoid(BiConsumer<WebElement, U> method, U parameter) {
+        int retries = 0;
+        while (retries < MAX_RETRIES) {
+            try {
+                WebElementUtils.callMethod(originalElement, method, parameter);
+                return;
+            } catch (StaleElementReferenceException ex) {
+                refreshElement();
+            }
+            retries++;
+        }
+        throw new StaleElementReferenceException(SERE);
+    }
+
+    private <T, U> T executeMethodWithRetries(BiFunction<WebElement, U, T> method, U parameter) {
+        int retries = 0;
+        while (retries < MAX_RETRIES) {
+            try {
+                return WebElementUtils.callMethodWithReturn(originalElement, method, parameter);
+            } catch (StaleElementReferenceException ex) {
+                refreshElement();
+            }
+            retries++;
+        }
+        throw new StaleElementReferenceException(SERE);
+    }
+
+    private void refreshElement() {
+        this.originalElement = driver.findElement(by);
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/stale/WebElementUtils.java b/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/stale/WebElementUtils.java
new file mode 100644
index 0000000000..460cc02bf5
--- /dev/null
+++ b/testing-modules/selenium-junit-testng/src/main/java/com/baeldung/selenium/stale/WebElementUtils.java
@@ -0,0 +1,30 @@
+package com.baeldung.selenium.stale;
+
+import org.openqa.selenium.WebElement;
+
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+public class WebElementUtils {
+
+    private WebElementUtils(){
+    }
+
+    public static void callMethod(WebElement element, Consumer<WebElement> method) {
+        method.accept(element);
+    }
+
+    public static <U> void callMethod(WebElement element, BiConsumer<WebElement, U> method, U parameter) {
+        method.accept(element, parameter);
+    }
+
+    public static <T> T callMethodWithReturn(WebElement element, Function<WebElement, T> method) {
+        return method.apply(element);
+    }
+
+    public static <T, U> T callMethodWithReturn(WebElement element, BiFunction<WebElement, U, T> method, U parameter) {
+        return method.apply(element, parameter);
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/stale/RobustWebElementLiveTest.java b/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/stale/RobustWebElementLiveTest.java
new file mode 100644
index 0000000000..3dea95ca82
--- /dev/null
+++ b/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/stale/RobustWebElementLiveTest.java
@@ -0,0 +1,58 @@
+package com.baeldung.selenium.stale;
+
+import io.github.bonigarcia.wdm.WebDriverManager;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.chrome.ChromeOptions;
+
+import java.time.Duration;
+
+final class RobustWebElementLiveTest {
+
+    private static RobustWebDriver driver;
+    private static final int TIMEOUT = 10;
+
+    private static final By LOCATOR_REFRESH = By.xpath("//a[.='click here']");
+    private static final By LOCATOR_DYNAMIC_CONTENT = By.xpath(
+            "(//div[@id='content']//div[@class='large-10 columns'])[1]");
+
+    private static void setupChromeDriver() {
+        WebDriverManager.chromedriver().setup();
+        final ChromeOptions options = new ChromeOptions();
+        options.addArguments("--remote-allow-origins=*");
+        driver = new RobustWebDriver(new ChromeDriver(options));
+        options();
+    }
+
+    private static void options() {
+        driver.manage().window().maximize();
+        driver.manage().timeouts().implicitlyWait(Duration.ofSeconds(TIMEOUT));
+    }
+
+    @BeforeEach
+    public void init() {
+        setupChromeDriver();
+    }
+
+    @Test
+    void givenDynamicPage_whenRefreshingAndAccessingSavedElement_thenOK() {
+        driver.navigate().to("https://the-internet.herokuapp.com/dynamic_content?with_content=static");
+        final WebElement element = driver.findElement(LOCATOR_DYNAMIC_CONTENT);
+
+        driver.findElement(LOCATOR_REFRESH).click();
+        Assertions.assertDoesNotThrow(element::getText);
+    }
+
+    @AfterEach
+    void teardown() {
+        if (driver != null) {
+            driver.quit();
+            driver = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/stale/StaleElementReferenceLiveTest.java b/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/stale/StaleElementReferenceLiveTest.java
new file mode 100644
index 0000000000..9b42571891
--- /dev/null
+++ b/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/stale/StaleElementReferenceLiveTest.java
@@ -0,0 +1,102 @@
+package com.baeldung.selenium.stale;
+
+import io.github.bonigarcia.wdm.WebDriverManager;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.StaleElementReferenceException;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.chrome.ChromeOptions;
+
+import java.time.Duration;
+
+final class StaleElementReferenceLiveTest {
+
+    private static WebDriver driver;
+    private static final int TIMEOUT = 10;
+
+    private static final By LOCATOR_REFRESH = By.xpath("//a[.='click here']");
+    private static final By LOCATOR_DYNAMIC_CONTENT = By.xpath(
+            "(//div[@id='content']//div[@class='large-10 columns'])[1]");
+
+    private static void setupChromeDriver() {
+        WebDriverManager.chromedriver().setup();
+        final ChromeOptions options = new ChromeOptions();
+        options.addArguments("--remote-allow-origins=*");
+        driver = new ChromeDriver(options);
+        options();
+    }
+
+    private static void options() {
+        driver.manage().window().maximize();
+        driver.manage().timeouts().implicitlyWait(Duration.ofSeconds(TIMEOUT));
+    }
+
+    @BeforeEach
+    public void init() {
+        setupChromeDriver();
+    }
+
+    @Test
+    void givenDynamicPage_whenRefreshingAndAccessingSavedElement_thenSERE() {
+        driver.navigate().to("https://the-internet.herokuapp.com/dynamic_content?with_content=static");
+        final WebElement element = driver.findElement(LOCATOR_DYNAMIC_CONTENT);
+
+        driver.findElement(LOCATOR_REFRESH).click();
+        Assertions.assertThrows(StaleElementReferenceException.class, element::getText);
+    }
+
+    @Test
+    void givenDynamicPage_whenRefreshingAndAccessingSavedElement_thenHandleSERE() {
+        driver.navigate().to("https://the-internet.herokuapp.com/dynamic_content?with_content=static");
+        final WebElement element = driver.findElement(LOCATOR_DYNAMIC_CONTENT);
+
+        if (!retryingFindClick(LOCATOR_REFRESH)) {
+            Assertions.fail("Element is still stale after 5 attempts");
+        }
+        Assertions.assertDoesNotThrow(() -> retryingFindGetText(LOCATOR_DYNAMIC_CONTENT));
+    }
+
+    private boolean retryingFindClick(By locator) {
+        boolean result = false;
+        int attempts = 0;
+        while (attempts < 5) {
+            try {
+                driver.findElement(locator).click();
+                result = true;
+                break;
+            } catch (StaleElementReferenceException ex) {
+                System.out.println(ex.getMessage());
+            }
+            attempts++;
+        }
+        return result;
+    }
+
+    private String retryingFindGetText(By locator) {
+        String result = null;
+        int attempts = 0;
+        while (attempts < 5) {
+            try {
+                result = driver.findElement(locator).getText();
+                break;
+            } catch (StaleElementReferenceException ex) {
+                System.out.println(ex.getMessage());
+            }
+            attempts++;
+        }
+        return result;
+    }
+
+    @AfterEach
+    void teardown() {
+        if (driver != null) {
+            driver.quit();
+            driver = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/wait/ExplicitWaitLiveTest.java b/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/wait/ExplicitWaitLiveTest.java
new file mode 100644
index 0000000000..65943fbf5e
--- /dev/null
+++ b/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/wait/ExplicitWaitLiveTest.java
@@ -0,0 +1,79 @@
+package com.baeldung.selenium.wait;
+
+import io.github.bonigarcia.wdm.WebDriverManager;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.ElementNotInteractableException;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.chrome.ChromeOptions;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.WebDriverWait;
+
+import java.time.Duration;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+final class ExplicitWaitLiveTest {
+
+    private static WebDriver driver;
+    private static WebDriverWait wait;
+    private static final int TIMEOUT = 10;
+
+    private static final By LOCATOR_ABOUT = By.xpath("//a[starts-with(., 'About')]");
+    private static final By LOCATOR_ABOUT_BAELDUNG = By.xpath("//h3[normalize-space()='About Baeldung']");
+    private static final By LOCATOR_ABOUT_HEADER = By.xpath("//h1");
+
+    private static void setupChromeDriver() {
+        WebDriverManager.chromedriver().setup();
+        final ChromeOptions options = new ChromeOptions();
+        options.addArguments("--remote-allow-origins=*");
+        driver = new ChromeDriver(options);
+        options();
+    }
+
+    private static void options() {
+        driver.manage().window().maximize();
+    }
+
+    @BeforeEach
+    public void init() {
+        setupChromeDriver();
+        wait = new WebDriverWait(driver, Duration.ofSeconds(TIMEOUT));
+    }
+
+    @Test
+    void givenPage_whenNavigatingWithoutExplicitWait_thenElementNotInteractable() {
+        driver.navigate().to("https://www.baeldung.com/");
+
+        driver.findElement(LOCATOR_ABOUT).click();
+
+        assertThrows(ElementNotInteractableException.class, () -> driver.findElement(LOCATOR_ABOUT_BAELDUNG).click());
+    }
+
+    @Test
+    void givenPage_whenNavigatingWithExplicitWait_thenOK() {
+        final String expected = "About Baeldung";
+        driver.navigate().to("https://www.baeldung.com/");
+
+        driver.findElement(LOCATOR_ABOUT).click();
+        wait.until(ExpectedConditions.visibilityOfElementLocated(LOCATOR_ABOUT_BAELDUNG));
+
+        driver.findElement(LOCATOR_ABOUT_BAELDUNG).click();
+        wait.until(ExpectedConditions.visibilityOfElementLocated(LOCATOR_ABOUT_HEADER));
+
+        final String actual = driver.findElement(LOCATOR_ABOUT_HEADER).getText();
+        assertEquals(expected, actual);
+    }
+
+    @AfterEach
+    void teardown() {
+        if (driver != null) {
+            driver.quit();
+            driver = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/wait/FluentWaitLiveTest.java b/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/wait/FluentWaitLiveTest.java
new file mode 100644
index 0000000000..c41e5619ac
--- /dev/null
+++ b/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/wait/FluentWaitLiveTest.java
@@ -0,0 +1,83 @@
+package com.baeldung.selenium.wait;
+
+import io.github.bonigarcia.wdm.WebDriverManager;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.ElementNotInteractableException;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.chrome.ChromeOptions;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.FluentWait;
+import org.openqa.selenium.support.ui.Wait;
+
+import java.time.Duration;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+final class FluentWaitLiveTest {
+
+    private static WebDriver driver;
+    private static Wait<WebDriver> wait;
+    private static final int TIMEOUT = 10;
+    private static final int POLL_FREQUENCY = 250;
+
+    private static final By LOCATOR_ABOUT = By.xpath("//a[starts-with(., 'About')]");
+    private static final By LOCATOR_ABOUT_BAELDUNG = By.xpath("//h3[normalize-space()='About Baeldung']");
+    private static final By LOCATOR_ABOUT_HEADER = By.xpath("//h1");
+
+    private static void setupChromeDriver() {
+        WebDriverManager.chromedriver().setup();
+        final ChromeOptions options = new ChromeOptions();
+        options.addArguments("--remote-allow-origins=*");
+        driver = new ChromeDriver(options);
+        options();
+    }
+
+    private static void options() {
+        driver.manage().window().maximize();
+    }
+
+    @BeforeEach
+    public void init() {
+        setupChromeDriver();
+        wait = new FluentWait<>(driver)
+                .withTimeout(Duration.ofSeconds(TIMEOUT))
+                .pollingEvery(Duration.ofMillis(POLL_FREQUENCY));
+    }
+
+    @Test
+    void givenPage_whenNavigatingWithoutFluentWait_thenElementNotInteractable() {
+        driver.navigate().to("https://www.baeldung.com/");
+
+        driver.findElement(LOCATOR_ABOUT).click();
+
+        assertThrows(ElementNotInteractableException.class, () -> driver.findElement(LOCATOR_ABOUT_BAELDUNG).click());
+    }
+
+    @Test
+    void givenPage_whenNavigatingWithFluentWait_thenOK() {
+        final String expected = "About Baeldung";
+        driver.navigate().to("https://www.baeldung.com/");
+
+        driver.findElement(LOCATOR_ABOUT).click();
+        wait.until(ExpectedConditions.visibilityOfElementLocated(LOCATOR_ABOUT_BAELDUNG));
+
+        driver.findElement(LOCATOR_ABOUT_BAELDUNG).click();
+        wait.until(ExpectedConditions.visibilityOfElementLocated(LOCATOR_ABOUT_HEADER));
+
+        final String actual = driver.findElement(LOCATOR_ABOUT_HEADER).getText();
+        assertEquals(expected, actual);
+    }
+
+    @AfterEach
+    void teardown() {
+        if (driver != null) {
+            driver.quit();
+            driver = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/wait/ImplicitWaitLiveTest.java b/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/wait/ImplicitWaitLiveTest.java
new file mode 100644
index 0000000000..86c401e13a
--- /dev/null
+++ b/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/wait/ImplicitWaitLiveTest.java
@@ -0,0 +1,63 @@
+package com.baeldung.selenium.wait;
+
+
+import io.github.bonigarcia.wdm.WebDriverManager;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.chrome.ChromeOptions;
+
+import java.time.Duration;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+final class ImplicitWaitLiveTest {
+
+    private static WebDriver driver;
+    private static final int TIMEOUT = 10;
+
+    private static final By LOCATOR_ABOUT = By.xpath("//a[starts-with(., 'About')]");
+    private static final By LOCATOR_ABOUT_BAELDUNG = By.xpath("//h3[normalize-space()='About Baeldung']");
+    private static final By LOCATOR_ABOUT_HEADER = By.xpath("//h1");
+
+    private static void setupChromeDriver() {
+        WebDriverManager.chromedriver().setup();
+        final ChromeOptions options = new ChromeOptions();
+        options.addArguments("--remote-allow-origins=*");
+        driver = new ChromeDriver(options);
+        options();
+    }
+
+    private static void options() {
+        driver.manage().window().maximize();
+        driver.manage().timeouts().implicitlyWait(Duration.ofSeconds(TIMEOUT));
+    }
+
+    @BeforeEach
+    public void init() {
+        setupChromeDriver();
+    }
+
+    @Test
+    void givenPage_whenNavigatingWithImplicitWait_ThenOK() {
+        final String expected = "About Baeldung";
+        driver.navigate().to("https://www.baeldung.com/");
+
+        driver.findElement(LOCATOR_ABOUT).click();
+        driver.findElement(LOCATOR_ABOUT_BAELDUNG).click();
+
+        final String actual = driver.findElement(LOCATOR_ABOUT_HEADER).getText();
+        assertEquals(expected, actual);
+    }
+
+    @AfterEach
+    void teardown() {
+        if (driver != null) {
+            driver.quit();
+            driver = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/webdriver/SeleniumWebDriverUnitTest.java b/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/webdriver/SeleniumWebDriverUnitTest.java
new file mode 100644
index 0000000000..e4e89611d1
--- /dev/null
+++ b/testing-modules/selenium-junit-testng/src/test/java/com/baeldung/selenium/webdriver/SeleniumWebDriverUnitTest.java
@@ -0,0 +1,43 @@
+package com.baeldung.selenium.webdriver;
+
+import org.junit.Assert;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.Keys;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.chrome.ChromeDriver;
+import io.github.bonigarcia.wdm.WebDriverManager;
+
+public class SeleniumWebDriverUnitTest {
+
+    private WebDriver driver;
+
+    private static final String URL = "https://duckduckgo.com/";
+    private static final String INPUT_ID = "search_form_input_homepage";
+
+    @BeforeEach
+    public void setUp() {
+        WebDriverManager.chromedriver().setup();
+        driver = new ChromeDriver();
+    }
+    
+    @AfterEach
+    public void tearDown() {
+        driver.quit();
+    }
+    
+    @Test
+    public void givenDuckDuckGoHomePage_whenInputHelloWorld_thenInputValueIsHelloWorld() {
+        driver.get(URL);
+        WebElement inputElement = driver.findElement(By.id(INPUT_ID));
+        inputElement.sendKeys(Keys.chord(Keys.CONTROL, "a"), Keys.DELETE);
+        inputElement.sendKeys("Hello World!");
+
+        String inputValue = inputElement.getAttribute("value");
+        Assert.assertEquals("Hello World!", inputValue);
+    }
+
+}
diff --git a/testing-modules/selenium-webdriver/1688web.png b/testing-modules/selenium-webdriver/1688web.png
new file mode 100644
index 0000000000..92ae7921fb
Binary files /dev/null and b/testing-modules/selenium-webdriver/1688web.png differ
diff --git a/testing-modules/selenium-webdriver/README.md b/testing-modules/selenium-webdriver/README.md
new file mode 100644
index 0000000000..055144998e
--- /dev/null
+++ b/testing-modules/selenium-webdriver/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [Uploading File Using Selenium Webdriver in Java](https://www.baeldung.com/java-selenium-upload-file)
diff --git a/testing-modules/selenium-webdriver/pom.xml b/testing-modules/selenium-webdriver/pom.xml
new file mode 100644
index 0000000000..4eac847709
--- /dev/null
+++ b/testing-modules/selenium-webdriver/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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>selenium-webdriver</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>selenium-webdriver</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>testing-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-java</artifactId>
+            <version>${selenium-java.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>${testng.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.bonigarcia</groupId>
+            <artifactId>webdrivermanager</artifactId>
+            <version>${webdrivermanager.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <properties>
+        <testng.version>6.10</testng.version>
+        <selenium-java.version>4.8.3</selenium-java.version>
+        <webdrivermanager.version>5.3.2</webdrivermanager.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/testing-modules/selenium-webdriver/src/test/java/com/baeldung/selenium/webdriver/fileupload/FileUploadWebDriverUnitTest.java b/testing-modules/selenium-webdriver/src/test/java/com/baeldung/selenium/webdriver/fileupload/FileUploadWebDriverUnitTest.java
new file mode 100644
index 0000000000..18853ede56
--- /dev/null
+++ b/testing-modules/selenium-webdriver/src/test/java/com/baeldung/selenium/webdriver/fileupload/FileUploadWebDriverUnitTest.java
@@ -0,0 +1,53 @@
+package com.baeldung.selenium.webdriver.fileupload;
+
+import org.junit.Assert;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.openqa.selenium.By;
+
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+
+import org.openqa.selenium.firefox.FirefoxDriver;
+
+import io.github.bonigarcia.wdm.WebDriverManager;
+
+public class FileUploadWebDriverUnitTest {
+
+    private WebDriver driver;
+
+    private static final String URL = "http://www.csm-testcenter.org/test?do=show&subdo=common&test=file_upload";
+    private static final String INPUT_NAME = "file_upload";
+
+    @BeforeEach
+    public void setUp() {
+        WebDriverManager.firefoxdriver()
+          .setup();
+        driver = new FirefoxDriver();
+    }
+
+    @AfterEach
+    public void tearDown() {
+        driver.quit();
+    }
+
+    @Test
+    public void givenFileUploadPage_whenInputFilePath_thenFileUploadEndsWithFilename() {
+        driver.get(URL);
+
+        String filePath = System.getProperty("user.dir") + "/1688web.png";
+        WebElement inputElement = driver.findElement(By.name(INPUT_NAME));
+        WebElement submitButton = driver.findElement(By.name("http_submit"));
+
+        inputElement.sendKeys(filePath);
+
+        String actualFilePath = inputElement.getAttribute("value");
+        String fileName = filePath.substring(filePath.lastIndexOf("/") + 1);
+
+        submitButton.click();
+
+        Assert.assertTrue(actualFilePath.endsWith(fileName));
+    }
+
+}
\ No newline at end of file
diff --git a/testing-modules/spring-testing-2/README.md b/testing-modules/spring-testing-2/README.md
index 5bd1716609..139b25f4b5 100644
--- a/testing-modules/spring-testing-2/README.md
+++ b/testing-modules/spring-testing-2/README.md
@@ -4,3 +4,4 @@
 - [Concurrent Test Execution in Spring 5](https://www.baeldung.com/spring-5-concurrent-tests)
 - [Spring 5 Testing with @EnabledIf Annotation](https://www.baeldung.com/spring-5-enabledif)
 - [The Spring TestExecutionListener](https://www.baeldung.com/spring-testexecutionlistener)
+- [Execute Tests Based on Active Profile With JUnit 5](https://www.baeldung.com/spring-boot-junit-5-testing-active-profile)
diff --git a/testing-modules/spring-testing-2/src/main/java/com/baeldung/activeprofile/ActiveProfileApplication.java b/testing-modules/spring-testing-2/src/main/java/com/baeldung/activeprofile/ActiveProfileApplication.java
new file mode 100644
index 0000000000..19fdff2a0c
--- /dev/null
+++ b/testing-modules/spring-testing-2/src/main/java/com/baeldung/activeprofile/ActiveProfileApplication.java
@@ -0,0 +1,12 @@
+package com.baeldung.activeprofile;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class ActiveProfileApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ActiveProfileApplication.class);
+    }
+}
diff --git a/testing-modules/spring-testing-2/src/test/java/com/baeldung/activeprofile/DevActiveProfileUnitTest.java b/testing-modules/spring-testing-2/src/test/java/com/baeldung/activeprofile/DevActiveProfileUnitTest.java
new file mode 100644
index 0000000000..dcefddbc3c
--- /dev/null
+++ b/testing-modules/spring-testing-2/src/test/java/com/baeldung/activeprofile/DevActiveProfileUnitTest.java
@@ -0,0 +1,18 @@
+package com.baeldung.activeprofile;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest(classes = ActiveProfileApplication.class)
+public class DevActiveProfileUnitTest {
+
+    @Value("${profile.property.value}")
+    private String propertyString;
+
+    @Test
+    void whenDevIsActive_thenValueShouldBeKeptFromApplicationYaml() {
+        Assertions.assertEquals("This the the application.yaml file", propertyString);
+    }
+}
diff --git a/testing-modules/spring-testing-2/src/test/java/com/baeldung/activeprofile/MultipleActiveProfileUnitTest.java b/testing-modules/spring-testing-2/src/test/java/com/baeldung/activeprofile/MultipleActiveProfileUnitTest.java
new file mode 100644
index 0000000000..f84d0e36b4
--- /dev/null
+++ b/testing-modules/spring-testing-2/src/test/java/com/baeldung/activeprofile/MultipleActiveProfileUnitTest.java
@@ -0,0 +1,27 @@
+package com.baeldung.activeprofile;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.core.env.Environment;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit.jupiter.EnabledIf;
+
+@SpringBootTest(classes = ActiveProfileApplication.class)
+@EnabledIf(value = "#{{'test', 'prod'}.contains(environment.getActiveProfiles()[0])}", loadContext = true)
+@ActiveProfiles(value = "test")
+public class MultipleActiveProfileUnitTest {
+    @Value("${profile.property.value}")
+    private String propertyString;
+
+    @Autowired
+    private Environment env;
+
+    @Test
+    void whenDevIsActive_thenValueShouldBeKeptFromDedicatedApplicationYaml() {
+        String currentProfile = env.getActiveProfiles()[0];
+        Assertions.assertEquals(String.format("This the the application-%s.yaml file", currentProfile), propertyString);
+    }
+}
diff --git a/testing-modules/spring-testing-2/src/test/java/com/baeldung/activeprofile/ProdActiveProfileUnitTest.java b/testing-modules/spring-testing-2/src/test/java/com/baeldung/activeprofile/ProdActiveProfileUnitTest.java
new file mode 100644
index 0000000000..8427f23960
--- /dev/null
+++ b/testing-modules/spring-testing-2/src/test/java/com/baeldung/activeprofile/ProdActiveProfileUnitTest.java
@@ -0,0 +1,23 @@
+package com.baeldung.activeprofile;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit.jupiter.EnabledIf;
+
+@SpringBootTest(classes = ActiveProfileApplication.class)
+@EnabledIf(value = "#{environment.getActiveProfiles()[0] == 'prod'}", loadContext = true)
+@ActiveProfiles(value = "prod")
+public class ProdActiveProfileUnitTest {
+
+    @Value("${profile.property.value}")
+    private String propertyString;
+
+    @Test
+    void whenProdIsActive_thenValueShouldBeKeptFromApplicationProdYaml() {
+        Assertions.assertEquals("This the the application-prod.yaml file", propertyString);
+    }
+
+}
diff --git a/testing-modules/spring-testing-2/src/test/java/com/baeldung/activeprofile/TestActiveProfileUnitTest.java b/testing-modules/spring-testing-2/src/test/java/com/baeldung/activeprofile/TestActiveProfileUnitTest.java
new file mode 100644
index 0000000000..f17df37050
--- /dev/null
+++ b/testing-modules/spring-testing-2/src/test/java/com/baeldung/activeprofile/TestActiveProfileUnitTest.java
@@ -0,0 +1,20 @@
+package com.baeldung.activeprofile;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+
+@SpringBootTest(classes = ActiveProfileApplication.class)
+@ActiveProfiles(value = "test")
+public class TestActiveProfileUnitTest {
+
+    @Value("${profile.property.value}")
+    private String propertyString;
+
+    @Test
+    void whenTestIsActive_thenValueShouldBeKeptFromApplicationTestYaml() {
+        Assertions.assertEquals("This the the application-test.yaml file", propertyString);
+    }
+}
diff --git a/testing-modules/spring-testing-2/src/test/resources/application-prod.yaml b/testing-modules/spring-testing-2/src/test/resources/application-prod.yaml
new file mode 100644
index 0000000000..98afa0421e
--- /dev/null
+++ b/testing-modules/spring-testing-2/src/test/resources/application-prod.yaml
@@ -0,0 +1,3 @@
+profile:
+  property:
+    value: This the the application-prod.yaml file
\ No newline at end of file
diff --git a/testing-modules/spring-testing-2/src/test/resources/application-test.yaml b/testing-modules/spring-testing-2/src/test/resources/application-test.yaml
new file mode 100644
index 0000000000..5f183a8d7e
--- /dev/null
+++ b/testing-modules/spring-testing-2/src/test/resources/application-test.yaml
@@ -0,0 +1,3 @@
+profile:
+  property:
+    value: This the the application-test.yaml file
\ No newline at end of file
diff --git a/testing-modules/spring-testing-2/src/test/resources/application.yaml b/testing-modules/spring-testing-2/src/test/resources/application.yaml
new file mode 100644
index 0000000000..cf63649116
--- /dev/null
+++ b/testing-modules/spring-testing-2/src/test/resources/application.yaml
@@ -0,0 +1,6 @@
+spring:
+  profiles:
+    active: dev
+profile:
+  property:
+    value: This the the application.yaml file
\ No newline at end of file
diff --git a/vaadin/pom.xml b/vaadin/pom.xml
index aa37a2392a..777ab2551c 100644
--- a/vaadin/pom.xml
+++ b/vaadin/pom.xml
@@ -187,6 +187,7 @@
         <vaadin.widgetset.mode>local</vaadin.widgetset.mode>
         <vaadin.theme>mytheme</vaadin.theme>
         <maven-clean-plugin.version>3.0.0</maven-clean-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/vavr-modules/vavr/src/test/java/com/baeldung/vavr/future/FutureUnitTest.java b/vavr-modules/vavr/src/test/java/com/baeldung/vavr/future/FutureUnitTest.java
index c398cc4095..5c6959e950 100644
--- a/vavr-modules/vavr/src/test/java/com/baeldung/vavr/future/FutureUnitTest.java
+++ b/vavr-modules/vavr/src/test/java/com/baeldung/vavr/future/FutureUnitTest.java
@@ -184,6 +184,6 @@ public class FutureUnitTest {
 
         assertThat(
           errorMessage.get().getMessage())
-          .isEqualTo("String index out of range: -1");
+          .isEqualTo("begin -1, end 5, length 5");
     }
 }
diff --git a/vertx-modules/vertx-and-rxjava/src/test/java/com/baeldung/weather/VertxWithRxJavaIntegrationTest.java b/vertx-modules/vertx-and-rxjava/src/test/java/com/baeldung/weather/VertxWithRxJavaIntegrationTest.java
index a2ddbe5007..d5d58438e2 100644
--- a/vertx-modules/vertx-and-rxjava/src/test/java/com/baeldung/weather/VertxWithRxJavaIntegrationTest.java
+++ b/vertx-modules/vertx-and-rxjava/src/test/java/com/baeldung/weather/VertxWithRxJavaIntegrationTest.java
@@ -45,18 +45,18 @@ public class VertxWithRxJavaIntegrationTest {
         // read the file that contains one city name per line
         fileSystem
           .rxReadFile("cities.txt").toFlowable()
-            .doOnNext(buffer -> log.info("File buffer ---\n{}\n---", buffer))
+            .doOnNext(buffer -> log.debug("File buffer ---\n{}\n---", buffer))
           .flatMap(buffer -> Flowable.fromArray(buffer.toString().split("\\r?\\n")))
-            .doOnNext(city -> log.info("City from file: '{}'", city))
+            .doOnNext(city -> log.debug("City from file: '{}'", city))
           .filter(city -> !city.startsWith("#"))
-            .doOnNext(city -> log.info("City that survived filtering: '{}'", city))
+            .doOnNext(city -> log.debug("City that survived filtering: '{}'", city))
           .flatMap(city -> searchByCityName(httpClient, city))
           .flatMap(HttpClientResponse::toFlowable)
-            .doOnNext(buffer -> log.info("JSON of city detail: '{}'", buffer))
+            .doOnNext(buffer -> log.debug("JSON of city detail: '{}'", buffer))
           .map(extractingWoeid())
           .flatMap(cityId -> getDataByPlaceId(httpClient, cityId))
           .flatMap(toBufferFlowable())
-            .doOnNext(buffer -> log.info("JSON of place detail: '{}'", buffer))
+            .doOnNext(buffer -> log.debug("JSON of place detail: '{}'", buffer))
           .map(Buffer::toJsonObject)
           .map(toCityAndDayLength())
           .subscribe(System.out::println, Throwable::printStackTrace);
diff --git a/web-modules/apache-tapestry/pom.xml b/web-modules/apache-tapestry/pom.xml
index 7746520a56..9632dd70dc 100644
--- a/web-modules/apache-tapestry/pom.xml
+++ b/web-modules/apache-tapestry/pom.xml
@@ -115,6 +115,18 @@
                     </systemProperties>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -133,11 +145,11 @@
 
     <properties>
         <compiler.jetty.version>6.1.16</compiler.jetty.version>
-        <compiler.surefire.version>2.7.2</compiler.surefire.version>
-        <compiler.plugin.version>2.3.2</compiler.plugin.version>
-        <source.version>1.8</source.version>
-        <target.version>1.8</target.version>
-        <tapestry-release-version>5.4.5</tapestry-release-version>
+        <compiler.surefire.version>3.0.0-M5</compiler.surefire.version>
+        <compiler.plugin.version>3.8.1</compiler.plugin.version>
+        <source.version>11</source.version>
+        <target.version>11</target.version>
+        <tapestry-release-version>5.8.2</tapestry-release-version>
         <servlet-api-release-version>2.5</servlet-api-release-version>
         <testng-release-version>6.8.21</testng-release-version>
         <slf4j-release-version>1.7.19</slf4j-release-version>
diff --git a/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/AppModule.java b/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/AppModule.java
index c4d57d5b86..2798e4a75b 100644
--- a/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/AppModule.java
+++ b/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/AppModule.java
@@ -3,17 +3,17 @@ package com.baeldung.tapestry.services;
 import java.io.IOException;
 
 import org.apache.tapestry5.SymbolConstants;
-import org.apache.tapestry5.ioc.MappedConfiguration;
-import org.apache.tapestry5.ioc.OrderedConfiguration;
+import org.apache.tapestry5.commons.MappedConfiguration;
+import org.apache.tapestry5.commons.OrderedConfiguration;
+import org.apache.tapestry5.http.services.Request;
+import org.apache.tapestry5.http.services.RequestFilter;
+import org.apache.tapestry5.http.services.RequestHandler;
+import org.apache.tapestry5.http.services.Response;
 import org.apache.tapestry5.ioc.ServiceBinder;
 import org.apache.tapestry5.ioc.annotations.Contribute;
 import org.apache.tapestry5.ioc.annotations.Local;
 import org.apache.tapestry5.ioc.services.ApplicationDefaults;
 import org.apache.tapestry5.ioc.services.SymbolProvider;
-import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.RequestFilter;
-import org.apache.tapestry5.services.RequestHandler;
-import org.apache.tapestry5.services.Response;
 import org.slf4j.Logger;
 
 /**
diff --git a/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/DevelopmentModule.java b/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/DevelopmentModule.java
index d9c8493e39..1c89587c53 100644
--- a/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/DevelopmentModule.java
+++ b/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/DevelopmentModule.java
@@ -1,7 +1,7 @@
 package com.baeldung.tapestry.services;
 
 import org.apache.tapestry5.SymbolConstants;
-import org.apache.tapestry5.ioc.MappedConfiguration;
+import org.apache.tapestry5.commons.MappedConfiguration;
 
 /**
  * This module is automatically included as part of the Tapestry IoC Registry if <em>tapestry.execution-mode</em>
diff --git a/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/QaModule.java b/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/QaModule.java
index fc6fb595e9..d16e498a4b 100644
--- a/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/QaModule.java
+++ b/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/QaModule.java
@@ -1,7 +1,7 @@
 package com.baeldung.tapestry.services;
 
 import org.apache.tapestry5.SymbolConstants;
-import org.apache.tapestry5.ioc.MappedConfiguration;
+import org.apache.tapestry5.commons.MappedConfiguration;
 import org.apache.tapestry5.ioc.ServiceBinder;
 
 /**
diff --git a/web-modules/jakarta-ee/pom.xml b/web-modules/jakarta-ee/pom.xml
index 82993103c8..066bc14766 100644
--- a/web-modules/jakarta-ee/pom.xml
+++ b/web-modules/jakarta-ee/pom.xml
@@ -78,8 +78,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <plugin>