diff --git a/.github/ISSUE_TEMPLATE/issue_report.md b/.github/ISSUE_TEMPLATE/issue_report.md
new file mode 100644
index 0000000000..4bc8c8121c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue_report.md
@@ -0,0 +1,32 @@
+---
+name: Issue Report
+about: Report an issue to help us improve
+title: '[ISSUE] '
+---
+
+**Article and Module Links**
+A link to the affected article and the affected module. You can find the link to the module in the Conclusion section in the "on Github" standard phase.
+
+**Describe the Issue**
+A clear and concise description of what the issue is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected Behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment (please complete the following information):**
+- OS: [e.g. Windows]
+- Browser [e.g. chrome, safari]
+- Version [e.g. 22]
+
+**Additional Context**
+Add any other context about the issue here.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000..642f4c6707
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,11 @@
+# Contributing to Baeldung Tutorials
+First off, thank you for considering contributing to Baeldung Tutorials.
+
+## Reporting Issues
+Before you submit an issue, please review the guidelines below:
+
+1. **No Custom Modifications:** If your issue arises from any custom modifications you've made to the code in the repository, we won't be able to assist. We can only help if the issue is reproducible with the untouched codebase from this repo. If you're working with a modified version, consider asking for help on StackOverflow or other relevant forums.
+2. **Use a clear and descriptive title** for the issue to identify the problem.
+3. **Include a link to the article** you're having issues with.
+4. **Describe the exact steps which reproduce the problem** in as many details as possible.
+5. **Additional Details:** Offer any other context or descriptions that could be useful. Screenshots, error messages, copy/pasteable snippets, or logs can be immensely helpful.
\ No newline at end of file
diff --git a/algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/rotatearray/RotateArray.java b/algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/rotatearray/RotateArray.java
new file mode 100644
index 0000000000..36490d4899
--- /dev/null
+++ b/algorithms-modules/algorithms-miscellaneous-7/src/main/java/com/baeldung/algorithms/rotatearray/RotateArray.java
@@ -0,0 +1,102 @@
+package com.baeldung.algorithms.rotatearray;
+
+/**
+ *  To speed up the rotation, we narrow k rotations to the remainder of k divided by the array length, or k module the array length.
+ *  Therefore, a large rotation number will be translated into the relative smallest rotation.
+ *  All solutions replace the original array, although they might use an extra array to compute the rotation.
+ */
+public class RotateArray {
+
+    private RotateArray() {
+        throw new IllegalStateException("Rotate array algorithm utility methods class");
+    }
+
+    /**
+     *
+     * @param arr array to apply rotation to
+     * @param k number of rotations
+     */
+    public static void bruteForce(int[] arr, int k) {
+        checkInvalidInput(arr, k);
+
+        k %= arr.length;
+        int temp;
+        int previous;
+        for (int i = 0; i < k; i++) {
+            previous = arr[arr.length - 1];
+            for (int j = 0; j < arr.length; j++) {
+                temp = arr[j];
+                arr[j] = previous;
+                previous = temp;
+            }
+        }
+    }
+
+    /**
+     *
+     * @param arr array to apply rotation to
+     * @param k number of rotations
+     */
+    public static void withExtraArray(int[] arr, int k) {
+        checkInvalidInput(arr, k);
+
+        int[] extraArray = new int[arr.length];
+        for (int i = 0; i < arr.length; i++) {
+            extraArray[(i + k) % arr.length] = arr[i];
+        }
+        System.arraycopy(extraArray, 0, arr, 0, arr.length);
+    }
+
+    /**
+     *
+     * @param arr array to apply rotation to
+     * @param k number of rotations
+     */
+    public static void cyclicReplacement(int[] arr, int k) {
+        checkInvalidInput(arr, k);
+
+        k = k % arr.length;
+        int count = 0;
+        for (int start = 0; count < arr.length; start++) {
+            int current = start;
+            int prev = arr[start];
+            do {
+                int next = (current + k) % arr.length;
+                int temp = arr[next];
+                arr[next] = prev;
+                prev = temp;
+                current = next;
+                count++;
+            } while (start != current);
+        }
+    }
+
+    /**
+     *
+     * @param arr array to apply rotation to
+     * @param k number of rotations
+     */
+    public static void reverse(int[] arr, int k) {
+        checkInvalidInput(arr, k);
+
+        k %= arr.length;
+        reverse(arr, 0, arr.length - 1);
+        reverse(arr, 0, k - 1);
+        reverse(arr, k, arr.length - 1);
+    }
+
+    private static void reverse(int[] nums, int start, int end) {
+        while (start < end) {
+            int temp = nums[start];
+            nums[start] = nums[end];
+            nums[end] = temp;
+            start++;
+            end--;
+        }
+    }
+
+    private static void checkInvalidInput(int[] arr, int rotation) {
+        if (rotation < 1 || arr == null)
+            throw new IllegalArgumentException("Rotation must be greater than zero or array must be not null");
+    }
+}
diff --git a/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/rotatearray/RotateArrayUnitTest.java b/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/rotatearray/RotateArrayUnitTest.java
new file mode 100644
index 0000000000..4a98acdb75
--- /dev/null
+++ b/algorithms-modules/algorithms-miscellaneous-7/src/test/java/com/baeldung/algorithms/rotatearray/RotateArrayUnitTest.java
@@ -0,0 +1,124 @@
+package com.baeldung.algorithms.rotatearray;
+
+import static com.baeldung.algorithms.rotatearray.RotateArray.bruteForce;
+import static com.baeldung.algorithms.rotatearray.RotateArray.cyclicReplacement;
+import static com.baeldung.algorithms.rotatearray.RotateArray.reverse;
+import static com.baeldung.algorithms.rotatearray.RotateArray.withExtraArray;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+class RotateArrayUnitTest {
+
+    private final int[] arr = { 1, 2, 3, 4, 5, 6 };
+    private final int rotationLtArrayLength = 1;
+    private final int rotationGtArrayLength = arr.length + 2;
+    private final int[] ltArrayLengthRotation = { 6, 1, 2, 3, 4, 5 };
+    private final int[] gtArrayLengthRotation = { 5, 6, 1, 2, 3, 4 };
+
+    @Test
+    void givenInputArray_whenNoRotationOrEmptyArray_thenThrowIllegalArgumentException() {
+        final int noRotation = 0;
+        final int someRotation = arr.length - 1;
+
+        assertThrows(IllegalArgumentException.class, () -> bruteForce(arr, noRotation));
+        assertThrows(IllegalArgumentException.class, () -> withExtraArray(arr, noRotation));
+        assertThrows(IllegalArgumentException.class, () -> cyclicReplacement(arr, noRotation));
+        assertThrows(IllegalArgumentException.class, () -> reverse(arr, noRotation));
+
+        assertThrows(IllegalArgumentException.class, () -> bruteForce(null, someRotation));
+        assertThrows(IllegalArgumentException.class, () -> withExtraArray(null, someRotation));
+        assertThrows(IllegalArgumentException.class, () -> cyclicReplacement(null, someRotation));
+        assertThrows(IllegalArgumentException.class, () -> reverse(null, someRotation));
+    }
+
+    @Test
+    void givenInputArray_whenUseBruteForceRotationLtArrayLength_thenRotateArrayOk() {
+
+        bruteForce(arr, rotationLtArrayLength);
+        assertArrayEquals(ltArrayLengthRotation, arr);
+    }
+
+    @Test
+    void givenInputArray_whenUseBruteForceRotationGtArrayLength_thenRotateArrayOk() {
+
+        bruteForce(arr, rotationGtArrayLength);
+        assertArrayEquals(gtArrayLengthRotation, arr);
+    }
+
+    @Test
+    void givenInputArray_whenUseBruteForceRotationEqArrayLength_thenDoNothing() {
+        int[] expected = arr.clone();
+
+        bruteForce(arr, arr.length);
+        assertArrayEquals(expected, arr);
+    }
+
+    @Test
+    void givenInputArray_whenUseExtraArrayRotationLtArrayLength_thenRotateArrayOk() {
+
+        withExtraArray(arr, rotationLtArrayLength);
+        assertArrayEquals(ltArrayLengthRotation, arr);
+    }
+
+    @Test
+    void givenInputArray_whenUseExtraArrayRotationGtArrayLength_thenRotateArrayOk() {
+
+        withExtraArray(arr, rotationGtArrayLength);
+        assertArrayEquals(gtArrayLengthRotation, arr);
+    }
+
+    @Test
+    void givenInputArray_whenUseExtraArrayWithRotationEqArrayLength_thenDoNothing() {
+        int[] clone = arr.clone();
+
+        withExtraArray(arr, arr.length);
+        assertArrayEquals(clone, arr);
+    }
+
+    @Test
+    void givenInputArray_whenUseCyclicReplacementRotationLtArrayLength_thenRotateArrayOk() {
+
+        cyclicReplacement(arr, rotationLtArrayLength);
+        assertArrayEquals(ltArrayLengthRotation, arr);
+    }
+
+    @Test
+    void givenInputArray_whenUseCyclicReplacementRotationGtArrayLength_thenRotateArrayOk() {
+
+        cyclicReplacement(arr, rotationGtArrayLength);
+        assertArrayEquals(gtArrayLengthRotation, arr);
+    }
+
+    @Test
+    void givenInputArray_whenUseCyclicReplacementRotationEqArrayLength_thenDoNothing() {
+        int[] clone = arr.clone();
+
+        cyclicReplacement(arr, arr.length);
+        assertArrayEquals(clone, arr);
+    }
+
+    @Test
+    void givenInputArray_whenUseReverseRotationLtArrayLength_thenRotateArrayOk() {
+
+        reverse(arr, rotationLtArrayLength);
+        assertArrayEquals(ltArrayLengthRotation, arr);
+    }
+
+    @Test
+    void givenInputArray_whenUseReverseRotationGtArrayLength_thenRotateArrayOk() {
+
+        reverse(arr, rotationGtArrayLength);
+        assertArrayEquals(gtArrayLengthRotation, arr);
+    }
+
+    @Test
+    void givenInputArray_whenUseReverseRotationEqArrayLength_thenDoNothing() {
+
+        int[] clone = arr.clone();
+
+        reverse(arr, arr.length);
+        assertArrayEquals(clone, arr);
+    }
+}
diff --git a/apache-kafka-2/README.md b/apache-kafka-2/README.md
index dc675a0811..40ee701be1 100644
--- a/apache-kafka-2/README.md
+++ b/apache-kafka-2/README.md
@@ -13,3 +13,4 @@ You can build the project from the command line using: *mvn clean install*, or i
 - [Read Data From the Beginning Using Kafka Consumer API](https://www.baeldung.com/java-kafka-consumer-api-read)
 - [Get Partition Count for a Topic in Kafka](https://www.baeldung.com/java-kafka-partition-count-topic)
 - [bootstrap-server in Kafka Configuration](https://www.baeldung.com/java-kafka-bootstrap-server)
+- [Introduction to Apache Kafka](https://www.baeldung.com/apache-kafka)
diff --git a/apache-kafka-2/src/test/java/com/baeldung/kafka/multipletopics/MultipleTopicsLiveTest.java b/apache-kafka-2/src/test/java/com/baeldung/kafka/multipletopics/MultipleTopicsLiveTest.java
new file mode 100644
index 0000000000..653456a678
--- /dev/null
+++ b/apache-kafka-2/src/test/java/com/baeldung/kafka/multipletopics/MultipleTopicsLiveTest.java
@@ -0,0 +1,103 @@
+package com.baeldung.kafka.multipletopics;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.Properties;
+import java.util.concurrent.ExecutionException;
+
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+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.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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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 MultipleTopicsLiveTest {
+
+    private final Logger log = LoggerFactory.getLogger(MultipleTopicsLiveTest.class);
+
+    private static final String CARD_PAYMENTS_TOPIC = "card-payments";
+    private static final String BANK_TRANSFERS_TOPIC = "bank-transfers";
+    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);
+        producer = new KafkaProducer<>(getProducerProperties());
+        consumer = new KafkaConsumer<>(getConsumerProperties());
+    }
+
+    @AfterAll
+    static void destroy() {
+        KAFKA_CONTAINER.stop();
+    }
+
+    private static Properties getProducerProperties() {
+        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());
+        return producerProperties;
+    }
+
+    private static Properties getConsumerProperties() {
+        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.AUTO_OFFSET_RESET_CONFIG, "earliest");
+        consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, "payments");
+        return consumerProperties;
+    }
+
+    @Test
+    void whenSendingMessagesOnTwoTopics_thenConsumerReceivesMessages() throws Exception {
+        publishMessages();
+
+        consumer.subscribe(Arrays.asList(CARD_PAYMENTS_TOPIC, BANK_TRANSFERS_TOPIC));
+
+        int eventsProcessed = 0;
+        for (ConsumerRecord<String, String> record : consumer.poll(Duration.ofSeconds(10))) {
+            log.info("Event on topic={}, payload={}", record.topic(), record.value());
+            eventsProcessed++;
+        }
+
+        assertThat(eventsProcessed).isEqualTo(2);
+    }
+
+    private void publishMessages() throws ExecutionException, InterruptedException {
+        ProducerRecord<String, String> cardPayment = new ProducerRecord<>(CARD_PAYMENTS_TOPIC, createCardPayment());
+        producer.send(cardPayment).get();
+
+        ProducerRecord<String, String> bankTransfer = new ProducerRecord<>(BANK_TRANSFERS_TOPIC, createBankTransfer());
+        producer.send(bankTransfer).get();
+    }
+
+    private String createCardPayment() {
+        return "{\"paymentReference\":\"A184028KM0013790\", \"type\":\"card\", \"amount\":\"275\", \"currency\":\"GBP\"}";
+    }
+
+    private String createBankTransfer() {
+        return "{\"paymentReference\":\"19ae2-18mk73-009\", \"type\":\"bank\", \"amount\":\"150\", \"currency\":\"EUR\"}";
+    }
+}
diff --git a/apache-poi-3/README.md b/apache-poi-3/README.md
new file mode 100644
index 0000000000..9e9d6a94eb
--- /dev/null
+++ b/apache-poi-3/README.md
@@ -0,0 +1,3 @@
+## Relevant Articles
+- [How To Convert Excel Data Into List Of Java Objects](https://www.baeldung.com/java-convert-excel-data-into-list)
+- [Expand Columns with Apache POI](https://www.baeldung.com/java-apache-poi-expand-columns)
diff --git a/apache-poi-3/pom.xml b/apache-poi-3/pom.xml
new file mode 100644
index 0000000000..905db3d58c
--- /dev/null
+++ b/apache-poi-3/pom.xml
@@ -0,0 +1,97 @@
+<?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>
+    <artifactId>apache-poi-3</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>apache-poi-3</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>${poi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-scratchpad</artifactId>
+            <version>${poi.version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.github.ozlerhakan/poiji -->
+        <dependency>
+            <groupId>com.github.ozlerhakan</groupId>
+            <artifactId>poiji</artifactId>
+            <version>${poiji.version}</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.apache.poi/poi/5.2.3 -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>${poi.version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml-schemas/4.1.2 -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml-schemas</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.xmlbeans/xmlbeans/5.1.1 -->
+        <dependency>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
+            <version>5.1.1</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-collections4 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.4</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.dhatim/fastexcel/0.15.7 -->
+        <dependency>
+            <groupId>org.dhatim</groupId>
+            <artifactId>fastexcel</artifactId>
+            <version>${fastexcel.version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.dhatim/fastexcel-reader/0.15.7 -->
+        <dependency>
+            <groupId>org.dhatim</groupId>
+            <artifactId>fastexcel-reader</artifactId>
+            <version>${fastexcel.version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/net.sourceforge.jexcelapi/jxl/2.6.12 -->
+        <dependency>
+            <groupId>net.sourceforge.jexcelapi</groupId>
+            <artifactId>jxl</artifactId>
+            <version>${jxl.version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.17.1</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.17.1</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <poi.version>5.2.3</poi.version>
+        <poiji.version>4.1.1</poiji.version>
+        <fastexcel.version>0.15.7</fastexcel.version>
+        <jxl.version>2.6.12</jxl.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/apache-poi-3/src/main/java/com/baeldung/convert/exceldatatolist/FoodInfo.java b/apache-poi-3/src/main/java/com/baeldung/convert/exceldatatolist/FoodInfo.java
new file mode 100644
index 0000000000..b8fe4522de
--- /dev/null
+++ b/apache-poi-3/src/main/java/com/baeldung/convert/exceldatatolist/FoodInfo.java
@@ -0,0 +1,54 @@
+package com.baeldung.convert.exceldatatolist;
+
+import com.poiji.annotation.ExcelCellName;
+
+public class FoodInfo {
+
+    @ExcelCellName("Category")
+    private String category; //food category
+    @ExcelCellName("Name")
+    private String name; // food name
+    @ExcelCellName("Measure")
+    private String measure;
+    @ExcelCellName("Calories")
+    private double calories; //amount of calories in kcal/measure
+
+    @Override
+    public String toString() {
+        return "FoodInfo{" + "category='" + category + '\'' + ", name='" + name + '\'' + ", measure='" + measure + '\'' + ", calories=" + calories + "} \n";
+    }
+
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getMeasure() {
+        return measure;
+    }
+
+    public void setMeasure(String measure) {
+        this.measure = measure;
+    }
+
+    public double getCalories() {
+        return calories;
+    }
+
+    public void setCalories(double calories) {
+        this.calories = calories;
+    }
+
+}
diff --git a/apache-poi-3/src/main/java/com/baeldung/convert/exceldatatolist/fastexcel/ExcelDataToListOfObjectsFastExcel.java b/apache-poi-3/src/main/java/com/baeldung/convert/exceldatatolist/fastexcel/ExcelDataToListOfObjectsFastExcel.java
new file mode 100644
index 0000000000..87d31520e6
--- /dev/null
+++ b/apache-poi-3/src/main/java/com/baeldung/convert/exceldatatolist/fastexcel/ExcelDataToListOfObjectsFastExcel.java
@@ -0,0 +1,42 @@
+package com.baeldung.convert.exceldatatolist.fastexcel;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.dhatim.fastexcel.reader.ReadableWorkbook;
+import org.dhatim.fastexcel.reader.Row;
+import org.dhatim.fastexcel.reader.Sheet;
+
+import com.baeldung.convert.exceldatatolist.FoodInfo;
+
+public class ExcelDataToListOfObjectsFastExcel {
+    public static List<FoodInfo> excelDataToListOfObjets_withFastExcel(String fileLocation)throws IOException, NumberFormatException {
+        List<FoodInfo> foodData = new ArrayList<FoodInfo>();
+
+        try (FileInputStream file = new FileInputStream(fileLocation);
+            ReadableWorkbook wb = new ReadableWorkbook(file)) {
+            Sheet sheet = wb.getFirstSheet();
+            for (Row row:
+                sheet.read()
+            ) {
+                if(row.getRowNum() == 1) {
+                    continue;
+                }
+                FoodInfo food = new FoodInfo();
+                food.setCategory(row.getCellText(0));
+                food.setName(row.getCellText(1));
+                food.setMeasure(row.getCellText(2));
+                food.setCalories(Double.parseDouble(row.getCellText(3)));
+
+                foodData.add(food);
+
+            }
+        }
+
+        return foodData;
+    }
+}
diff --git a/apache-poi-3/src/main/java/com/baeldung/convert/exceldatatolist/jexcelapi/ExcelDataToListOfObjectsJxl.java b/apache-poi-3/src/main/java/com/baeldung/convert/exceldatatolist/jexcelapi/ExcelDataToListOfObjectsJxl.java
new file mode 100644
index 0000000000..61ba5e4700
--- /dev/null
+++ b/apache-poi-3/src/main/java/com/baeldung/convert/exceldatatolist/jexcelapi/ExcelDataToListOfObjectsJxl.java
@@ -0,0 +1,37 @@
+package com.baeldung.convert.exceldatatolist.jexcelapi;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.baeldung.convert.exceldatatolist.FoodInfo;
+
+import jxl.Sheet;
+import jxl.Workbook;
+import jxl.read.biff.BiffException;
+
+public class ExcelDataToListOfObjectsJxl {
+    public static List<FoodInfo> excelDataToListOfObjets_withJxl(String fileLocation) throws IOException, BiffException {
+
+        List<FoodInfo> foodData = new ArrayList<FoodInfo>();
+
+        Workbook workbook = Workbook.getWorkbook(new File(fileLocation));
+        Sheet sheet = workbook.getSheet(0);
+
+        int rows = sheet.getRows();
+
+        for (int i = 1; i < rows; i++) {
+            FoodInfo foodInfo = new FoodInfo();
+
+            foodInfo.setCategory(sheet.getCell(0, i).getContents());
+            foodInfo.setName(sheet.getCell(1, i).getContents());
+            foodInfo.setMeasure(sheet.getCell(2, i).getContents());
+            foodInfo.setCalories(Double.parseDouble(sheet.getCell(3, i).getContents()));
+           
+            foodData.add(foodInfo);
+
+        }
+        return foodData;
+    }
+}
diff --git a/apache-poi-3/src/main/java/com/baeldung/convert/exceldatatolist/poi/ExcelDataToListApachePOI.java b/apache-poi-3/src/main/java/com/baeldung/convert/exceldatatolist/poi/ExcelDataToListApachePOI.java
new file mode 100644
index 0000000000..8b568b889a
--- /dev/null
+++ b/apache-poi-3/src/main/java/com/baeldung/convert/exceldatatolist/poi/ExcelDataToListApachePOI.java
@@ -0,0 +1,39 @@
+package com.baeldung.convert.exceldatatolist.poi;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.poi.ss.usermodel.DataFormatter;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import com.baeldung.convert.exceldatatolist.FoodInfo;
+
+public class ExcelDataToListApachePOI {
+    public static List<FoodInfo> excelDataToListOfObjets_withApachePOI(String fileLocation) throws IOException {
+        FileInputStream file = new FileInputStream(new File(fileLocation));
+        Workbook workbook = new XSSFWorkbook(file);
+        Sheet sheet = workbook.getSheetAt(0);
+        List<FoodInfo> foodData = new ArrayList<FoodInfo>();
+        DataFormatter dataFormatter = new DataFormatter();
+        for (int n = 1; n < sheet.getPhysicalNumberOfRows(); n++) {
+            Row row = sheet.getRow(n);
+            FoodInfo foodInfo = new FoodInfo();
+            int i = row.getFirstCellNum();
+
+            foodInfo.setCategory(dataFormatter.formatCellValue(row.getCell(i)));
+            foodInfo.setName(dataFormatter.formatCellValue(row.getCell(++i)));
+            foodInfo.setMeasure(dataFormatter.formatCellValue(row.getCell(++i)));
+            foodInfo.setCalories(Double.parseDouble(dataFormatter.formatCellValue(row.getCell(++i))));
+
+            foodData.add(foodInfo);
+
+        }
+        return foodData;
+    }
+}
diff --git a/apache-poi-3/src/main/java/com/baeldung/convert/exceldatatolist/poiji/ExcelDataToListOfObjectsPOIJI.java b/apache-poi-3/src/main/java/com/baeldung/convert/exceldatatolist/poiji/ExcelDataToListOfObjectsPOIJI.java
new file mode 100644
index 0000000000..be190d38f7
--- /dev/null
+++ b/apache-poi-3/src/main/java/com/baeldung/convert/exceldatatolist/poiji/ExcelDataToListOfObjectsPOIJI.java
@@ -0,0 +1,13 @@
+package com.baeldung.convert.exceldatatolist.poiji;
+
+import java.io.File;
+import java.util.List;
+
+import com.baeldung.convert.exceldatatolist.FoodInfo;
+import com.poiji.bind.Poiji;
+
+public class ExcelDataToListOfObjectsPOIJI {
+    public static List<FoodInfo> excelDataToListOfObjets_withPOIJI(String fileLocation){
+        return Poiji.fromExcel(new File(fileLocation), FoodInfo.class);
+    }
+}
diff --git a/apache-poi-3/src/main/resources/food_info.xls b/apache-poi-3/src/main/resources/food_info.xls
new file mode 100644
index 0000000000..1377d8e18d
Binary files /dev/null and b/apache-poi-3/src/main/resources/food_info.xls differ
diff --git a/apache-poi-3/src/main/resources/food_info.xlsx b/apache-poi-3/src/main/resources/food_info.xlsx
new file mode 100644
index 0000000000..c604ff367d
Binary files /dev/null and b/apache-poi-3/src/main/resources/food_info.xlsx differ
diff --git a/apache-poi-3/src/test/java/com/baeldung/convert/exceldatatolist/ExcelDataToListOfObjectsUnitTest.java b/apache-poi-3/src/test/java/com/baeldung/convert/exceldatatolist/ExcelDataToListOfObjectsUnitTest.java
new file mode 100644
index 0000000000..5d65c04b31
--- /dev/null
+++ b/apache-poi-3/src/test/java/com/baeldung/convert/exceldatatolist/ExcelDataToListOfObjectsUnitTest.java
@@ -0,0 +1,53 @@
+package com.baeldung.convert.exceldatatolist;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.List;
+
+// import org.junit.jupiter.api.Test;
+// import static org.junit.jupiter.api.Assertions.*;
+import org.junit.Test;
+
+import com.baeldung.convert.exceldatatolist.fastexcel.ExcelDataToListOfObjectsFastExcel;
+import com.baeldung.convert.exceldatatolist.jexcelapi.ExcelDataToListOfObjectsJxl;
+import com.baeldung.convert.exceldatatolist.poi.ExcelDataToListApachePOI;
+import com.baeldung.convert.exceldatatolist.poiji.ExcelDataToListOfObjectsPOIJI;
+
+import jxl.read.biff.BiffException;
+
+public class ExcelDataToListOfObjectsUnitTest {
+
+    @Test
+    public void whenParsingExcelFileWithPOIJI_thenConvertsToList() throws IOException {
+        List<FoodInfo> foodInfoList = ExcelDataToListOfObjectsPOIJI.excelDataToListOfObjets_withPOIJI("src/main/resources/food_info.xlsx");
+
+        assertEquals("Beverages", foodInfoList.get(0).getCategory());
+        assertEquals("Dairy", foodInfoList.get(3).getCategory());
+    }
+
+    @Test
+    public void whenParsingExcelFileWithApachePOI_thenConvertsToList() throws IOException {
+        List<FoodInfo> foodInfoList = ExcelDataToListApachePOI.excelDataToListOfObjets_withApachePOI("src/main/resources/food_info.xlsx");
+
+        assertEquals("Beverages", foodInfoList.get(0).getCategory());
+        assertEquals("Dairy", foodInfoList.get(3).getCategory());
+    }
+
+    @Test
+    public void whenParsingExcelFileWithFastExcel_thenConvertsToList() throws IOException {
+        List<FoodInfo> foodInfoList = ExcelDataToListOfObjectsFastExcel.excelDataToListOfObjets_withFastExcel("src/main/resources/food_info.xlsx");
+
+        assertEquals("Beverages", foodInfoList.get(0).getCategory());
+        assertEquals("Dairy", foodInfoList.get(3).getCategory());
+    }
+
+    @Test
+    public void whenParsingExcelFileWithJxl_thenConvertsToList() throws IOException, BiffException {
+        List<FoodInfo> foodInfoList = ExcelDataToListOfObjectsJxl.excelDataToListOfObjets_withJxl("src/main/resources/food_info.xls");
+
+        assertEquals("Beverages", foodInfoList.get(0).getCategory());
+        assertEquals("Dairy", foodInfoList.get(3).getCategory());
+    }
+
+}
diff --git a/apache-poi-3/src/test/java/com/baeldung/poi/excel/expandcolumn/ExpandColumnUnitTest.java b/apache-poi-3/src/test/java/com/baeldung/poi/excel/expandcolumn/ExpandColumnUnitTest.java
new file mode 100644
index 0000000000..04d0aef211
--- /dev/null
+++ b/apache-poi-3/src/test/java/com/baeldung/poi/excel/expandcolumn/ExpandColumnUnitTest.java
@@ -0,0 +1,70 @@
+package com.baeldung.poi.excel.expandcolumn;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.io.IOException;
+
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class ExpandColumnUnitTest {
+
+    private Workbook workbook;
+    private Sheet sheet;
+
+    @BeforeEach
+    void prepareSpreadsheet() {
+        workbook = new XSSFWorkbook();
+        sheet = workbook.createSheet();
+
+        Row headerRow = sheet.createRow(0);
+        Cell headerCell1 = headerRow.createCell(0);
+        headerCell1.setCellValue("Full Name");
+        Cell headerCell2 = headerRow.createCell(1);
+        headerCell2.setCellValue("Abbreviation");
+
+        Row dataRow = sheet.createRow(1);
+        Cell dataCell1 = dataRow.createCell(0);
+        dataCell1.setCellValue("Java Virtual Machine");
+        Cell dataCell2 = dataRow.createCell(1);
+        dataCell2.setCellValue("JVM");
+
+        dataRow = sheet.createRow(2);
+        dataCell1 = dataRow.createCell(0);
+        dataCell1.setCellValue("Java Runtime Environment");
+        dataCell2 = dataRow.createCell(1);
+        dataCell2.setCellValue("JRE");
+    }
+
+    @Test
+    void whenSetColumnWidth_thenColumnSetToTheSpecifiedWidth() {
+
+        Row row = sheet.getRow(2);
+        String cellValue = row.getCell(0).getStringCellValue();
+        int targetWidth = cellValue.length() * 256;
+
+        sheet.setColumnWidth(0, targetWidth);
+
+        assertEquals(targetWidth, sheet.getColumnWidth(0));
+    }
+
+    @Test
+    void whenAutoSizeColumn_thenColumnExpands() {
+
+        int originalWidth = sheet.getColumnWidth(0);
+
+        sheet.autoSizeColumn(0);
+
+        assertThat(sheet.getColumnWidth(0)).isGreaterThan(originalWidth);
+    }
+
+    @AfterEach
+    void cleanup() throws IOException {
+        workbook.close();
+    }
+
+}
\ No newline at end of file
diff --git a/aws-modules/aws-s3/README.md b/aws-modules/aws-s3/README.md
index cb039b7c61..9b862c8685 100644
--- a/aws-modules/aws-s3/README.md
+++ b/aws-modules/aws-s3/README.md
@@ -4,7 +4,7 @@ This module contains articles about Simple Storage Service (S3) on AWS
 
 ### Relevant articles
 
-- [AWS S3 with Java](https://www.baeldung.com/aws-s3-java)
+- [AWS S3 with Java](https://www.baeldung.com/java-aws-s3)
 - [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)
 - [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/core-java-modules/core-java-16/README.md b/core-java-modules/core-java-16/README.md
index b2740d194c..11b0fba8d3 100644
--- a/core-java-modules/core-java-16/README.md
+++ b/core-java-modules/core-java-16/README.md
@@ -5,3 +5,4 @@
 - [Collecting Stream Elements into a List in Java](https://www.baeldung.com/java-stream-to-list-collecting)
 - [New Features in Java 16](https://www.baeldung.com/java-16-new-features)
 - [Guide to Java 8 groupingBy Collector](https://www.baeldung.com/java-groupingby-collector)
+- [Value-Based Classes in Java](https://www.baeldung.com/java-value-based-classes)
diff --git a/core-java-modules/core-java-16/src/main/java/com/baeldung/value_based_class/Point.java b/core-java-modules/core-java-16/src/main/java/com/baeldung/value_based_class/Point.java
index 13e2238274..a3055985af 100644
--- a/core-java-modules/core-java-16/src/main/java/com/baeldung/value_based_class/Point.java
+++ b/core-java-modules/core-java-16/src/main/java/com/baeldung/value_based_class/Point.java
@@ -30,6 +30,11 @@ public final class Point {
         return new Point(x, y, z);
     }
 
+    @Override
+    public String toString() {
+        return "Point{" + "x=" + x + ", y=" + y + ", z=" + z + '}';
+    }
+
     @Override
     public boolean equals(Object other) {
         if (other == null || getClass() != other.getClass())
diff --git a/core-java-modules/core-java-16/src/test/java/com/baeldung/value_based_class/ValueBasedClassUnitTest.java b/core-java-modules/core-java-16/src/test/java/com/baeldung/value_based_class/ValueBasedClassUnitTest.java
index 781f368982..fe031a652f 100644
--- a/core-java-modules/core-java-16/src/test/java/com/baeldung/value_based_class/ValueBasedClassUnitTest.java
+++ b/core-java-modules/core-java-16/src/test/java/com/baeldung/value_based_class/ValueBasedClassUnitTest.java
@@ -1,14 +1,17 @@
 package com.baeldung.value_based_class;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.junit.Assert;
 import org.junit.Test;
 
 public class ValueBasedClassUnitTest {
     @Test
     public void givenAutoboxedAndPrimitive_whenCompared_thenReturnEquals() {
-        int primitive_a = 125;
-        Integer obj_a = 125; // this is autoboxed
-        Assert.assertSame(primitive_a, obj_a);
+        List<Integer> list = new ArrayList<>();
+        list.add(1); // this is autoboxed
+        Assert.assertEquals(list.get(0), Integer.valueOf(1));
     }
 
     @Test
diff --git a/spring-reactive-modules/spring-5-data-reactive-2/src/main/resources/application.properties b/core-java-modules/core-java-18/README.md
similarity index 100%
rename from spring-reactive-modules/spring-5-data-reactive-2/src/main/resources/application.properties
rename to core-java-modules/core-java-18/README.md
diff --git a/core-java-modules/core-java-18/pom.xml b/core-java-modules/core-java-18/pom.xml
new file mode 100644
index 0000000000..7af6258497
--- /dev/null
+++ b/core-java-modules/core-java-18/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>
+    <artifactId>core-java-18</artifactId>
+    <name>core-java-18</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
+    </parent>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <release>${maven.compiler.release}</release>
+                    <compilerArgs>--enable-preview</compilerArgs>
+                    <source>${maven.compiler.source.version}</source>
+                    <target>${maven.compiler.target.version}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire.plugin.version}</version>
+                <configuration>
+                    <forkCount>1</forkCount>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-api</artifactId>
+                        <version>${surefire.plugin.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <maven.compiler.source.version>18</maven.compiler.source.version>
+        <maven.compiler.target.version>18</maven.compiler.target.version>
+        <maven.compiler.release>18</maven.compiler.release>
+        <surefire.plugin.version>3.0.0-M5</surefire.plugin.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-18/src/main/java/com/baeldung/finalization_closeable_cleaner/FinalizationExamples.java b/core-java-modules/core-java-18/src/main/java/com/baeldung/finalization_closeable_cleaner/FinalizationExamples.java
new file mode 100644
index 0000000000..3ff77c37d6
--- /dev/null
+++ b/core-java-modules/core-java-18/src/main/java/com/baeldung/finalization_closeable_cleaner/FinalizationExamples.java
@@ -0,0 +1,27 @@
+package com.baeldung.finalization_closeable_cleaner;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+
+public class FinalizationExamples {
+    FileInputStream fis = null;
+
+    public void readFileOperationWithFinalization() throws IOException {
+        try {
+            fis = new FileInputStream("input.txt");
+            // perform operation on the file
+            System.out.println(fis.readAllBytes().length);
+
+        } finally {
+            if (fis != null)
+                fis.close();
+        }
+    }
+
+    public void readFileOperationWithTryWith() throws IOException {
+        try (FileInputStream fis = new FileInputStream("input.txt")) {
+            // perform operations
+            System.out.println(fis.readAllBytes().length);
+        }
+    }
+}
diff --git a/core-java-modules/core-java-18/src/main/java/com/baeldung/finalization_closeable_cleaner/MyCleanerResourceClass.java b/core-java-modules/core-java-18/src/main/java/com/baeldung/finalization_closeable_cleaner/MyCleanerResourceClass.java
new file mode 100644
index 0000000000..1dcdd216cb
--- /dev/null
+++ b/core-java-modules/core-java-18/src/main/java/com/baeldung/finalization_closeable_cleaner/MyCleanerResourceClass.java
@@ -0,0 +1,48 @@
+package com.baeldung.finalization_closeable_cleaner;
+
+import java.lang.ref.Cleaner;
+
+public class MyCleanerResourceClass implements AutoCloseable {
+    private static Resource resource;
+
+    private static final Cleaner cleaner = Cleaner.create();
+    private final Cleaner.Cleanable cleanable;
+
+    public MyCleanerResourceClass() {
+        resource = new Resource();
+        this.cleanable = cleaner.register(this, new CleaningState());
+    }
+
+    public void useResource() {
+        // using the resource here
+        resource.use();
+    }
+
+    @Override
+    public void close() {
+        // perform actions to close all underlying resources
+        this.cleanable.clean();
+    }
+
+    static class CleaningState implements Runnable {
+        CleaningState() {
+            // constructor
+        }
+
+        @Override
+        public void run() {
+            // some cleanup action
+            System.out.println("Cleanup done");
+        }
+    }
+
+    static class Resource {
+        void use() {
+            System.out.println("Using the resource");
+        }
+
+        void close() {
+            System.out.println("Cleanup done");
+        }
+    }
+}
diff --git a/core-java-modules/core-java-18/src/main/java/com/baeldung/finalization_closeable_cleaner/MyCloseableResourceClass.java b/core-java-modules/core-java-18/src/main/java/com/baeldung/finalization_closeable_cleaner/MyCloseableResourceClass.java
new file mode 100644
index 0000000000..b11cb4e49e
--- /dev/null
+++ b/core-java-modules/core-java-18/src/main/java/com/baeldung/finalization_closeable_cleaner/MyCloseableResourceClass.java
@@ -0,0 +1,25 @@
+package com.baeldung.finalization_closeable_cleaner;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+public class MyCloseableResourceClass implements AutoCloseable {
+
+    private final FileInputStream fis;
+
+    public MyCloseableResourceClass() throws FileNotFoundException {
+        this.fis = new FileInputStream("src/main/resources/file.txt");
+
+    }
+
+    public int getByteLength() throws IOException {
+        System.out.println("Some operation");
+        return this.fis.readAllBytes().length;
+    }
+    @Override
+    public void close() throws IOException {
+        System.out.println("Finalized object");
+        this.fis.close();
+    }
+}
diff --git a/core-java-modules/core-java-18/src/main/java/com/baeldung/finalization_closeable_cleaner/MyFinalizableResourceClass.java b/core-java-modules/core-java-18/src/main/java/com/baeldung/finalization_closeable_cleaner/MyFinalizableResourceClass.java
new file mode 100644
index 0000000000..a2c6a123b4
--- /dev/null
+++ b/core-java-modules/core-java-18/src/main/java/com/baeldung/finalization_closeable_cleaner/MyFinalizableResourceClass.java
@@ -0,0 +1,24 @@
+package com.baeldung.finalization_closeable_cleaner;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+public class MyFinalizableResourceClass {
+    private FileInputStream fis;
+
+    public MyFinalizableResourceClass() throws FileNotFoundException {
+        this.fis = new FileInputStream("src/main/resources/file.txt");
+    }
+
+    public int getByteLength() throws IOException {
+        System.out.println("Some operation");
+        return this.fis.readAllBytes().length;
+    }
+
+    @Override
+    protected void finalize() throws Throwable {
+        System.out.println("Finalized object");
+        this.fis.close();
+    }
+}
diff --git a/core-java-modules/core-java-18/src/main/resources/file.txt b/core-java-modules/core-java-18/src/main/resources/file.txt
new file mode 100644
index 0000000000..af27ff4986
--- /dev/null
+++ b/core-java-modules/core-java-18/src/main/resources/file.txt
@@ -0,0 +1 @@
+This is a test file.
\ No newline at end of file
diff --git a/core-java-modules/core-java-18/src/test/java/com/baeldung/finalization_closeable_cleaner/FinalizationCloseableCleanerUnitTest.java b/core-java-modules/core-java-18/src/test/java/com/baeldung/finalization_closeable_cleaner/FinalizationCloseableCleanerUnitTest.java
new file mode 100644
index 0000000000..22ff228227
--- /dev/null
+++ b/core-java-modules/core-java-18/src/test/java/com/baeldung/finalization_closeable_cleaner/FinalizationCloseableCleanerUnitTest.java
@@ -0,0 +1,36 @@
+package com.baeldung.finalization_closeable_cleaner;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+import java.io.IOException;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class FinalizationCloseableCleanerUnitTest {
+
+    @Test
+    public void givenMyFinalizationResource_whenUsingFinalize_thenShouldClean() {
+        assertDoesNotThrow(() -> {
+            MyFinalizableResourceClass mfr = new MyFinalizableResourceClass();
+            mfr.getByteLength();
+        });
+    }
+    @Test
+    public void givenMyCleanerResource_whenUsingCleanerAPI_thenShouldClean() {
+        assertDoesNotThrow(() -> {
+            try (MyCleanerResourceClass myCleanerResourceClass = new MyCleanerResourceClass()) {
+                myCleanerResourceClass.useResource();
+            }
+        });
+    }
+
+    @Test
+    public void givenCloseableResource_whenUsingTryWith_thenShouldClose() throws IOException {
+        int length = 0;
+        try (MyCloseableResourceClass mcr = new MyCloseableResourceClass()) {
+            length = mcr.getByteLength();
+        }
+        Assert.assertEquals(20, length);
+    }
+}
diff --git a/core-java-modules/core-java-21/README.md b/core-java-modules/core-java-21/README.md
index c63f3b360b..ffb999a4ba 100644
--- a/core-java-modules/core-java-21/README.md
+++ b/core-java-modules/core-java-21/README.md
@@ -1 +1,5 @@
-## Relevant Articles
\ No newline at end of file
+## Relevant Articles
+- [Sequenced Collections in Java 21](https://www.baeldung.com/java-21-sequenced-collections)
+- [String Templates in Java 21](https://www.baeldung.com/java-21-string-templates)
+- [Unnamed Classes and Instance Main Methods in Java 21](https://www.baeldung.com/java-21-unnamed-class-instance-main)
+- [Unnamed Patterns and Variables in Java 21](https://www.baeldung.com/java-unnamed-patterns-variables)
diff --git a/core-java-modules/core-java-21/pom.xml b/core-java-modules/core-java-21/pom.xml
index 83b2b1c858..7b8fa9063f 100644
--- a/core-java-modules/core-java-21/pom.xml
+++ b/core-java-modules/core-java-21/pom.xml
@@ -12,23 +12,36 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
-<!--    <build>-->
-<!--        <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>-->
-<!--                </configuration>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--    </build>-->
+    <properties>
+        <maven.compiler.source.version>21</maven.compiler.source.version>
+        <maven.compiler.target.version>21</maven.compiler.target.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
 
-<!--    <properties>-->
-<!--        <maven.compiler.source.version>21</maven.compiler.source.version>-->
-<!--        <maven.compiler.target.version>21</maven.compiler.target.version>-->
-<!--        <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>21</source>
+                    <target>21</target>
+                    <!-- Needed due to a bug with JDK 21, described here: https://issues.apache.org/jira/browse/MCOMPILER-546?page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel&focusedCommentId=17767513 -->
+                    <debug>false</debug>
+                    <compilerArgs>
+                        <arg>--enable-preview</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>--enable-preview</argLine>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-21/src/main/java/com/baeldung/stringtemplates/StringCompositionTechniques.java b/core-java-modules/core-java-21/src/main/java/com/baeldung/stringtemplates/StringCompositionTechniques.java
new file mode 100644
index 0000000000..7e66144f1c
--- /dev/null
+++ b/core-java-modules/core-java-21/src/main/java/com/baeldung/stringtemplates/StringCompositionTechniques.java
@@ -0,0 +1,37 @@
+package com.baeldung.stringtemplates;
+
+import java.text.MessageFormat;
+
+public class StringCompositionTechniques {
+    String composeUsingPlus(String feelsLike, String temperature, String unit) {
+        return "Today's weather is " + feelsLike + ", with a temperature of " + temperature + " degrees " + unit;
+    }
+
+    String composeUsingStringBuffer(String feelsLike, String temperature, String unit) {
+        return new StringBuffer().append("Today's weather is ")
+          .append(feelsLike)
+          .append(", with a temperature of ")
+          .append(temperature)
+          .append(" degrees ")
+          .append(unit)
+          .toString();
+    }
+
+    String composeUsingStringBuilder(String feelsLike, String temperature, String unit) {
+        return new StringBuilder().append("Today's weather is ")
+          .append(feelsLike)
+          .append(", with a temperature of ")
+          .append(temperature)
+          .append(" degrees ")
+          .append(unit)
+          .toString();
+    }
+
+    String composeUsingFormatters(String feelsLike, String temperature, String unit) {
+        return String.format("Today's weather is %s, with a temperature of %s degrees %s", feelsLike, temperature, unit);
+    }
+
+    String composeUsingMessageFormatter(String feelsLike, String temperature, String unit) {
+        return MessageFormat.format("Today''s weather is {0}, with a temperature of {1} degrees {2}", feelsLike, temperature, unit);
+    }
+}
diff --git a/core-java-modules/core-java-21/src/main/java/com/baeldung/stringtemplates/StringTemplateExamples.java b/core-java-modules/core-java-21/src/main/java/com/baeldung/stringtemplates/StringTemplateExamples.java
new file mode 100644
index 0000000000..0fb18a84e9
--- /dev/null
+++ b/core-java-modules/core-java-21/src/main/java/com/baeldung/stringtemplates/StringTemplateExamples.java
@@ -0,0 +1,56 @@
+package com.baeldung.stringtemplates;
+
+import static java.lang.StringTemplate.RAW;
+import static java.util.FormatProcessor.FMT;
+
+public class StringTemplateExamples {
+    String interpolationUsingSTRProcessor(String feelsLike, String temperature, String unit) {
+        return STR
+          . "Today's weather is \{ feelsLike }, with a temperature of \{ temperature } degrees \{ unit }" ;
+    }
+
+    String interpolationOfJSONBlock(String feelsLike, String temperature, String unit) {
+        return STR
+          . """
+          {
+            "feelsLike": "\{ feelsLike }",
+            "temperature": "\{ temperature }",
+            "unit": "\{ unit }"
+          }
+          """ ;
+    }
+
+    String interpolationWithExpressions() {
+        return STR
+          . "Today's weather is \{ getFeelsLike() }, with a temperature of \{ getTemperature() } degrees \{ getUnit() }" ;
+    }
+
+    String interpolationWithTemplates() {
+        StringTemplate str = RAW
+          . "Today's weather is \{ getFeelsLike() }, with a temperature of \{ getTemperature() } degrees \{ getUnit() }" ;
+        return STR.process(str);
+    }
+
+    String interpolationOfJSONBlockWithFMT(String feelsLike, float temperature, String unit) {
+        return FMT
+          . """
+      {
+        "feelsLike": "%1s\{ feelsLike }",
+        "temperature": "%2.2f\{ temperature }",
+        "unit": "%1s\{ unit }"
+      }
+      """ ;
+    }
+
+    private String getFeelsLike() {
+        return "pleasant";
+    }
+
+    private String getTemperature() {
+        return "25";
+    }
+
+    private String getUnit() {
+        return "Celsius";
+    }
+}
diff --git a/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamed/variables/Car.java b/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamed/variables/Car.java
new file mode 100644
index 0000000000..8f51c03539
--- /dev/null
+++ b/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamed/variables/Car.java
@@ -0,0 +1,11 @@
+package com.baeldung.unnamed.variables;
+
+public record Car<T extends Engine>(String name, String color, T engine) { }
+
+abstract class Engine { }
+
+class GasEngine extends Engine { }
+
+class ElectricEngine extends Engine { }
+
+class HybridEngine extends Engine { }
\ No newline at end of file
diff --git a/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamed/variables/UnnamedPatterns.java b/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamed/variables/UnnamedPatterns.java
new file mode 100644
index 0000000000..310ce621f9
--- /dev/null
+++ b/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamed/variables/UnnamedPatterns.java
@@ -0,0 +1,50 @@
+package com.baeldung.unnamed.variables;
+
+public class UnnamedPatterns {
+
+    static String getObjectsColorWithNamedPattern(Object object) {
+        if (object instanceof Car(String name, String color, Engine engine)) {
+            return color;
+        }
+        return "No color!";
+    }
+
+    static String getObjectsColorWithUnnamedPattern(Object object) {
+        if (object instanceof Car(_, String color, _)) {
+            return color;
+        }
+        return "No color!";
+    }
+
+    static String getObjectsColorWithSwitchAndNamedPattern(Object object) {
+        return switch (object) {
+            case Car(String name, String color, Engine engine) -> color;
+            default -> "No color!";
+        };
+    }
+
+    static String getObjectsColorWithSwitchAndUnnamedPattern(Object object) {
+        return switch (object) {
+            case Car(_, String color, _) -> color;
+            default -> "No color!";
+        };
+    }
+
+    static String getEngineTypeWithNamedPattern(Car<?> car) {
+        return switch (car) {
+            case Car(String name, String color, GasEngine engine) -> "gas";
+            case Car(String name, String color, ElectricEngine engine) -> "electric";
+            case Car(String name, String color, HybridEngine engine) -> "hybrid";
+            default -> "none";
+        };
+    }
+
+    static String getEngineTypeWithUnnamedPattern(Car<?> car) {
+        return switch (car) {
+            case Car(_, _, GasEngine _) -> "gas";
+            case Car(_, _, ElectricEngine _) -> "electric";
+            case Car(_, _, HybridEngine _) -> "hybrid";
+            default -> "none";
+        };
+    }
+}
diff --git a/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamed/variables/UnnamedVariables.java b/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamed/variables/UnnamedVariables.java
new file mode 100644
index 0000000000..82e76b40a4
--- /dev/null
+++ b/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamed/variables/UnnamedVariables.java
@@ -0,0 +1,134 @@
+package com.baeldung.unnamed.variables;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+
+class Transaction implements AutoCloseable {
+
+    @Override
+    public void close() {
+        System.out.println("Closed!");
+    }
+}
+
+public class UnnamedVariables {
+
+    static int countCarsOverLimitWithNamedVariable(Collection<Car<?>> cars, int limit) {
+        var total = 0;
+        var totalOverLimit = 0;
+        for (var car : cars) {
+            total++;
+            if (total > limit) {
+                totalOverLimit++;
+                // side effect
+            }
+        }
+        return totalOverLimit;
+    }
+
+    static int countCarsOverLimitWithUnnamedVariable(Collection<Car<?>> cars, int limit) {
+        var total = 0;
+        var totalOverLimit = 0;
+        for (var _ : cars) {
+            total++;
+            if (total > limit) {
+                totalOverLimit++;
+                // side effect
+            }
+        }
+        return totalOverLimit;
+    }
+
+    static void sendNotificationToCarsWithNamedVariable(Collection<Car<?>> cars) {
+        sendOneTimeNotification();
+        for (int i = 0; i < cars.size(); i++) {
+            // Notify car
+        }
+    }
+
+    static void sendNotificationToCarsWithUnnamedVariable(Collection<Car<?>> cars) {
+        for (int i = 0, _ = sendOneTimeNotification(); i < cars.size(); i++) {
+            // Notify car
+        }
+    }
+
+    private static int sendOneTimeNotification() {
+        System.out.println("Sending one time notification!");
+        return 1;
+    }
+
+    static Car<?> removeThreeCarsAndReturnFirstRemovedWithNamedVariables(Queue<Car<?>> cars) {
+        var x = cars.poll();
+        var y = cars.poll();
+        var z = cars.poll();
+        return x;
+    }
+
+    static Car<?> removeThreeCarsAndReturnFirstRemovedWithUnnamedVariables(Queue<Car<?>> cars) {
+        var car = cars.poll();
+        var _ = cars.poll();
+        var _ = cars.poll();
+        return car;
+    }
+
+    static void handleCarExceptionWithNamedVariables(Car<?> car) {
+        try {
+            someOperationThatFails(car);
+        } catch (IllegalStateException ex) {
+            System.out.println("Got an illegal state exception for: " + car.name());
+        } catch (RuntimeException ex) {
+            System.out.println("Got a runtime exception!");
+        }
+    }
+
+    static void handleCarExceptionWithUnnamedVariables(Car<?> car) {
+        try {
+            someOperationThatFails(car);
+        } catch (IllegalStateException | NumberFormatException _) {
+            System.out.println("Got an illegal state exception for: " + car.name());
+        } catch (RuntimeException _) {
+            System.out.println("Got a runtime exception!");
+        }
+    }
+
+    static void obtainTransactionAndUpdateCarWithNamedVariables(Car<?> car) {
+        try (var transaction = new Transaction()) {
+            updateCar(car);
+        }
+    }
+
+    static void obtainTransactionAndUpdateCarWithUnnamedVariables(Car<?> car) {
+        try (var _ = new Transaction()) {
+            updateCar(car);
+        }
+    }
+
+    static void updateCar(Car<?> car) {
+        // Some update logic
+        System.out.println("Car updated!");
+    }
+
+    static Map<String, List<Car<?>>> getCarsByFirstLetterWithNamedVariables(List<Car<?>> cars) {
+        Map<String, List<Car<?>>> carMap = new HashMap<>();
+        cars.forEach(car ->
+            carMap.computeIfAbsent(car.name().substring(0, 1), firstLetter -> new ArrayList<>()).add(car)
+        );
+        return carMap;
+    }
+
+    static Map<String, List<Car<?>>> getCarsByFirstLetterWithUnnamedVariables(List<Car<?>> cars) {
+        Map<String, List<Car<?>>> carMap = new HashMap<>();
+        cars.forEach(car ->
+            carMap.computeIfAbsent(car.name().substring(0, 1), _ -> new ArrayList<>()).add(car)
+        );
+        return carMap;
+    }
+
+    private static void someOperationThatFails(Car<?> car) {
+        throw new IllegalStateException("Triggered exception for: " + car.name());
+    }
+}
diff --git a/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamedclasses/HelloWorld.java b/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamedclasses/HelloWorld.java
new file mode 100644
index 0000000000..bf0e2c96c2
--- /dev/null
+++ b/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamedclasses/HelloWorld.java
@@ -0,0 +1,3 @@
+void main() {
+    System.out.println("Hello, World!");
+}
diff --git a/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamedclasses/HelloWorldChild.java b/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamedclasses/HelloWorldChild.java
new file mode 100644
index 0000000000..827be7c788
--- /dev/null
+++ b/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamedclasses/HelloWorldChild.java
@@ -0,0 +1,7 @@
+package com.baeldung.unnamedclasses;
+
+public class HelloWorldChild extends HelloWorldSuper {
+    void main() {
+        System.out.println("Hello, World!");
+    }
+}
diff --git a/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamedclasses/HelloWorldSuper.java b/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamedclasses/HelloWorldSuper.java
new file mode 100644
index 0000000000..59c88716a4
--- /dev/null
+++ b/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamedclasses/HelloWorldSuper.java
@@ -0,0 +1,7 @@
+package com.baeldung.unnamedclasses;
+
+public class HelloWorldSuper {
+    public static void main(String[] args) {
+        System.out.println("Hello from the superclass");
+    }
+}
diff --git a/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamedclasses/HelloWorldWithMethod.java b/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamedclasses/HelloWorldWithMethod.java
new file mode 100644
index 0000000000..698516544e
--- /dev/null
+++ b/core-java-modules/core-java-21/src/main/java/com/baeldung/unnamedclasses/HelloWorldWithMethod.java
@@ -0,0 +1,6 @@
+private String getMessage() {
+    return "Hello, World!";
+}
+void main() {
+    System.out.println(getMessage());
+}
diff --git a/core-java-modules/core-java-21/src/test/java/com.baeldung.stringtemplates/StringTemplatesUnitTest.java b/core-java-modules/core-java-21/src/test/java/com.baeldung.stringtemplates/StringTemplatesUnitTest.java
new file mode 100644
index 0000000000..b9917cab18
--- /dev/null
+++ b/core-java-modules/core-java-21/src/test/java/com.baeldung.stringtemplates/StringTemplatesUnitTest.java
@@ -0,0 +1,67 @@
+package com.baeldung.stringtemplates;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class StringTemplatesUnitTest {
+
+    @Test
+    public void whenStringConcat_thenReturnComposedString() {
+        StringCompositionTechniques stringCompositionTechniques = new StringCompositionTechniques();
+        Assert.assertEquals("Today's weather is pleasant, with a temperature of 25 degrees Celsius", stringCompositionTechniques.composeUsingPlus("pleasant", "25", "Celsius"));
+    }
+
+    @Test
+    public void whenStringBuffer_thenReturnComposedString() {
+        StringCompositionTechniques stringCompositionTechniques = new StringCompositionTechniques();
+        Assert.assertEquals("Today's weather is pleasant, with a temperature of 25 degrees Celsius", stringCompositionTechniques.composeUsingStringBuffer("pleasant", "25", "Celsius"));
+    }
+
+    @Test
+    public void whenStringBuilder_thenReturnComposedString() {
+        StringCompositionTechniques stringCompositionTechniques = new StringCompositionTechniques();
+        Assert.assertEquals("Today's weather is pleasant, with a temperature of 25 degrees Celsius", stringCompositionTechniques.composeUsingStringBuilder("pleasant", "25", "Celsius"));
+    }
+
+    @Test
+    public void whenStringFormatter_thenReturnComposedFormattedString() {
+        StringCompositionTechniques stringCompositionTechniques = new StringCompositionTechniques();
+        Assert.assertEquals("Today's weather is pleasant, with a temperature of 25 degrees Celsius", stringCompositionTechniques.composeUsingFormatters("pleasant", "25", "Celsius"));
+    }
+
+    @Test
+    public void whenMessageFormatter_thenReturnComposedFormattedString() {
+        StringCompositionTechniques stringCompositionTechniques = new StringCompositionTechniques();
+        Assert.assertEquals("Today's weather is pleasant, with a temperature of 25 degrees Celsius", stringCompositionTechniques.composeUsingMessageFormatter("pleasant", "25", "Celsius"));
+    }
+
+    @Test
+    public void whenUsingStringTemplateSTR_thenReturnInterpolatedString() {
+        StringTemplateExamples templateExamples = new StringTemplateExamples();
+        Assert.assertEquals("Today's weather is pleasant, with a temperature of 25 degrees Celsius", templateExamples.interpolationUsingSTRProcessor("pleasant", "25", "Celsius"));
+    }
+
+    @Test
+    public void whenUsingMultilineStringTemplateSTR_thenReturnInterpolatedString() {
+        StringTemplateExamples templateExamples = new StringTemplateExamples();
+        Assert.assertEquals("{\n" + "  \"feelsLike\": \"pleasant\",\n" + "  \"temperature\": \"25\",\n" + "  \"unit\": \"Celsius\"\n" + "}\n", templateExamples.interpolationOfJSONBlock("pleasant", "25", "Celsius"));
+    }
+
+    @Test
+    public void whenUsingExpressionSTR_thenReturnInterpolatedString() {
+        StringTemplateExamples templateExamples = new StringTemplateExamples();
+        Assert.assertEquals("Today's weather is pleasant, with a temperature of 25 degrees Celsius", templateExamples.interpolationWithExpressions());
+    }
+
+    @Test
+    public void whenUsingExpressionRAW_thenReturnInterpolatedString() {
+        StringTemplateExamples templateExamples = new StringTemplateExamples();
+        Assert.assertEquals("Today's weather is pleasant, with a temperature of 25 degrees Celsius", templateExamples.interpolationWithTemplates());
+    }
+
+    @Test
+    public void whenUsingExpressionFMT_thenReturnInterpolatedString() {
+        StringTemplateExamples templateExamples = new StringTemplateExamples();
+        Assert.assertEquals("{\n" + "  \"feelsLike\": \"pleasant\",\n" + "  \"temperature\": \"25.86\",\n" + "  \"unit\": \"Celsius\"\n" + "}\n", templateExamples.interpolationOfJSONBlockWithFMT("pleasant", 25.8636F, "Celsius"));
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-21/src/test/java/com/baeldung/unnamed/variables/CarScenario.java b/core-java-modules/core-java-21/src/test/java/com/baeldung/unnamed/variables/CarScenario.java
new file mode 100644
index 0000000000..2acb83cdef
--- /dev/null
+++ b/core-java-modules/core-java-21/src/test/java/com/baeldung/unnamed/variables/CarScenario.java
@@ -0,0 +1,13 @@
+package com.baeldung.unnamed.variables;
+
+import java.util.List;
+
+class CarScenario {
+
+    protected final List<Car<?>> cars = List.of(
+        new Car<>("Mitsubishi", "blue", new GasEngine()),
+        new Car<>("Toyota", "red", new ElectricEngine()),
+        new Car<>("Jaguar", "white", new HybridEngine())
+    );
+
+}
diff --git a/core-java-modules/core-java-21/src/test/java/com/baeldung/unnamed/variables/UnnamedPatternsUnitTest.java b/core-java-modules/core-java-21/src/test/java/com/baeldung/unnamed/variables/UnnamedPatternsUnitTest.java
new file mode 100644
index 0000000000..9d860a201a
--- /dev/null
+++ b/core-java-modules/core-java-21/src/test/java/com/baeldung/unnamed/variables/UnnamedPatternsUnitTest.java
@@ -0,0 +1,44 @@
+package com.baeldung.unnamed.variables;
+
+import static com.baeldung.unnamed.variables.UnnamedPatterns.getEngineTypeWithNamedPattern;
+import static com.baeldung.unnamed.variables.UnnamedPatterns.getEngineTypeWithUnnamedPattern;
+import static com.baeldung.unnamed.variables.UnnamedPatterns.getObjectsColorWithNamedPattern;
+import static com.baeldung.unnamed.variables.UnnamedPatterns.getObjectsColorWithSwitchAndNamedPattern;
+import static com.baeldung.unnamed.variables.UnnamedPatterns.getObjectsColorWithSwitchAndUnnamedPattern;
+import static com.baeldung.unnamed.variables.UnnamedPatterns.getObjectsColorWithUnnamedPattern;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class UnnamedPatternsUnitTest extends CarScenario {
+
+    @Test
+    public void whenExtractingColorWithNamedPatterns_thenReturnBlue() {
+        assertEquals("blue", getObjectsColorWithNamedPattern(cars.get(0)));
+    }
+
+    @Test
+    public void whenExtractingColorWithUnnamedPatterns_thenReturnBlue() {
+        assertEquals("blue", getObjectsColorWithUnnamedPattern(cars.get(0)));
+    }
+
+    @Test
+    public void whenExtractingColorWithSwitchAndNamedPatterns_thenReturnBlue() {
+        assertEquals("blue", getObjectsColorWithSwitchAndNamedPattern(cars.get(0)));
+    }
+
+    @Test
+    public void whenExtractingColorWithSwitchAndUnnamedPatterns_thenReturnBlue() {
+        assertEquals("blue", getObjectsColorWithSwitchAndUnnamedPattern(cars.get(0)));
+    }
+
+    @Test
+    public void whenExtractingEngineTypeWithNamedPatterns_thenReturnGas() {
+        assertEquals("gas", getEngineTypeWithNamedPattern(cars.get(0)));
+    }
+
+    @Test
+    public void whenExtractingEngineTypeWithUnnamedPatterns_thenReturnGas() {
+        assertEquals("gas", getEngineTypeWithUnnamedPattern(cars.get(0)));
+    }
+}
diff --git a/core-java-modules/core-java-21/src/test/java/com/baeldung/unnamed/variables/UnnamedVariablesUnitTest.java b/core-java-modules/core-java-21/src/test/java/com/baeldung/unnamed/variables/UnnamedVariablesUnitTest.java
new file mode 100644
index 0000000000..094879c277
--- /dev/null
+++ b/core-java-modules/core-java-21/src/test/java/com/baeldung/unnamed/variables/UnnamedVariablesUnitTest.java
@@ -0,0 +1,93 @@
+package com.baeldung.unnamed.variables;
+
+import static com.baeldung.unnamed.variables.UnnamedVariables.countCarsOverLimitWithNamedVariable;
+import static com.baeldung.unnamed.variables.UnnamedVariables.countCarsOverLimitWithUnnamedVariable;
+import static com.baeldung.unnamed.variables.UnnamedVariables.getCarsByFirstLetterWithNamedVariables;
+import static com.baeldung.unnamed.variables.UnnamedVariables.getCarsByFirstLetterWithUnnamedVariables;
+import static com.baeldung.unnamed.variables.UnnamedVariables.handleCarExceptionWithNamedVariables;
+import static com.baeldung.unnamed.variables.UnnamedVariables.handleCarExceptionWithUnnamedVariables;
+import static com.baeldung.unnamed.variables.UnnamedVariables.obtainTransactionAndUpdateCarWithNamedVariables;
+import static com.baeldung.unnamed.variables.UnnamedVariables.obtainTransactionAndUpdateCarWithUnnamedVariables;
+import static com.baeldung.unnamed.variables.UnnamedVariables.removeThreeCarsAndReturnFirstRemovedWithNamedVariables;
+import static com.baeldung.unnamed.variables.UnnamedVariables.removeThreeCarsAndReturnFirstRemovedWithUnnamedVariables;
+import static com.baeldung.unnamed.variables.UnnamedVariables.sendNotificationToCarsWithNamedVariable;
+import static com.baeldung.unnamed.variables.UnnamedVariables.sendNotificationToCarsWithUnnamedVariable;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.LinkedList;
+
+import org.junit.jupiter.api.Test;
+
+public class UnnamedVariablesUnitTest extends CarScenario {
+
+    @Test
+    public void whenCountingCarsOverLimitWithNamedVariables_thenShouldReturnOne() {
+        assertEquals(1, countCarsOverLimitWithNamedVariable(cars, 2));
+    }
+
+    @Test
+    public void whenCountingCarsOverLimitWithUnnamedVariables_thenShouldReturnOne() {
+        assertEquals(1, countCarsOverLimitWithUnnamedVariable(cars, 2));
+    }
+
+    @Test
+    public void whenNotifyingCarsWithNamedVariables_thenShouldNotFail() {
+        assertDoesNotThrow(() -> sendNotificationToCarsWithNamedVariable(cars));
+    }
+
+    @Test
+    public void whenNotifyingCarsWithUnnamedVariables_thenShouldNotFail() {
+        assertDoesNotThrow(() -> sendNotificationToCarsWithUnnamedVariable(cars));
+    }
+
+    @Test
+    public void whenPollingCarsWithNamedVariables_thenReturnFirstOneAndEmptyQueue() {
+        var carQueue = new LinkedList<>(cars);
+        assertEquals("Mitsubishi", removeThreeCarsAndReturnFirstRemovedWithNamedVariables(carQueue).name());
+        assertEquals(0, carQueue.size());
+    }
+
+    @Test
+    public void whenPollingCarsWithUnnamedVariables_thenReturnFirstOneAndEmptyQueue() {
+        var carQueue = new LinkedList<>(cars);
+        assertEquals("Mitsubishi", removeThreeCarsAndReturnFirstRemovedWithUnnamedVariables(carQueue).name());
+        assertEquals(0, carQueue.size());
+    }
+
+    @Test
+    public void whenHandlingExceptionWithNamedVariables_thenNoExceptionIsThrown() {
+        assertDoesNotThrow(() -> handleCarExceptionWithNamedVariables(cars.get(0)));
+    }
+
+    @Test
+    public void whenHandlingExceptionWithUnnamedVariables_thenNoExceptionIsThrown() {
+        assertDoesNotThrow(() -> handleCarExceptionWithUnnamedVariables(cars.get(0)));
+    }
+
+    @Test
+    public void whenHandlingTransactionUpdateWithNamedVariables_thenNoExceptionIsThrown() {
+        assertDoesNotThrow(() -> obtainTransactionAndUpdateCarWithNamedVariables(cars.get(0)));
+    }
+
+    @Test
+    public void whenHandlingTransactionUpdateWithUnnamedVariables_thenNoExceptionIsThrown() {
+        assertDoesNotThrow(() -> obtainTransactionAndUpdateCarWithUnnamedVariables(cars.get(0)));
+    }
+
+    @Test
+    public void whenGettingCarsByFirstLetterWithNamedVariables_thenHaveThreeKeys() {
+        var carsByLetter = getCarsByFirstLetterWithNamedVariables(cars);
+        assertEquals(1, carsByLetter.get("M").size());
+        assertEquals(1, carsByLetter.get("T").size());
+        assertEquals(1, carsByLetter.get("J").size());
+    }
+
+    @Test
+    public void whenGettingCarsByFirstLetterWithUnnamedVariables_thenHaveThreeKeys() {
+        var carsByLetter = getCarsByFirstLetterWithUnnamedVariables(cars);
+        assertEquals(1, carsByLetter.get("M").size());
+        assertEquals(1, carsByLetter.get("T").size());
+        assertEquals(1, carsByLetter.get("J").size());
+    }
+}
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 b860ca979d..ac1e1ca81f 100644
--- a/core-java-modules/core-java-8-datetime-2/README.md
+++ b/core-java-modules/core-java-8-datetime-2/README.md
@@ -5,4 +5,5 @@
 - [Parsing Date Strings with Varying Formats](https://www.baeldung.com/java-parsing-dates-many-formats)
 - [How Many Days Are There in a Particular Month of a Given Year?](https://www.baeldung.com/days-particular-month-given-year)
 - [Difference Between Instant and LocalDateTime](https://www.baeldung.com/java-instant-vs-localdatetime)
+- [Add Minutes to a Time String in Java](https://www.baeldung.com/java-string-time-add-mins)
 - [[<-- Prev]](/core-java-modules/core-java-datetime-java8-1)
diff --git a/core-java-modules/core-java-8-datetime/src/test/java/com/baeldung/dateapi/JavaDurationUnitTest.java b/core-java-modules/core-java-8-datetime/src/test/java/com/baeldung/dateapi/JavaDurationUnitTest.java
index be43fb609a..d1bd77776a 100644
--- a/core-java-modules/core-java-8-datetime/src/test/java/com/baeldung/dateapi/JavaDurationUnitTest.java
+++ b/core-java-modules/core-java-8-datetime/src/test/java/com/baeldung/dateapi/JavaDurationUnitTest.java
@@ -3,9 +3,11 @@ package com.baeldung.dateapi;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.Duration;
 import java.time.Instant;
+import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.temporal.ChronoUnit;
 
@@ -19,7 +21,7 @@ public class JavaDurationUnitTest {
         LocalTime finalTime = initialTime.plus(Duration.ofSeconds(30));
 
         long seconds = Duration.between(initialTime, finalTime)
-            .getSeconds();
+          .getSeconds();
 
         assertThat(seconds).isEqualTo(30);
     }
@@ -34,6 +36,22 @@ public class JavaDurationUnitTest {
         assertThat(seconds).isEqualTo(30);
     }
 
+    @Test
+    public void givenADuration_whenCallingisZeroAndisNegative_thenGetExpectedResult() {
+        LocalDateTime start = LocalDateTime.parse("2020-01-01T08:00:00");
+        LocalDateTime end = LocalDateTime.parse("2020-01-01T12:00:00");
+        assertFalse(Duration.between(start, end)
+          .isNegative());
+        assertTrue(Duration.between(end, start)
+          .isNegative());
+
+        LocalDateTime theTime = LocalDateTime.parse("2023-09-09T08:00:00");
+        assertTrue(Duration.between(theTime, theTime)
+          .isZero());
+        assertFalse(Duration.between(theTime, theTime)
+          .isNegative());
+    }
+
     @Test
     public void test2() {
         Instant start = Instant.parse("2017-10-03T10:15:30.00Z");
@@ -53,17 +71,17 @@ public class JavaDurationUnitTest {
         assertEquals(1, fromMinutes.toHours());
 
         assertEquals(120, duration.plusSeconds(60)
-            .getSeconds());
+          .getSeconds());
         assertEquals(30, duration.minusSeconds(30)
-            .getSeconds());
+          .getSeconds());
 
         assertEquals(120, duration.plus(60, ChronoUnit.SECONDS)
-            .getSeconds());
+          .getSeconds());
         assertEquals(30, duration.minus(30, ChronoUnit.SECONDS)
-            .getSeconds());
+          .getSeconds());
 
         Duration fromChar1 = Duration.parse("P1DT1H10M10.5S");
         Duration fromChar2 = Duration.parse("PT10M");
     }
 
-}
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-9-streams/README.md b/core-java-modules/core-java-9-streams/README.md
index 0ad8500689..d9663e0858 100644
--- a/core-java-modules/core-java-9-streams/README.md
+++ b/core-java-modules/core-java-9-streams/README.md
@@ -4,3 +4,4 @@ This module contains articles about Java 9 streams
 
 ### Relevant Articles: 
 - [How to Break from Java Stream forEach](https://www.baeldung.com/java-break-stream-foreach)
+- [Creating Stream of Regex Matches](https://www.baeldung.com/java-stream-regex-matches)
diff --git a/core-java-modules/core-java-arrays-convert/src/main/java/com/baeldung/array/conversions/CharArrayToIntArrayUtils.java b/core-java-modules/core-java-arrays-convert/src/main/java/com/baeldung/array/conversions/CharArrayToIntArrayUtils.java
new file mode 100644
index 0000000000..fbd76a0113
--- /dev/null
+++ b/core-java-modules/core-java-arrays-convert/src/main/java/com/baeldung/array/conversions/CharArrayToIntArrayUtils.java
@@ -0,0 +1,67 @@
+package com.baeldung.array.conversions;
+
+import java.util.Arrays;
+
+public class CharArrayToIntArrayUtils {
+
+    static int[] usingGetNumericValueMethod(char[] chars) {
+        if (chars == null) {
+            return null;
+        }
+
+        int[] ints = new int[chars.length];
+        for (int i = 0; i < chars.length; i++) {
+            ints[i] = Character.getNumericValue(chars[i]);
+        }
+
+        return ints;
+    }
+
+    static int[] usingDigitMethod(char[] chars) {
+        if (chars == null) {
+            return null;
+        }
+
+        int[] ints = new int[chars.length];
+        for (int i = 0; i < chars.length; i++) {
+            ints[i] = Character.digit(chars[i], 10);
+        }
+
+        return ints;
+    }
+
+    static int[] usingStreamApiMethod(char[] chars) {
+        if (chars == null) {
+            return null;
+        }
+
+        return new String(chars).chars()
+          .map(c -> c - 48)
+          .toArray();
+    }
+
+    static int[] usingParseIntMethod(char[] chars) {
+        if (chars == null) {
+            return null;
+        }
+
+        int[] ints = new int[chars.length];
+        for (int i = 0; i < chars.length; i++) {
+            ints[i] = Integer.parseInt(String.valueOf(chars[i]));
+        }
+
+        return ints;
+    }
+
+    static int[] usingArraysSetAllMethod(char[] chars) {
+        if (chars == null) {
+            return null;
+        }
+
+        int[] ints = new int[chars.length];
+        Arrays.setAll(ints, i -> Character.getNumericValue(chars[i]));
+
+        return ints;
+    }
+
+}
diff --git a/core-java-modules/core-java-arrays-convert/src/test/java/com/baeldung/array/conversions/CharArrayToIntArrayUtilsUnitTest.java b/core-java-modules/core-java-arrays-convert/src/test/java/com/baeldung/array/conversions/CharArrayToIntArrayUtilsUnitTest.java
new file mode 100644
index 0000000000..534dc3893f
--- /dev/null
+++ b/core-java-modules/core-java-arrays-convert/src/test/java/com/baeldung/array/conversions/CharArrayToIntArrayUtilsUnitTest.java
@@ -0,0 +1,54 @@
+package com.baeldung.array.conversions;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
+import org.junit.jupiter.api.Test;
+
+class CharArrayToIntArrayUtilsUnitTest {
+
+    @Test
+    void givenCharArray_whenUsingGetNumericValueMethod_shouldGetIntArray() {
+        int[] expected = { 2, 3, 4, 5 };
+        char[] chars = { '2', '3', '4', '5' };
+        int[] result = CharArrayToIntArrayUtils.usingGetNumericValueMethod(chars);
+
+        assertArrayEquals(expected, result);
+    }
+
+    @Test
+    void givenCharArray_whenUsingDigitMethod_shouldGetIntArray() {
+        int[] expected = { 1, 2, 3, 6 };
+        char[] chars = { '1', '2', '3', '6' };
+        int[] result = CharArrayToIntArrayUtils.usingDigitMethod(chars);
+
+        assertArrayEquals(expected, result);
+    }
+
+    @Test
+    void givenCharArray_whenUsingStreamApi_shouldGetIntArray() {
+        int[] expected = { 9, 8, 7, 6 };
+        char[] chars = { '9', '8', '7', '6' };
+        int[] result = CharArrayToIntArrayUtils.usingStreamApiMethod(chars);
+
+        assertArrayEquals(expected, result);
+    }
+
+    @Test
+    void givenCharArray_whenUsingParseIntMethod_shouldGetIntArray() {
+        int[] expected = { 9, 8, 7, 6 };
+        char[] chars = { '9', '8', '7', '6' };
+        int[] result = CharArrayToIntArrayUtils.usingParseIntMethod(chars);
+
+        assertArrayEquals(expected, result);
+    }
+
+    @Test
+    void givenCharArray_whenUsingArraysSetAllMethod_shouldGetIntArray() {
+        int[] expected = { 4, 9, 2, 3 };
+        char[] chars = { '4', '9', '2', '3' };
+        int[] result = CharArrayToIntArrayUtils.usingArraysSetAllMethod(chars);
+
+        assertArrayEquals(expected, result);
+    }
+
+}
diff --git a/core-java-modules/core-java-arrays-guides/README.md b/core-java-modules/core-java-arrays-guides/README.md
index 0af77980af..d8b0d126a1 100644
--- a/core-java-modules/core-java-arrays-guides/README.md
+++ b/core-java-modules/core-java-arrays-guides/README.md
@@ -9,3 +9,4 @@ This module contains complete guides about arrays in Java
 - [Guide to ArrayStoreException](https://www.baeldung.com/java-arraystoreexception)
 - [Creating a Generic Array in Java](https://www.baeldung.com/java-generic-array)
 - [Maximum Size of Java Arrays](https://www.baeldung.com/java-arrays-max-size)
+- [Merge Two Arrays and Remove Duplicates in Java](https://www.baeldung.com/java-merge-two-arrays-delete-duplicates)
diff --git a/core-java-modules/core-java-arrays-guides/src/main/java/com/baeldung/mergeandremoveduplicate/MergeArraysAndRemoveDuplicate.java b/core-java-modules/core-java-arrays-guides/src/main/java/com/baeldung/mergeandremoveduplicate/MergeArraysAndRemoveDuplicate.java
new file mode 100644
index 0000000000..e0b249565f
--- /dev/null
+++ b/core-java-modules/core-java-arrays-guides/src/main/java/com/baeldung/mergeandremoveduplicate/MergeArraysAndRemoveDuplicate.java
@@ -0,0 +1,96 @@
+package com.baeldung.mergeandremoveduplicate;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Stream;
+
+public class MergeArraysAndRemoveDuplicate {
+
+    public static int[] removeDuplicateOnSortedArray(int[] arr) {
+        // Initialize a new array to store unique elements
+        int[] uniqueArray = new int[arr.length];
+        uniqueArray[0] = arr[0];
+        int uniqueCount = 1;
+
+        // Iterate through the sorted array to remove duplicates
+        for (int i = 1; i < arr.length; i++) {
+            if (arr[i] != arr[i - 1]) {
+                uniqueArray[uniqueCount] = arr[i];
+                uniqueCount++;
+            }
+        }
+        int[] truncatedArray = new int[uniqueCount];
+        System.arraycopy(uniqueArray, 0, truncatedArray, 0, uniqueCount);
+        return truncatedArray;
+    }
+
+    public static int[] mergeAndRemoveDuplicatesUsingStream(int[] arr1, int[] arr2) {
+        Stream<Integer> s1 = Arrays.stream(arr1).boxed();
+        Stream<Integer> s2 = Arrays.stream(arr2).boxed();
+        return Stream.concat(s1, s2)
+                .distinct()
+                .mapToInt(Integer::intValue)
+                .toArray();
+    }
+
+    public static int[] mergeAndRemoveDuplicatesUsingSet(int[] arr1, int[] arr2) {
+        int[] mergedArr = mergeArrays(arr1, arr2);
+        Set<Integer> uniqueInts = new HashSet<>();
+
+        for (int el : mergedArr) {
+            uniqueInts.add(el);
+        }
+
+        return getArrayFromSet(uniqueInts);
+    }
+
+    private static int[] getArrayFromSet(Set<Integer> set) {
+        int[] mergedArrWithoutDuplicated = new int[set.size()];
+        int i = 0;
+        for (Integer el: set) {
+            mergedArrWithoutDuplicated[i] = el;
+            i++;
+        }
+        return mergedArrWithoutDuplicated;
+    }
+
+    public static int[] mergeAndRemoveDuplicates(int[] arr1, int[] arr2) {
+        return removeDuplicate(mergeArrays(arr1, arr2));
+    }
+
+    public static int[] mergeAndRemoveDuplicatesOnSortedArray(int[] arr1, int[] arr2) {
+        return removeDuplicateOnSortedArray(mergeArrays(arr1, arr2));
+    }
+
+    private static int[] mergeArrays(int[] arr1, int[] arr2) {
+        int[] mergedArrays = new int[arr1.length + arr2.length];
+        System.arraycopy(arr1, 0, mergedArrays, 0, arr1.length);
+        System.arraycopy(arr2, 0, mergedArrays, arr1.length, arr2.length);
+
+        return mergedArrays;
+    }
+    private static int[] removeDuplicate(int[] arr) {
+        int[] withoutDuplicates = new int[arr.length];
+        int i = 0;
+
+        for(int element : arr) {
+            if(!isElementPresent(withoutDuplicates, element)) {
+                withoutDuplicates[i] = element;
+                i++;
+            }
+        }
+        int[] truncatedArray = new int[i];
+        System.arraycopy(withoutDuplicates, 0, truncatedArray, 0, i);
+        return truncatedArray;
+    }
+
+    private static boolean isElementPresent(int[] arr, int element) {
+        for(int el : arr) {
+            if(el == element) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/core-java-modules/core-java-arrays-guides/src/test/java/com/baeldung/mergeandremoveduplicate/MergeArraysAndRemoveDuplicateUnitTest.java b/core-java-modules/core-java-arrays-guides/src/test/java/com/baeldung/mergeandremoveduplicate/MergeArraysAndRemoveDuplicateUnitTest.java
new file mode 100644
index 0000000000..5076ef8159
--- /dev/null
+++ b/core-java-modules/core-java-arrays-guides/src/test/java/com/baeldung/mergeandremoveduplicate/MergeArraysAndRemoveDuplicateUnitTest.java
@@ -0,0 +1,74 @@
+package com.baeldung.mergeandremoveduplicate;
+
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
+public class MergeArraysAndRemoveDuplicateUnitTest {
+
+    private final Logger logger = LoggerFactory.getLogger(MergeArraysAndRemoveDuplicateUnitTest.class);
+
+    private static String getCommaDelimited(int[] arr) {
+        return Arrays.stream(arr)
+                .mapToObj(Integer::toString)
+                .collect(Collectors.joining(", "));
+    }
+
+    @Test
+    public void givenNoLibraryAndUnSortedArrays_whenArr1andArr2_thenMergeAndRemoveDuplicates() {
+        int[] arr1 = {3, 2, 1, 4, 5, 6, 8, 7, 9};
+        int[] arr2 = {8, 9, 10, 11, 12, 13, 15, 14, 15, 14, 16, 17};
+        int[] expectedArr = {3, 2, 1, 4, 5, 6, 8, 7, 9, 10, 11, 12, 13, 15, 14, 16, 17};
+
+        int[] mergedArr = MergeArraysAndRemoveDuplicate.mergeAndRemoveDuplicates(arr1, arr2);
+
+        //merged array maintains the order of the elements in the arrays
+        assertArrayEquals(expectedArr, mergedArr);
+
+        logger.info(getCommaDelimited(mergedArr));
+    }
+
+    @Test
+    public void givenNoLibraryAndSortedArrays_whenArr1andArr2_thenMergeAndRemoveDuplicates() {
+        int[] arr1 = {1, 2, 3, 4, 5, 5, 6, 7, 7, 8};
+        int[] arr2 = {8, 9, 10, 11, 12, 13, 14, 15, 15, 16, 17};
+        int[] expectedArr = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
+
+        int[] mergedArr = MergeArraysAndRemoveDuplicate.mergeAndRemoveDuplicatesOnSortedArray(arr1, arr2);
+
+        assertArrayEquals(expectedArr, mergedArr);
+
+        logger.info(getCommaDelimited(mergedArr));
+    }
+
+    @Test
+    public void givenSet_whenArr1andArr2_thenMergeAndRemoveDuplicates() {
+        int[] arr1 = {3, 2, 1, 4, 5, 6, 8, 7, 9};
+        int[] arr2 = {8, 9, 10, 11, 12, 13, 15, 14, 15, 14, 16, 17};
+        int[] expectedArr = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
+
+        int[] mergedArr = MergeArraysAndRemoveDuplicate.mergeAndRemoveDuplicatesUsingSet(arr1, arr2);
+
+        assertArrayEquals(expectedArr, mergedArr);
+
+        logger.info(getCommaDelimited(mergedArr));
+    }
+
+    @Test
+    public void givenStream_whenArr1andArr2_thenMergeAndRemoveDuplicates() {
+        int[] arr1 = {3, 2, 1, 4, 5, 6, 8, 7, 9};
+        int[] arr2 = {8, 9, 10, 11, 12, 13, 15, 14, 15, 14, 16, 17};
+        int[] expectedArr = {3, 2, 1, 4, 5, 6, 8, 7, 9, 10, 11, 12, 13, 15, 14, 16, 17};
+
+        int[] mergedArr = MergeArraysAndRemoveDuplicate.mergeAndRemoveDuplicatesUsingStream(arr1, arr2);
+
+        assertArrayEquals(expectedArr, mergedArr);
+
+        logger.info(getCommaDelimited(mergedArr));
+    }
+}
diff --git a/core-java-modules/core-java-arrays-operations-advanced-2/README.md b/core-java-modules/core-java-arrays-operations-advanced-2/README.md
new file mode 100644
index 0000000000..17ffa2562d
--- /dev/null
+++ b/core-java-modules/core-java-arrays-operations-advanced-2/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Find the Middle Element of an Array in Java](https://www.baeldung.com/java-array-middle-item)
diff --git a/core-java-modules/core-java-arrays-operations-advanced-2/pom.xml b/core-java-modules/core-java-arrays-operations-advanced-2/pom.xml
new file mode 100644
index 0000000000..53cccb8a73
--- /dev/null
+++ b/core-java-modules/core-java-arrays-operations-advanced-2/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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>core-java-arrays-operations-advanced-2</artifactId>
+    <name>core-java-arrays-operations-advanced-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>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-arrays-operations-advanced/src/main/java/com/baeldung/arraymiddle/MiddleOfArray.java b/core-java-modules/core-java-arrays-operations-advanced-2/src/main/java/com/baeldung/arraymiddle/MiddleOfArray.java
similarity index 99%
rename from core-java-modules/core-java-arrays-operations-advanced/src/main/java/com/baeldung/arraymiddle/MiddleOfArray.java
rename to core-java-modules/core-java-arrays-operations-advanced-2/src/main/java/com/baeldung/arraymiddle/MiddleOfArray.java
index f389893209..bfff003512 100644
--- a/core-java-modules/core-java-arrays-operations-advanced/src/main/java/com/baeldung/arraymiddle/MiddleOfArray.java
+++ b/core-java-modules/core-java-arrays-operations-advanced-2/src/main/java/com/baeldung/arraymiddle/MiddleOfArray.java
@@ -62,4 +62,4 @@ public class MiddleOfArray {
             return array[mid];
         }
     }
-}
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-arrays-operations-advanced/src/test/java/com/baeldung/arraymiddle/MiddleOfArrayUnitTest.java b/core-java-modules/core-java-arrays-operations-advanced-2/src/test/java/com/baeldung/arraymiddle/MiddleOfArrayUnitTest.java
similarity index 99%
rename from core-java-modules/core-java-arrays-operations-advanced/src/test/java/com/baeldung/arraymiddle/MiddleOfArrayUnitTest.java
rename to core-java-modules/core-java-arrays-operations-advanced-2/src/test/java/com/baeldung/arraymiddle/MiddleOfArrayUnitTest.java
index 706412d83e..64a9796e67 100644
--- a/core-java-modules/core-java-arrays-operations-advanced/src/test/java/com/baeldung/arraymiddle/MiddleOfArrayUnitTest.java
+++ b/core-java-modules/core-java-arrays-operations-advanced-2/src/test/java/com/baeldung/arraymiddle/MiddleOfArrayUnitTest.java
@@ -86,4 +86,4 @@ public class MiddleOfArrayUnitTest {
         MiddleOfArray middleOfArray = new MiddleOfArray();
         Assert.assertEquals(expectMedian, middleOfArray.medianOfArray(array, 0, 100));
     }
-}
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-arrays-operations-advanced/README.md b/core-java-modules/core-java-arrays-operations-advanced/README.md
index 0647d89d16..b379958f37 100644
--- a/core-java-modules/core-java-arrays-operations-advanced/README.md
+++ b/core-java-modules/core-java-arrays-operations-advanced/README.md
@@ -14,4 +14,3 @@ This module contains articles about advanced operations on arrays in Java. They
 - [Slicing Arrays in Java](https://www.baeldung.com/java-slicing-arrays)
 - [Combining Two or More Byte Arrays](https://www.baeldung.com/java-concatenate-byte-arrays)
 - [Calculating the Sum of Two Arrays in Java](https://www.baeldung.com/java-sum-arrays-element-wise)
-- [Find the Middle Element of an Array in Java](https://www.baeldung.com/java-array-middle-item)
diff --git a/core-java-modules/core-java-char/README.md b/core-java-modules/core-java-char/README.md
index e4af3121c5..56040a3ea5 100644
--- a/core-java-modules/core-java-char/README.md
+++ b/core-java-modules/core-java-char/README.md
@@ -5,3 +5,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)
+- [Increment Character in Java](https://www.baeldung.com/java-char-sequence)
diff --git a/core-java-modules/core-java-char/src/test/java/com/baeldung/incrementchar/IncrementCharUnitTest.java b/core-java-modules/core-java-char/src/test/java/com/baeldung/incrementchar/IncrementCharUnitTest.java
new file mode 100644
index 0000000000..7621e85762
--- /dev/null
+++ b/core-java-modules/core-java-char/src/test/java/com/baeldung/incrementchar/IncrementCharUnitTest.java
@@ -0,0 +1,29 @@
+package com.baeldung.incrementchar;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+class IncrementCharUnitTest {
+    @Test
+    void whenUsingForLoop_thenGenerateCharacters(){
+        final List<Character> allCapitalCharacters = Arrays.asList('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z');
+        List<Character> characters = new ArrayList<>();
+        for (char character = 'A'; character <= 'Z'; character++) {
+            characters.add(character);
+        }
+        Assertions.assertEquals(characters, allCapitalCharacters);
+    }
+
+    @Test
+    void whenUsingStreams_thenGenerateCharacters() {
+        final List<Character> allCapitalCharacters = Arrays.asList('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z');
+        final List<Character> characters = IntStream.rangeClosed('A', 'Z').mapToObj(c -> (char) c).collect(Collectors.toList());
+        Assertions.assertEquals(characters, allCapitalCharacters);
+    }
+}
diff --git a/core-java-modules/core-java-collections-5/README.md b/core-java-modules/core-java-collections-5/README.md
index 1769d11686..e478d87ad0 100644
--- a/core-java-modules/core-java-collections-5/README.md
+++ b/core-java-modules/core-java-collections-5/README.md
@@ -5,4 +5,6 @@
 ### Relevant Articles:
 - [Introduction to Roaring Bitmap](https://www.baeldung.com/java-roaring-bitmap-intro)
 - [Creating Custom Iterator in Java](https://www.baeldung.com/java-creating-custom-iterator)
+- [Difference Between Arrays.sort() and Collections.sort()](https://www.baeldung.com/java-arrays-collections-sort-methods)
+- [Skipping the First Iteration in Java](https://www.baeldung.com/java-skip-first-iteration)
 - More articles: [[<-- prev]](/core-java-modules/core-java-collections-4)
diff --git a/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/skippingfirstelement/SkipFirstElementExample.java b/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/skippingfirstelement/SkipFirstElementExample.java
new file mode 100644
index 0000000000..86982486fa
--- /dev/null
+++ b/core-java-modules/core-java-collections-5/src/main/java/com/baeldung/skippingfirstelement/SkipFirstElementExample.java
@@ -0,0 +1,126 @@
+package com.baeldung.skippingfirstelement;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+public class SkipFirstElementExample {
+
+    private final List<String> stringList = new ArrayList<>();
+    private final Set<String> stringSet = new HashSet<>();
+    private final Map<String, String> stringMap = new HashMap<>();
+
+    public SkipFirstElementExample() {
+        // Initializing a List
+        stringList.add("Monday");
+        stringList.add("Tuesday");
+        stringList.add("Wednesday");
+        stringList.add("Thursday");
+        stringList.add("Friday");
+        stringList.add("Saturday");
+        stringList.add("Sunday");
+        // Initializing a Set
+        stringSet.add("Monday");
+        stringSet.add("Tuesday");
+        stringSet.add("Wednesday");
+        stringSet.add("Thursday");
+        stringSet.add("Friday");
+        stringSet.add("Saturday");
+        stringSet.add("Sunday");
+        // Initializing a Map
+        stringMap.put("Monday", "The day when coffee is a life support system.");
+        stringMap.put("Tuesday", "The day you realize that Monday's optimism was a lie.");
+        stringMap.put("Wednesday", "Hump Day, or as it's known, the 'Is it Friday yet?' day.");
+        stringMap.put("Thursday", "The day that says, 'Hold my beer, Friday is coming!'");
+        stringMap.put("Friday", "The golden child of the weekdays. The superhero of the workweek.");
+        stringMap.put("Saturday", "The day of rest? More like the day of 'What can I binge-watch next?'");
+        stringMap.put("Sunday", "The day before you have to adult again.");
+    }
+
+    void skippingFirstElementInListWithForLoop(List<String> stringList) {
+        for (int i = 1; i < stringList.size(); i++) {
+            process(stringList.get(i));
+        }
+    }
+
+    void skippingFirstElementInListWithWhileLoop(List<String> stringList) {
+        final Iterator<String> iterator = stringList.iterator();
+        if (iterator.hasNext()) {
+            iterator.next();
+        }
+        while (iterator.hasNext()) {
+            process(iterator.next());
+        }
+    }
+
+    void skippingFirstElementInSetWithWhileLoop(Set<String> stringSet) {
+        final Iterator<String> iterator = stringSet.iterator();
+        if (iterator.hasNext()) {
+            iterator.next();
+        }
+        while (iterator.hasNext()) {
+            process(iterator.next());
+        }
+    }
+
+    void skippingFirstElementInListWithWhileLoopStoringFirstElement(List<String> stringList) {
+        final Iterator<String> iterator = stringList.iterator();
+        String firstElement = null;
+        if (iterator.hasNext()) {
+            firstElement = iterator.next();
+        }
+        while (iterator.hasNext()) {
+            process(iterator.next());
+            // additional logic using fistElement
+        }
+    }
+
+    void skippingFirstElementInMapWithStreamSkip(Map<String, String> stringMap) {
+        stringMap.entrySet().stream().skip(1).forEach(this::process);
+    }
+
+    void skippingFirstElementInListWithSubList(List<String> stringList) {
+        for (final String element : stringList.subList(1, stringList.size())) {
+            process(element);
+        }
+    }
+
+    void skippingFirstElementInListWithForLoopWithAdditionalCheck(List<String> stringList) {
+        for (int i = 0; i < stringList.size(); i++) {
+            if (i == 0) {
+                // do something else
+            } else {
+                process(stringList.get(i));
+            }
+        }
+    }
+
+    void skippingFirstElementInListWithWhileLoopWithCounter(List<String> stringList) {
+        int counter = 0;
+        while (counter < stringList.size()) {
+            if (counter != 0) {
+                process(stringList.get(counter));
+            }
+            ++counter;
+        }
+    }
+
+    void skippingFirstElementInListWithReduce(List<String> stringList) {
+        stringList.stream().reduce((skip, element) -> {
+            process(element);
+            return element;
+        });
+    }
+
+    protected void process(String string) {
+        System.out.println(string);
+    }
+    protected void process(Entry<String, String> mapEntry) {
+        System.out.println(mapEntry);
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-5/src/test/java/com/baeldung/skippingfirstelement/SkipFirstElementExampleUnitTest.java b/core-java-modules/core-java-collections-5/src/test/java/com/baeldung/skippingfirstelement/SkipFirstElementExampleUnitTest.java
new file mode 100644
index 0000000000..9821b22ac7
--- /dev/null
+++ b/core-java-modules/core-java-collections-5/src/test/java/com/baeldung/skippingfirstelement/SkipFirstElementExampleUnitTest.java
@@ -0,0 +1,122 @@
+package com.baeldung.skippingfirstelement;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+@EnabledForJreRange(min = JRE.JAVA_9)
+class SkipFirstElementExampleUnitTest {
+
+    private static TestableSkipFirstElement testableSkip = new TestableSkipFirstElement();
+
+    @BeforeEach
+    void setup() {
+        testableSkip.reset();
+    }
+
+    private static Stream<Arguments> listProvider() {
+        return Stream.of(
+            Arguments.of(
+                List.of("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"),
+                List.of("Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"))
+        );
+    }
+
+    private static Stream<Arguments> mapProvider() {
+        return Stream.of(
+            Arguments.of(
+                Map.of(
+                    "Monday", "The day when coffee is a life support system.",
+                    "Tuesday", "The day you realize that Monday's optimism was a lie.",
+                    "Wednesday", "Hump Day, or as it's known, the 'Is it Friday yet?' day.",
+                    "Thursday", "The day that says, 'Hold my beer, Friday is coming!'",
+                    "Friday", "The golden child of the weekdays. The superhero of the workweek.",
+                    "Saturday", "The day of rest? More like the day of 'What can I binge-watch next?'",
+                    "Sunday", "The day before you have to adult again."
+                )
+            )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("listProvider")
+    void skippingFirstElementInListWithForLoop(List<String> input, List<String> expected) {
+        testableSkip.skippingFirstElementInListWithForLoop(input);
+        List<?> actual = testableSkip.getResult();
+        assertEquals(actual, expected);
+    }
+
+    @ParameterizedTest
+    @MethodSource("listProvider")
+    void skippingFirstElementInListWithWhileLoop(List<String> input, List<String> expected) {
+        testableSkip.skippingFirstElementInListWithWhileLoop(input);
+        List<?> actual = testableSkip.getResult();
+        assertEquals(actual, expected);
+    }
+
+    @ParameterizedTest
+    @MethodSource("listProvider")
+    void skippingFirstElementInSetWithWhileLoop(List<String> input) {
+        testableSkip.skippingFirstElementInSetWithWhileLoop(new HashSet<>(input));
+        Set<?> actual = new HashSet<>(testableSkip.getResult());
+        assertEquals(actual.size(), input.size() - 1);
+    }
+
+    @ParameterizedTest
+    @MethodSource("listProvider")
+    void skippingFirstElementInListWithWhileLoopStoringFirstElement(List<String> input, List<String> expected) {
+        testableSkip.skippingFirstElementInListWithWhileLoopStoringFirstElement(input);
+        List<?> actual = testableSkip.getResult();
+        assertEquals(actual, expected);
+    }
+
+    @ParameterizedTest
+    @MethodSource("mapProvider")
+    void skippingFirstElementInMapWithStreamSkip(Map<String, String> input) {
+        testableSkip.skippingFirstElementInMapWithStreamSkip(input);
+        List<?> actual = testableSkip.getResult();
+        assertEquals(actual.size(), input.size() - 1);
+    }
+
+    @ParameterizedTest
+    @MethodSource("listProvider")
+    void skippingFirstElementInListWithSubList(List<String> input, List<String> expected) {
+        testableSkip.skippingFirstElementInListWithSubList(input);
+        List<?> actual = testableSkip.getResult();
+        assertEquals(actual, expected);
+    }
+
+    @ParameterizedTest
+    @MethodSource("listProvider")
+    void skippingFirstElementInListWithForLoopWithAdditionalCheck(List<String> input, List<String> expected) {
+        testableSkip.skippingFirstElementInListWithForLoopWithAdditionalCheck(input);
+        List<?> actual = testableSkip.getResult();
+        assertEquals(actual, expected);
+    }
+
+    @ParameterizedTest
+    @MethodSource("listProvider")
+    void skippingFirstElementInListWithWhileLoopWithCounter(List<String> input, List<String> expected) {
+        testableSkip.skippingFirstElementInListWithWhileLoopWithCounter(input);
+        List<?> actual = testableSkip.getResult();
+        assertEquals(actual, expected);
+    }
+
+    @ParameterizedTest
+    @MethodSource("listProvider")
+    void skippingFirstElementInListWithReduce(List<String> input, List<String> expected) {
+        testableSkip.skippingFirstElementInListWithReduce(input);
+        List<?> actual = testableSkip.getResult();
+        assertEquals(actual, expected);
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-5/src/test/java/com/baeldung/skippingfirstelement/TestableSkip.java b/core-java-modules/core-java-collections-5/src/test/java/com/baeldung/skippingfirstelement/TestableSkip.java
new file mode 100644
index 0000000000..0e2f340485
--- /dev/null
+++ b/core-java-modules/core-java-collections-5/src/test/java/com/baeldung/skippingfirstelement/TestableSkip.java
@@ -0,0 +1,10 @@
+package com.baeldung.skippingfirstelement;
+
+import java.util.List;
+
+public interface TestableSkip {
+
+    void reset();
+
+    List<?> getResult();
+}
diff --git a/core-java-modules/core-java-collections-5/src/test/java/com/baeldung/skippingfirstelement/TestableSkipFirstElement.java b/core-java-modules/core-java-collections-5/src/test/java/com/baeldung/skippingfirstelement/TestableSkipFirstElement.java
new file mode 100644
index 0000000000..99facb73ad
--- /dev/null
+++ b/core-java-modules/core-java-collections-5/src/test/java/com/baeldung/skippingfirstelement/TestableSkipFirstElement.java
@@ -0,0 +1,37 @@
+package com.baeldung.skippingfirstelement;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
+
+public class TestableSkipFirstElement extends SkipFirstElementExample implements TestableSkip {
+
+
+    private List<String> processedList = new ArrayList<>();
+    private List<Entry<String, String>> processedEntryList = new ArrayList<>();
+
+    @Override
+    public void process(String string) {
+        processedList.add(string);
+    }
+
+    @Override
+    public void process(Entry<String, String> stringEntry) {
+        processedEntryList.add(stringEntry);
+    }
+
+    @Override
+    public void reset() {
+        processedList.clear();
+        processedEntryList.clear();
+    }
+
+    @Override
+    public List<?> getResult() {
+        if (!processedList.isEmpty())
+            return processedList;
+        return processedEntryList;
+    }
+
+
+}
diff --git a/core-java-modules/core-java-collections-array-list-2/README.md b/core-java-modules/core-java-collections-array-list-2/README.md
new file mode 100644
index 0000000000..575e0dbb07
--- /dev/null
+++ b/core-java-modules/core-java-collections-array-list-2/README.md
@@ -0,0 +1,6 @@
+## Core Java Collections ArrayList
+
+This module contains articles about the Java ArrayList collection
+
+### Relevant Articles:
+- [Create an ArrayList with Multiple Object Types](https://www.baeldung.com/java-arraylist-multiple-object-types)
diff --git a/core-java-modules/core-java-collections-array-list-2/pom.xml b/core-java-modules/core-java-collections-array-list-2/pom.xml
new file mode 100644
index 0000000000..042f6e5bb5
--- /dev/null
+++ b/core-java-modules/core-java-collections-array-list-2/pom.xml
@@ -0,0 +1,32 @@
+<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>core-java-collections-array-list-2</artifactId>
+    <name>core-java-collections-array-list-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>
+    
+    <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>
+        </plugins>
+    </build>
+    
+    <properties>
+        <maven-compiler-plugin.source>17</maven-compiler-plugin.source>
+        <maven-compiler-plugin.target>17</maven-compiler-plugin.target>
+    </properties>
+</project>
diff --git a/core-java-modules/core-java-collections-array-list-2/src/main/java/com/baeldung/list/multipleobjecttypes/AlternativeMultipeTypeList.java b/core-java-modules/core-java-collections-array-list-2/src/main/java/com/baeldung/list/multipleobjecttypes/AlternativeMultipeTypeList.java
new file mode 100644
index 0000000000..5315147dff
--- /dev/null
+++ b/core-java-modules/core-java-collections-array-list-2/src/main/java/com/baeldung/list/multipleobjecttypes/AlternativeMultipeTypeList.java
@@ -0,0 +1,51 @@
+package com.baeldung.list.multipleobjecttypes;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.function.Predicate;
+
+public class AlternativeMultipeTypeList {
+
+    public static void main(String[] args) {
+        // List of Parent Class
+        ArrayList<Number> myList = new ArrayList<>();
+        myList.add(1.2);
+        myList.add(2);
+        myList.add(-3.5);
+
+        // List of Interface type
+        ArrayList<Map> diffMapList = new ArrayList<>();
+        diffMapList.add(new HashMap<>());
+        diffMapList.add(new TreeMap<>());
+        diffMapList.add(new LinkedHashMap<>());
+
+        // List of Custom Object
+        ArrayList<CustomObject> objList = new ArrayList<>();
+        objList.add(new CustomObject("String"));
+        objList.add(new CustomObject(2));
+
+        // List via Functional Interface
+        List<Object> dataList = new ArrayList<>();
+
+        Predicate<Object> myPredicate = inputData -> (inputData instanceof String || inputData instanceof Integer);
+
+        UserFunctionalInterface myInterface = (listObj, data) -> {
+            if (myPredicate.test(data))
+                listObj.add(data);
+            else
+                System.out.println("Skipping input as data not allowed for class: " + data.getClass()
+                    .getSimpleName());
+            return listObj;
+        };
+
+        myInterface.addToList(dataList, Integer.valueOf(2));
+        myInterface.addToList(dataList, Double.valueOf(3.33));
+        myInterface.addToList(dataList, "String Value");
+        myInterface.printList(dataList);
+    }
+
+}
diff --git a/core-java-modules/core-java-collections-array-list-2/src/main/java/com/baeldung/list/multipleobjecttypes/CustomObject.java b/core-java-modules/core-java-collections-array-list-2/src/main/java/com/baeldung/list/multipleobjecttypes/CustomObject.java
new file mode 100644
index 0000000000..b3ac4ffddb
--- /dev/null
+++ b/core-java-modules/core-java-collections-array-list-2/src/main/java/com/baeldung/list/multipleobjecttypes/CustomObject.java
@@ -0,0 +1,22 @@
+package com.baeldung.list.multipleobjecttypes;
+
+public class CustomObject {
+    String classData;
+    Integer intData;
+
+    CustomObject(String classData) {
+        this.classData = classData;
+    }
+
+    CustomObject(Integer intData) {
+        this.intData = intData;
+    }
+
+    public String getClassData() {
+        return this.classData;
+    }
+
+    public Integer getIntData() {
+        return this.intData;
+    }
+}
diff --git a/core-java-modules/core-java-collections-array-list-2/src/main/java/com/baeldung/list/multipleobjecttypes/MultipleObjectTypeArrayList.java b/core-java-modules/core-java-collections-array-list-2/src/main/java/com/baeldung/list/multipleobjecttypes/MultipleObjectTypeArrayList.java
new file mode 100644
index 0000000000..c5740c5cf8
--- /dev/null
+++ b/core-java-modules/core-java-collections-array-list-2/src/main/java/com/baeldung/list/multipleobjecttypes/MultipleObjectTypeArrayList.java
@@ -0,0 +1,40 @@
+package com.baeldung.list.multipleobjecttypes;
+
+import java.math.BigInteger;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class MultipleObjectTypeArrayList {
+
+    public static void main(String[] args) {
+
+        ArrayList<Object> multiTypeList = new ArrayList<>();
+
+        multiTypeList.add(Integer.valueOf(10));
+        multiTypeList.add(Double.valueOf(11.5));
+        multiTypeList.add("String Data");
+        multiTypeList.add(Arrays.asList(1, 2, 3));
+        multiTypeList.add(new CustomObject("Class Data"));
+        multiTypeList.add(BigInteger.valueOf(123456789));
+        multiTypeList.add(LocalDate.of(2023, 9, 19));
+
+        for (Object dataObj : multiTypeList) {
+            if (dataObj instanceof Integer intData)
+                System.out.println("Integer Data : " + intData);
+            else if (dataObj instanceof Double doubleData)
+                System.out.println("Double Data : " + doubleData);
+            else if (dataObj instanceof String stringData)
+                System.out.println("String Data : " + stringData);
+            else if (dataObj instanceof List<?> intList)
+                System.out.println("List Data : " + intList);
+            else if (dataObj instanceof CustomObject customObj)
+                System.out.println("CustomObject Data : " + customObj.getClassData());
+            else if (dataObj instanceof BigInteger bigIntData)
+                System.out.println("BigInteger Data : " + bigIntData);
+            else if (dataObj instanceof LocalDate localDate)
+                System.out.println("LocalDate Data : " + localDate.toString());
+        }
+    }
+}
diff --git a/core-java-modules/core-java-collections-array-list-2/src/main/java/com/baeldung/list/multipleobjecttypes/UserFunctionalInterface.java b/core-java-modules/core-java-collections-array-list-2/src/main/java/com/baeldung/list/multipleobjecttypes/UserFunctionalInterface.java
new file mode 100644
index 0000000000..6c0f8451da
--- /dev/null
+++ b/core-java-modules/core-java-collections-array-list-2/src/main/java/com/baeldung/list/multipleobjecttypes/UserFunctionalInterface.java
@@ -0,0 +1,18 @@
+package com.baeldung.list.multipleobjecttypes;
+
+import java.util.List;
+
+@FunctionalInterface
+public interface UserFunctionalInterface {
+
+    List<Object> addToList(List<Object> list, Object data);
+
+    default void printList(List<Object> dataList) {
+        for (Object data : dataList) {
+            if (data instanceof String stringData)
+                System.out.println("String Data: " + stringData);
+            if (data instanceof Integer intData)
+                System.out.println("Integer Data: " + intData);
+        }
+    }
+}
diff --git a/core-java-modules/core-java-collections-conversions-3/README.md b/core-java-modules/core-java-collections-conversions-3/README.md
new file mode 100644
index 0000000000..653f518840
--- /dev/null
+++ b/core-java-modules/core-java-collections-conversions-3/README.md
@@ -0,0 +1,6 @@
+## Java Collections Cookbooks and Examples
+
+This module contains articles about conversions among Collection types in Java.
+
+### Relevant Articles:
+- [Converting HashMap Values to an ArrayList in Java](https://www.baeldung.com/java-hashmap-arraylist)
diff --git a/core-java-modules/core-java-collections-conversions-3/pom.xml b/core-java-modules/core-java-collections-conversions-3/pom.xml
new file mode 100644
index 0000000000..4813d33713
--- /dev/null
+++ b/core-java-modules/core-java-collections-conversions-3/pom.xml
@@ -0,0 +1,26 @@
+<?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-collections-conversions-3</artifactId>
+    <name>core-java-collections-conversions-3</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-collections-conversions-3</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-collections-conversions-3/src/main/java/com/baeldung/hashmaptoarraylist/HashMapToArrayListConverterUtils.java b/core-java-modules/core-java-collections-conversions-3/src/main/java/com/baeldung/hashmaptoarraylist/HashMapToArrayListConverterUtils.java
new file mode 100644
index 0000000000..dd5cc1fe47
--- /dev/null
+++ b/core-java-modules/core-java-collections-conversions-3/src/main/java/com/baeldung/hashmaptoarraylist/HashMapToArrayListConverterUtils.java
@@ -0,0 +1,66 @@
+package com.baeldung.hashmaptoarraylist;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Maps.EntryTransformer;
+
+public class HashMapToArrayListConverterUtils {
+
+    static ArrayList<String> convertUsingConstructor(HashMap<Integer, String> hashMap) {
+        if (hashMap == null) {
+            return null;
+        }
+        return new ArrayList<String>(hashMap.values());
+    }
+
+    static ArrayList<String> convertUsingAddAllMethod(HashMap<Integer, String> hashMap) {
+        if (hashMap == null) {
+            return null;
+        }
+
+        ArrayList<String> arrayList = new ArrayList<String>(hashMap.size());
+        arrayList.addAll(hashMap.values());
+
+        return arrayList;
+    }
+
+    static ArrayList<String> convertUsingStreamApi(HashMap<Integer, String> hashMap) {
+        if (hashMap == null) {
+            return null;
+        }
+
+        return hashMap.values()
+            .stream()
+            .collect(Collectors.toCollection(ArrayList::new));
+    }
+
+    static ArrayList<String> convertUsingForLoop(HashMap<Integer, String> hashMap) {
+        if (hashMap == null) {
+            return null;
+        }
+
+        ArrayList<String> arrayList = new ArrayList<String>(hashMap.size());
+        for (Map.Entry<Integer, String> entry : hashMap.entrySet()) {
+            arrayList.add(entry.getValue());
+        }
+
+        return arrayList;
+    }
+
+    static public ArrayList<String> convertUsingGuava(HashMap<Integer, String> hashMap) {
+        if (hashMap == null) {
+            return null;
+        }
+
+        EntryTransformer<Integer, String, String> entryMapTransformer = (key, value) -> value;
+
+        return Lists.newArrayList(Maps.transformEntries(hashMap, entryMapTransformer)
+            .values());
+    }
+
+}
diff --git a/core-java-modules/core-java-collections-conversions-3/src/test/java/com/baeldung/hashmaptoarraylist/HashMapToArrayListConverterUtilsUnitTest.java b/core-java-modules/core-java-collections-conversions-3/src/test/java/com/baeldung/hashmaptoarraylist/HashMapToArrayListConverterUtilsUnitTest.java
new file mode 100644
index 0000000000..26a42e77c0
--- /dev/null
+++ b/core-java-modules/core-java-collections-conversions-3/src/test/java/com/baeldung/hashmaptoarraylist/HashMapToArrayListConverterUtilsUnitTest.java
@@ -0,0 +1,60 @@
+package com.baeldung.hashmaptoarraylist;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class HashMapToArrayListConverterUtilsUnitTest {
+
+    private HashMap<Integer, String> hashMap;
+
+    @Before
+    public void beforeEach() {
+        hashMap = new HashMap<>();
+        hashMap.put(1, "AAA");
+        hashMap.put(2, "BBB");
+        hashMap.put(3, "CCC");
+        hashMap.put(4, "DDD");
+    }
+
+    @Test
+    public void givenAHashMap_whenConvertUsingConstructor_thenReturnArrayList() {
+        ArrayList<String> myList = HashMapToArrayListConverterUtils.convertUsingConstructor(hashMap);
+
+        assertThat(hashMap.values(), containsInAnyOrder(myList.toArray()));
+    }
+
+    @Test
+    public void givenAHashMap_whenConvertUsingAddAllMethod_thenReturnArrayList() {
+        ArrayList<String> myList = HashMapToArrayListConverterUtils.convertUsingAddAllMethod(hashMap);
+
+        assertThat(hashMap.values(), containsInAnyOrder(myList.toArray()));
+    }
+
+    @Test
+    public void givenAHashMap_whenConvertUsingForLoop_thenReturnArrayList() {
+        ArrayList<String> myList = HashMapToArrayListConverterUtils.convertUsingForLoop(hashMap);
+
+        assertThat(hashMap.values(), containsInAnyOrder(myList.toArray()));
+    }
+
+    @Test
+    public void givenAHashMap_whenConvertUsingStreamApi_thenReturnArrayList() {
+        ArrayList<String> myList = HashMapToArrayListConverterUtils.convertUsingStreamApi(hashMap);
+
+        assertThat(hashMap.values(), containsInAnyOrder(myList.toArray()));
+    }
+
+    @Test
+    public void givenAHashMap_whenConvertUsingGuava_thenReturnArrayList() {
+        ArrayList<String> myList = HashMapToArrayListConverterUtils.convertUsingGuava(hashMap);
+
+        assertThat(hashMap.values(), containsInAnyOrder(myList.toArray()));
+    }
+
+}
diff --git a/core-java-modules/core-java-collections-list-6/README.md b/core-java-modules/core-java-collections-list-6/README.md
new file mode 100644
index 0000000000..fd162743dc
--- /dev/null
+++ b/core-java-modules/core-java-collections-list-6/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Check if a List Contains a String Element While Ignoring Case](https://www.baeldung.com/java-list-search-case-insensitive)
diff --git a/core-java-modules/core-java-collections-list-6/pom.xml b/core-java-modules/core-java-collections-list-6/pom.xml
new file mode 100644
index 0000000000..9bea6358c4
--- /dev/null
+++ b/core-java-modules/core-java-collections-list-6/pom.xml
@@ -0,0 +1,15 @@
+<?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-collections-list-6</artifactId>
+    <name>core-java-collections-list-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>
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-list-6/src/test/java/com/baeldung/lists/StringListCaseInsensitiveContainsUnitTest.java b/core-java-modules/core-java-collections-list-6/src/test/java/com/baeldung/lists/StringListCaseInsensitiveContainsUnitTest.java
new file mode 100644
index 0000000000..51fafcca6b
--- /dev/null
+++ b/core-java-modules/core-java-collections-list-6/src/test/java/com/baeldung/lists/StringListCaseInsensitiveContainsUnitTest.java
@@ -0,0 +1,44 @@
+package com.baeldung.lists;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+public class StringListCaseInsensitiveContainsUnitTest {
+    private final static List<String> THE_LIST = List.of("Game of Thrones", "Forrest Gump", "American Beauty", "Pretty Woman", "Catch Me If You Can");
+
+    @Test
+    void whenUsingContains_thenGetExpectedResult() {
+        assertFalse(THE_LIST.contains("catch me if you can"));
+    }
+
+    boolean ignoreCaseContainsForLoop(List<String> list, String value) {
+        for (String e : list) {
+            if (value.equalsIgnoreCase(e))
+                return true;
+        }
+        return false;
+    }
+
+    @Test
+    void whenUsingIgnoreCaseContainsForLoop_thenGetExpectedResult() {
+        assertTrue(ignoreCaseContainsForLoop(THE_LIST, "CATCH me if you CAN"));
+        assertTrue(ignoreCaseContainsForLoop(THE_LIST, "game of thrones"));
+        assertFalse(ignoreCaseContainsForLoop(THE_LIST, "The Godfather"));
+    }
+
+    @Test
+    void whenUsingIgnoreCaseContainsStream_thenGetExpectedResult() {
+        assertTrue(THE_LIST.stream()
+          .anyMatch(e -> e.equalsIgnoreCase("CATCH me if you CAN")));
+
+        assertTrue(THE_LIST.stream()
+          .anyMatch("game of thrones"::equalsIgnoreCase));
+
+        assertFalse(THE_LIST.stream()
+          .anyMatch("The Godfather"::equalsIgnoreCase));
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/identity/IdentityHashMapDemonstrator.java b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/identity/IdentityHashMapDemonstrator.java
index 3cbe09b93f..3b98423120 100644
--- a/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/identity/IdentityHashMapDemonstrator.java
+++ b/core-java-modules/core-java-collections-maps-5/src/main/java/com/baeldung/map/identity/IdentityHashMapDemonstrator.java
@@ -53,7 +53,7 @@ public class IdentityHashMapDemonstrator {
         }
     }
 
-    private static class Book {
+    static class Book {
         String title;
         int year;
 
diff --git a/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/identity/IdentityHashMapDemonstratorUnitTest.java b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/identity/IdentityHashMapDemonstratorUnitTest.java
index cc74ce4dd6..388338c3ab 100644
--- a/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/identity/IdentityHashMapDemonstratorUnitTest.java
+++ b/core-java-modules/core-java-collections-maps-5/src/test/java/com/baeldung/map/identity/IdentityHashMapDemonstratorUnitTest.java
@@ -1,8 +1,11 @@
 package com.baeldung.map.identity;
 
+import com.baeldung.map.identity.IdentityHashMapDemonstrator.Book;
 import org.junit.jupiter.api.Test;
 
 import java.util.IdentityHashMap;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -18,4 +21,44 @@ public class IdentityHashMapDemonstratorUnitTest {
         assertEquals("Fantasy", identityHashMap.get("genre"));
         assertEquals("Drama", identityHashMap.get(newGenreKey));
     }
+
+    @Test
+    @EnabledForJreRange(max = JRE.JAVA_19)
+    public void removeEntryComparingValueByEquality() {
+        Book book = new Book("A Passage to India", 1924);
+        IdentityHashMap<Book, String> identityHashMap = new IdentityHashMap<>(10);
+        identityHashMap.put(book, "A great work of fiction");
+        identityHashMap.remove(book, new String("A great work of fiction"));
+        assertEquals(null, identityHashMap.get(book));
+    }
+
+    @Test
+    @EnabledForJreRange(max = JRE.JAVA_19)
+    public void replaceEntryComparingValueByEquality() {
+        Book book = new Book("A Passage to India", 1924);
+        IdentityHashMap<Book, String> identityHashMap = new IdentityHashMap<>(10);
+        identityHashMap.put(book, "A great work of fiction");
+        identityHashMap.replace(book, new String("A great work of fiction"), "One of the greatest books");
+        assertEquals("One of the greatest books", identityHashMap.get(book));
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_20)
+    public void dontRemoveEntryComparingValueByEquality() {
+        Book book = new Book("A Passage to India", 1924);
+        IdentityHashMap<Book, String> identityHashMap = new IdentityHashMap<>(10);
+        identityHashMap.put(book, "A great work of fiction");
+        identityHashMap.remove(book, new String("A great work of fiction"));
+        assertEquals("A great work of fiction", identityHashMap.get(book));
+    }
+
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_20)
+    public void dontReplaceEntryComparingValueByEquality() {
+        Book book = new Book("A Passage to India", 1924);
+        IdentityHashMap<Book, String> identityHashMap = new IdentityHashMap<>(10);
+        identityHashMap.put(book, "A great work of fiction");
+        identityHashMap.replace(book, new String("A great work of fiction"), "One of the greatest books");
+        assertEquals("A great work of fiction", identityHashMap.get(book));
+    }
 }
diff --git a/core-java-modules/core-java-collections-maps-6/src/test/com/baeldung/objecttomap/ObjectToMapUnitTest.java b/core-java-modules/core-java-collections-maps-6/src/test/com/baeldung/objecttomap/ObjectToMapUnitTest.java
deleted file mode 100644
index 52c2fb2bea..0000000000
--- a/core-java-modules/core-java-collections-maps-6/src/test/com/baeldung/objecttomap/ObjectToMapUnitTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package java.com.baeldung.objecttomap;
-import com.google.gson.Gson;
-import org.junit.Assert;
-import org.junit.Test;
-import wiremock.com.fasterxml.jackson.core.type.TypeReference;
-import wiremock.com.fasterxml.jackson.databind.ObjectMapper;
-import wiremock.com.google.common.reflect.TypeToken;
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
-
-public class ObjectToMapUnitTest {
-    Employee employee = new Employee("John", 3000.0);
-
-    @Test
-    public void givenJavaObject_whenUsingReflection_thenConvertToMap() throws IllegalAccessException {
-        Map<String, Object> map = convertUsingReflection(employee);
-        Assert.assertEquals(employee.getName(), map.get("name"));
-        Assert.assertEquals(employee.getSalary(), map.get("salary"));
-    }
-
-    private Map<String, Object> convertUsingReflection(Object object) throws IllegalAccessException {
-        Map<String, Object> map = new HashMap<>();
-        Field[] fields = object.getClass().getDeclaredFields();
-
-        for (Field field : fields) {
-            field.setAccessible(true);
-            map.put(field.getName(), field.get(object));
-        }
-
-        return map;
-    }
-
-    @Test
-    public void givenJavaObject_whenUsingJackson_thenConvertToMap() {
-        ObjectMapper objectMapper = new ObjectMapper();
-        Map<String, Object> map = objectMapper.convertValue(employee, new TypeReference<Map<String, Object>>() {});
-        Assert.assertEquals(employee.getName(), map.get("name"));
-        Assert.assertEquals(employee.getSalary(), map.get("salary"));
-    }
-
-    @Test
-    public void givenJavaObject_whenUsingGson_thenConvertToMap() {
-        Gson gson = new Gson();
-        String json = gson.toJson(employee);
-        Map<String, Object> map = gson.fromJson(json, new TypeToken<Map<String, Object>>() {}.getType());
-        Assert.assertEquals(employee.getName(), map.get("name"));
-        Assert.assertEquals(employee.getSalary(), map.get("salary"));
-    }
-
-    private static class Employee {
-        private String name;
-        private Double salary;
-
-        public Employee(String name, Double salary) {
-            this.name = name;
-            this.salary = salary;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public Double getSalary() {
-            return salary;
-        }
-
-        public void setSalary(Double age) {
-            this.salary = salary;
-        }
-    }
-}
diff --git a/core-java-modules/core-java-collections-maps-6/src/test/java/com/baeldung/objecttomap/ObjectToMapUnitTest.java b/core-java-modules/core-java-collections-maps-6/src/test/java/com/baeldung/objecttomap/ObjectToMapUnitTest.java
new file mode 100644
index 0000000000..e232121048
--- /dev/null
+++ b/core-java-modules/core-java-collections-maps-6/src/test/java/com/baeldung/objecttomap/ObjectToMapUnitTest.java
@@ -0,0 +1,128 @@
+package com.baeldung.objecttomap;
+
+import static org.junit.Assert.assertEquals;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
+import org.junit.Test;
+import java.lang.reflect.Field;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+
+public class ObjectToMapUnitTest {
+    Employee employee = new Employee("John", 3000.0);
+
+    @Test
+    public void givenJavaObject_whenUsingReflection_thenConvertToMap() throws IllegalAccessException {
+        Map<String, Object> map = convertUsingReflection(employee);
+        assertEquals(employee.getName(), map.get("name"));
+        assertEquals(employee.getSalary(), map.get("salary"));
+    }
+
+    private Map<String, Object> convertUsingReflection(Object object) throws IllegalAccessException {
+        Map<String, Object> map = new HashMap<>();
+        Field[] fields = object.getClass().getDeclaredFields();
+
+        for (Field field : fields) {
+            field.setAccessible(true);
+            map.put(field.getName(), field.get(object));
+        }
+
+        return map;
+    }
+
+    @Test
+    public void givenJavaObject_whenUsingJackson_thenConvertToMap() {
+        ObjectMapper objectMapper = new ObjectMapper();
+        Map<String, Object> map = objectMapper.convertValue(employee, new TypeReference<Map<String, Object>>() {});
+        assertEquals(employee.getName(), map.get("name"));
+        assertEquals(employee.getSalary(), map.get("salary"));
+    }
+
+    @Test
+    public void givenJavaObject_whenUsingGson_thenConvertToMap() {
+        Gson gson = new Gson();
+        String json = gson.toJson(employee);
+        Map<String, Object> map = gson.fromJson(json, new TypeToken<Map<String, Object>>() {}.getType());
+        assertEquals(employee.getName(), map.get("name"));
+        assertEquals(employee.getSalary(), map.get("salary"));
+    }
+
+    @Test
+    public void given_UnsortedMap_whenSortingByValueDescending_thenValuesAreInDescendingOrder() {
+        Map<String, Integer> unsortedMap = new HashMap<>();
+        unsortedMap.put("one", 1);
+        unsortedMap.put("three", 3);
+        unsortedMap.put("five", 5);
+        unsortedMap.put("two", 2);
+        unsortedMap.put("four", 4);
+
+        Map<String, Integer> sortedMap = sortMapByValueDescending(unsortedMap);
+
+        assertEquals(5, sortedMap.size());
+        final Iterator<Integer> iterator = sortedMap.values().iterator();
+        assertEquals(5, (int) iterator.next());
+        assertEquals(4, (int) iterator.next());
+        assertEquals(3, (int) iterator.next());
+        assertEquals(2, (int) iterator.next());
+        assertEquals(1, (int) iterator.next());
+    }
+
+    @Test
+    public void given_UnsortedMap_whenUsingTreeMap_thenKeysAreInDescendingOrder() {
+        SortedMap<String, Integer> treeMap = new TreeMap<>(Comparator.reverseOrder());
+        treeMap.put("one", 1);
+        treeMap.put("three", 3);
+        treeMap.put("five", 5);
+        treeMap.put("two", 2);
+        treeMap.put("four", 4);
+
+        assertEquals(5, treeMap.size());
+        final Iterator<String> iterator = treeMap.keySet().iterator();
+        assertEquals("two", iterator.next());
+        assertEquals("three", iterator.next());
+        assertEquals("one", iterator.next());
+        assertEquals("four", iterator.next());
+        assertEquals("five", iterator.next());
+    }
+
+    private static class Employee {
+        private String name;
+        private Double salary;
+
+        public Employee(String name, Double salary) {
+            this.name = name;
+            this.salary = salary;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Double getSalary() {
+            return salary;
+        }
+
+        public void setSalary(Double age) {
+            this.salary = salary;
+        }
+    }
+
+    public static <K, V extends Comparable<? super V>> Map<K, V> sortMapByValueDescending(Map<K, V> map) {
+        return map.entrySet().stream()
+                .sorted(Map.Entry.<K, V>comparingByValue().reversed())
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+    }
+}
diff --git a/core-java-modules/core-java-collections-maps-7/README.md b/core-java-modules/core-java-collections-maps-7/README.md
new file mode 100644
index 0000000000..c63f3b360b
--- /dev/null
+++ b/core-java-modules/core-java-collections-maps-7/README.md
@@ -0,0 +1 @@
+## Relevant Articles
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-maps-7/pom.xml b/core-java-modules/core-java-collections-maps-7/pom.xml
new file mode 100644
index 0000000000..bb7c6e9fb5
--- /dev/null
+++ b/core-java-modules/core-java-collections-maps-7/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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>core-java-collections-maps-7</artifactId>
+    <name>core-java-collections-maps-7</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <artifactId>core-java-modules</artifactId>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <properties>
+        <spring.version>5.2.5.RELEASE</spring.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.12.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>1.36</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.9</version>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20230227</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-collections-maps-7/src/main/java/com/baeldung/map/ConvertHashMapStringToHashMapObjectUsingtoString.java b/core-java-modules/core-java-collections-maps-7/src/main/java/com/baeldung/map/ConvertHashMapStringToHashMapObjectUsingtoString.java
new file mode 100644
index 0000000000..2b3d6db89c
--- /dev/null
+++ b/core-java-modules/core-java-collections-maps-7/src/main/java/com/baeldung/map/ConvertHashMapStringToHashMapObjectUsingtoString.java
@@ -0,0 +1,60 @@
+package com.baeldung.map;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ConvertHashMapStringToHashMapObjectUsingtoString {
+    public String name;
+    public int age;
+
+    public ConvertHashMapStringToHashMapObjectUsingtoString(String name, int age) {
+        this.name = name;
+        this.age = age;
+    }
+
+    public static ConvertHashMapStringToHashMapObjectUsingtoString deserializeCustomObject(String valueString) {
+        if (valueString.startsWith("{") && valueString.endsWith("}")) {
+            valueString = valueString.substring(1, valueString.length() - 1);
+            String[] parts = valueString.split(",");
+            String name = null;
+            int age = -1;
+            for (String part : parts) {
+                String[] keyValue = part.split("=");
+                if (keyValue.length == 2) {
+                    String key = keyValue[0].trim();
+                    String val = keyValue[1].trim();
+                    if (key.equals("name")) {
+                        name = val;
+                    } else if (key.equals("age")) {
+                        age = Integer.parseInt(val);
+                    }
+                }
+            }
+            if (name != null && age >= 0) {
+                return new ConvertHashMapStringToHashMapObjectUsingtoString(name, age);
+            }
+        }
+        return new ConvertHashMapStringToHashMapObjectUsingtoString("", -1);
+    }
+
+    public static void main(String[] args) {
+        String hashMapString = "{key1={name=John, age=30}, key2={name=Alice, age=25}}";
+        String keyValuePairs = hashMapString.replaceAll("[{}\\s]", "");
+        String[] pairs = keyValuePairs.split(",");
+        Map<String, ConvertHashMapStringToHashMapObjectUsingtoString> actualHashMap = new HashMap<>();
+        for (String pair : pairs) {
+            String[] keyValue = pair.split("=");
+            if (keyValue.length == 2) {
+                String key = keyValue[0];
+                ConvertHashMapStringToHashMapObjectUsingtoString value = deserializeCustomObject(keyValue[1]);
+                actualHashMap.put(key, value);
+            }
+        }
+        System.out.println(actualHashMap);
+    }
+
+    @Override
+    public String toString() {
+        return "{name=" + name + ", age=" + age + "}";
+    }
+}
diff --git a/core-java-modules/core-java-collections-maps-7/src/test/java/com/baeldung/map/ConvertHashMapStringToHashMapObjectUsingtoStringUnitTest.java b/core-java-modules/core-java-collections-maps-7/src/test/java/com/baeldung/map/ConvertHashMapStringToHashMapObjectUsingtoStringUnitTest.java
new file mode 100644
index 0000000000..7d31402131
--- /dev/null
+++ b/core-java-modules/core-java-collections-maps-7/src/test/java/com/baeldung/map/ConvertHashMapStringToHashMapObjectUsingtoStringUnitTest.java
@@ -0,0 +1,31 @@
+package com.baeldung.map;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class ConvertHashMapStringToHashMapObjectUsingtoStringUnitTest {
+
+    @Test
+    void givenValidCustomObject_whenSerializing_thenSerializedStringIsCorrect() {
+        ConvertHashMapStringToHashMapObjectUsingtoString customObject = new ConvertHashMapStringToHashMapObjectUsingtoString("John", 30);
+        String expectedSerializedString = "{name=John, age=30}";
+        assertEquals(expectedSerializedString, customObject.toString());
+    }
+
+    @Test
+    void givenValidSerializedString_whenDeserializing_thenCustomObjectIsCorrect() {
+        String serializedString = "{name=Alice, age=25}";
+        ConvertHashMapStringToHashMapObjectUsingtoString customObject = ConvertHashMapStringToHashMapObjectUsingtoString.deserializeCustomObject(serializedString);
+        assertEquals("Alice", customObject.name);
+        assertEquals(25, customObject.age);
+    }
+
+    @Test
+    void givenInvalidSerializedString_whenDeserializing_thenDefaultCustomObjectIsCreated() {
+        String invalidSerializedString = "{invalidString}";
+        ConvertHashMapStringToHashMapObjectUsingtoString customObject = ConvertHashMapStringToHashMapObjectUsingtoString.deserializeCustomObject(invalidSerializedString);
+        assertEquals("", customObject.name);
+        assertEquals(-1, customObject.age);
+    }
+}
diff --git a/core-java-modules/core-java-collections-set-2/README.md b/core-java-modules/core-java-collections-set-2/README.md
index feeffed1c4..ee41908faf 100644
--- a/core-java-modules/core-java-collections-set-2/README.md
+++ b/core-java-modules/core-java-collections-set-2/README.md
@@ -5,4 +5,5 @@
 - [Sorting a HashSet in Java](https://www.baeldung.com/java-sort-hashset)
 - [How to Get First Item From a Java Set](https://www.baeldung.com/first-item-set)
 - [Cartesian Product of Any Number of Sets in Java](https://www.baeldung.com/java-cartesian-product-sets)
+- [How to Get Index of an Item in Java Set](https://www.baeldung.com/java-set-element-find-index)
 - More articles: [[<-- prev]](/core-java-modules/core-java-collections-set)
diff --git a/core-java-modules/core-java-concurrency-collections-2/README.md b/core-java-modules/core-java-concurrency-collections-2/README.md
index 2d65cf88e7..fdb7af5936 100644
--- a/core-java-modules/core-java-concurrency-collections-2/README.md
+++ b/core-java-modules/core-java-concurrency-collections-2/README.md
@@ -5,4 +5,5 @@
 - [Java Concurrent HashSet Equivalent to ConcurrentHashMap](https://www.baeldung.com/java-concurrent-hashset-concurrenthashmap)
 - [Reading and Writing With a ConcurrentHashMap](https://www.baeldung.com/concurrenthashmap-reading-and-writing)
 - [ArrayBlockingQueue vs. LinkedBlockingQueue](https://www.baeldung.com/java-arrayblockingqueue-vs-linkedblockingqueue)
+- [Difference Between Hashtable and ConcurrentHashMap in Java](https://www.baeldung.com/java-hashtable-vs-concurrenthashmap)
 - [[<-- Prev]](/core-java-modules/core-java-concurrency-collections)
diff --git a/core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/epochtolocaldate/EpochTimeToLocalDateTimeConverterUnitTest.java b/core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/epochtolocaldate/EpochTimeToLocalDateTimeConverterUnitTest.java
index 6e3b250938..80c403bb4e 100644
--- a/core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/epochtolocaldate/EpochTimeToLocalDateTimeConverterUnitTest.java
+++ b/core-java-modules/core-java-datetime-conversion/src/test/java/com/baeldung/epochtolocaldate/EpochTimeToLocalDateTimeConverterUnitTest.java
@@ -12,10 +12,10 @@ public class EpochTimeToLocalDateTimeConverterUnitTest {
     @Test
     public void testConvertEpochTimeToLocalDateTime() {
         long epochTimeMillis = 1624962431000L; // Example epoch time in milliseconds
-        LocalDateTime expectedDateTime = LocalDateTime.of(2021, 6, 29, 12, 13, 51);
+        LocalDateTime expectedDateTime = LocalDateTime.of(2021, 6, 29, 10, 27, 11);
 
         Instant instant = Instant.ofEpochMilli(epochTimeMillis);
-        ZoneId zoneId = ZoneId.systemDefault();
+        ZoneId zoneId = ZoneId.of("UTC");
         LocalDateTime actualDateTime = instant.atZone(zoneId).toLocalDateTime();
 
         assertEquals(expectedDateTime, actualDateTime);
diff --git a/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/datetime/DateTimeFormatterUnitTest.java b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/datetime/DateTimeFormatterUnitTest.java
index 172882af2c..d5128c522e 100644
--- a/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/datetime/DateTimeFormatterUnitTest.java
+++ b/core-java-modules/core-java-datetime-string/src/test/java/com/baeldung/datetime/DateTimeFormatterUnitTest.java
@@ -96,7 +96,8 @@ public class DateTimeFormatterUnitTest {
         String newYorkDateTimePattern = "dd.MM.yyyy HH:mm z";
         DateTimeFormatter newYorkDateFormatter = DateTimeFormatter.ofPattern(newYorkDateTimePattern);
         LocalDateTime summerDay = LocalDateTime.of(2016, 7, 31, 14, 15);
-        Assert.assertEquals("31.07.2016 14:15 EDT", newYorkDateFormatter.format(ZonedDateTime.of(summerDay, ZoneId.of("America/New_York"))));
+        Assert.assertEquals("31.07.2016 14:15 EDT",
+            newYorkDateFormatter.format(ZonedDateTime.of(summerDay, ZoneId.of("America/New_York"))));
     }
 
     @Test
@@ -121,8 +122,10 @@ public class DateTimeFormatterUnitTest {
     @Test
     public void shouldPrintFormattedDateTimeWithPredefined() {
         Assert.assertEquals("2018-03-09", DateTimeFormatter.ISO_LOCAL_DATE.format(LocalDate.of(2018, 3, 9)));
-        Assert.assertEquals("2018-03-09-03:00", DateTimeFormatter.ISO_OFFSET_DATE.format(LocalDate.of(2018, 3, 9).atStartOfDay(ZoneId.of("UTC-3"))));
-        Assert.assertEquals("Fri, 9 Mar 2018 00:00:00 -0300", DateTimeFormatter.RFC_1123_DATE_TIME.format(LocalDate.of(2018, 3, 9).atStartOfDay(ZoneId.of("UTC-3"))));
+        Assert.assertEquals("2018-03-09-03:00",
+            DateTimeFormatter.ISO_OFFSET_DATE.format(LocalDate.of(2018, 3, 9).atStartOfDay(ZoneId.of("UTC-3"))));
+        Assert.assertEquals("Fri, 9 Mar 2018 00:00:00 -0300",
+            DateTimeFormatter.RFC_1123_DATE_TIME.format(LocalDate.of(2018, 3, 9).atStartOfDay(ZoneId.of("UTC-3"))));
     }
 
     @Test
@@ -165,30 +168,62 @@ public class DateTimeFormatterUnitTest {
     public void shouldPrintFormattedZonedDateTime() {
         ZonedDateTime zonedDateTime = ZonedDateTime.of(2021, 02, 15, 0, 0, 0, 0, ZoneId.of("Europe/Paris"));
         String formattedZonedDateTime = DateTimeFormatter.ISO_INSTANT.format(zonedDateTime);
-        
+
         Assert.assertEquals("2021-02-14T23:00:00Z", formattedZonedDateTime);
     }
-    
+
     @Test(expected = UnsupportedTemporalTypeException.class)
     public void shouldExpectAnExceptionIfInputIsLocalDateTime() {
         DateTimeFormatter.ISO_INSTANT.format(LocalDate.now());
     }
-    
+
     @Test
     public void shouldParseZonedDateTime() {
         DateTimeFormatter formatter = DateTimeFormatter.ISO_INSTANT.withZone(ZoneId.systemDefault());
         ZonedDateTime zonedDateTime = ZonedDateTime.parse("2021-10-01T05:06:20Z", formatter);
-        
+
         Assert.assertEquals("2021-10-01T05:06:20Z", DateTimeFormatter.ISO_INSTANT.format(zonedDateTime));
     }
-    
+
     @Test(expected = DateTimeParseException.class)
     public void shouldExpectAnExceptionIfTimeZoneIsMissing() {
         ZonedDateTime zonedDateTime = ZonedDateTime.parse("2021-11-01T05:06:20Z", DateTimeFormatter.ISO_INSTANT);
     }
-    
+
     @Test(expected = DateTimeParseException.class)
     public void shouldExpectAnExceptionIfSecondIsMissing() {
         ZonedDateTime zonedDateTime = ZonedDateTime.parse("2021-12-02T08:06Z", DateTimeFormatter.ISO_INSTANT);
     }
+
+    @Test
+    public void testUSShortFormatting() {
+        LocalDate date = LocalDate.of(2023, 9, 18);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMM dd, yy: EEE").withLocale(Locale.US);
+        String formattedDate = date.format(formatter);
+        Assert.assertEquals("Sep 18, 23: Mon", formattedDate);
+    }
+
+    @Test
+    public void testUSFullFormatting() {
+        LocalDate date = LocalDate.of(2023, 9, 18);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMMM dd, yyyy: EEEE").withLocale(Locale.US);
+        String formattedDate = date.format(formatter);
+        Assert.assertEquals("September 18, 2023: Monday", formattedDate);
+    }
+
+    @Test
+    public void testKoreanShortFormatting() {
+        LocalDate date = LocalDate.of(2023, 9, 18);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMM dd, yy: EEE").withLocale(Locale.KOREA);
+        String formattedDate = date.format(formatter);
+        Assert.assertEquals("9월 18, 23: 월", formattedDate);
+    }
+
+    @Test
+    public void testKoreanFullFormatting() {
+        LocalDate date = LocalDate.of(2023, 9, 18);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMMM dd, yyyy: EEEE").withLocale(Locale.KOREA);
+        String formattedDate = date.format(formatter);
+        Assert.assertEquals("9월 18, 2023: 월요일", formattedDate);
+    }
 }
diff --git a/core-java-modules/core-java-documentation/README.md b/core-java-modules/core-java-documentation/README.md
index b66b9e8c05..972e76c165 100644
--- a/core-java-modules/core-java-documentation/README.md
+++ b/core-java-modules/core-java-documentation/README.md
@@ -3,4 +3,4 @@
 ### Relevant Articles: 
 
 - [Introduction to Javadoc](http://www.baeldung.com/javadoc)
-
+- [Code Snippets in Java API Documentation](https://www.baeldung.com/java-doc-code-snippets)
diff --git a/core-java-modules/core-java-documentation/src/main/java/com/baeldung/snippettag/GreetingsExternalSnippet.java b/core-java-modules/core-java-documentation/src/main/java/com/baeldung/snippettag/GreetingsExternalSnippet.java
new file mode 100644
index 0000000000..6cf27b7acc
--- /dev/null
+++ b/core-java-modules/core-java-documentation/src/main/java/com/baeldung/snippettag/GreetingsExternalSnippet.java
@@ -0,0 +1,18 @@
+package com.baeldung.snippettag;
+
+/**
+ * 
+ * External code snippet showing the loop process in binary search method.
+ * {@snippet class="BinarySearch" region="binary"}
+ * 
+ * Time Zone 
+ * {@snippet file="application.properties" region="zone"} 
+ *
+ */
+
+public class GreetingsExternalSnippet {
+    public void helloBinarySearch() {
+        System.out.println("Hi, it's great knowing that binary search uses a loop under the hood");
+    }
+
+}
diff --git a/core-java-modules/core-java-documentation/src/main/java/com/baeldung/snippettag/GreetingsHighlightTag.java b/core-java-modules/core-java-documentation/src/main/java/com/baeldung/snippettag/GreetingsHighlightTag.java
new file mode 100644
index 0000000000..03f30e1ad2
--- /dev/null
+++ b/core-java-modules/core-java-documentation/src/main/java/com/baeldung/snippettag/GreetingsHighlightTag.java
@@ -0,0 +1,35 @@
+package com.baeldung.snippettag;
+
+
+/**
+ * The code below shows a full highlighted line
+ * {@snippet :
+ * public void helloBaeldung() {
+ *     System.out.println("Hello From Team Baeldung"); // @highlight
+ * }
+ * }
+ * 
+ * highlighting a substring
+ * {@snippet :
+ * public void helloBaeldung() {
+ *     System.out.println("Hello From Team Baeldung"); // @highlight substring="println"
+ * }
+ * }
+ * 
+ * highlighting texts on multiple lines
+ * {@snippet : 
+ * public void helloBaeldung() { 
+ *     System.out.println("Hello From Team Baeldung"); // @highlight region substring="println"
+ *     String country = "USA"; 
+ *     System.out.println("Hello From Team " + country); // @end 
+ * } 
+ * }
+ * 
+ */
+
+public class GreetingsHighlightTag {
+    public void helloBaeldung() {
+        System.out.println("Hello From Team Baeldung");
+    }
+
+}
diff --git a/core-java-modules/core-java-documentation/src/main/java/com/baeldung/snippettag/GreetingsInlineSnippet.java b/core-java-modules/core-java-documentation/src/main/java/com/baeldung/snippettag/GreetingsInlineSnippet.java
new file mode 100644
index 0000000000..71876eecf6
--- /dev/null
+++ b/core-java-modules/core-java-documentation/src/main/java/com/baeldung/snippettag/GreetingsInlineSnippet.java
@@ -0,0 +1,17 @@
+package com.baeldung.snippettag;
+
+/**
+ * The code below shows the content of {@code helloBaeldung()} method
+ * {@snippet :
+ * public void helloBaeldung() {
+ *     System.out.println("Hello From Team Baeldung");
+ * }
+ * }
+ */
+
+public class GreetingsInlineSnippet {
+    public void helloBaeldung() {
+        System.out.println("Hello From Team Baeldung");
+    }
+
+}
diff --git a/core-java-modules/core-java-documentation/src/main/java/com/baeldung/snippettag/GreetingsReplaceAndLinkTag.java b/core-java-modules/core-java-documentation/src/main/java/com/baeldung/snippettag/GreetingsReplaceAndLinkTag.java
new file mode 100644
index 0000000000..7f6f1b72f7
--- /dev/null
+++ b/core-java-modules/core-java-documentation/src/main/java/com/baeldung/snippettag/GreetingsReplaceAndLinkTag.java
@@ -0,0 +1,24 @@
+package com.baeldung.snippettag;
+
+/**
+ * 
+ * Using the replace tag
+ * {@snippet :
+ * public void helloBaeldung() {
+ *     System.out.println("Hello From Team Baeldung"); // @replace regex='".*"' replacement="..."
+ * }
+ * }
+ * Using the link tag
+ * {@snippet :
+ * public void helloBaeldung() {
+ *     System.out.println("Hello From Team Baeldung"); // @link substring="System.out" target="System#out"
+ * }
+ * }
+ *
+ */
+
+public class GreetingsReplaceAndLinkTag {
+    public void helloBaeldung() {
+        System.out.println("Hello From Team Baeldung");
+    }
+}
diff --git a/core-java-modules/core-java-documentation/src/main/java/snippet-files/BinarySearch.java b/core-java-modules/core-java-documentation/src/main/java/snippet-files/BinarySearch.java
new file mode 100644
index 0000000000..a5f6e565ac
--- /dev/null
+++ b/core-java-modules/core-java-documentation/src/main/java/snippet-files/BinarySearch.java
@@ -0,0 +1,27 @@
+
+public class BinarySearch {
+
+    public int search(int[] list, int item) {
+        int index = Integer.MAX_VALUE;
+        int low = 0;
+        int high = list.length - 1;
+        // @start region="binary"
+        while (low <= high) {
+            int mid = high - low;
+            int guess = list[mid];
+            if (guess == item) {
+                index = mid;
+                break;
+            } else if (guess > item) {
+                low = mid - 1;
+            } else {
+                low = mid + 1;
+            }
+            low++;
+        }
+        // @end region="binary"
+
+        return index;
+    }
+
+}
diff --git a/core-java-modules/core-java-documentation/src/main/java/snippet-files/application.properties b/core-java-modules/core-java-documentation/src/main/java/snippet-files/application.properties
new file mode 100644
index 0000000000..a2aeefdb89
--- /dev/null
+++ b/core-java-modules/core-java-documentation/src/main/java/snippet-files/application.properties
@@ -0,0 +1,4 @@
+# @start region="zone" 
+local.timezone = GMT+1 
+local.zip = 94123 
+# @end region="zone"
\ No newline at end of file
diff --git a/core-java-modules/core-java-io-5/.gitignore b/core-java-modules/core-java-io-5/.gitignore
new file mode 100644
index 0000000000..0c0cd871c5
--- /dev/null
+++ b/core-java-modules/core-java-io-5/.gitignore
@@ -0,0 +1,2 @@
+test-link*
+0.*
\ No newline at end of file
diff --git a/core-java-modules/core-java-io-5/README.md b/core-java-modules/core-java-io-5/README.md
new file mode 100644
index 0000000000..9fb4b967a4
--- /dev/null
+++ b/core-java-modules/core-java-io-5/README.md
@@ -0,0 +1,8 @@
+## Core Java IO
+
+This module contains articles about core Java input and output (IO)
+
+### Relevant Articles: 
+- [Get File Extension From MIME Type in Java](https://www.baeldung.com/java-mime-type-file-extension)
+- [[<-- Prev]](/core-java-modules/core-java-io-4)
+
diff --git a/core-java-modules/core-java-io-5/pom.xml b/core-java-modules/core-java-io-5/pom.xml
new file mode 100644
index 0000000000..11116b071c
--- /dev/null
+++ b/core-java-modules/core-java-io-5/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-io-5</artifactId>
+    <name>core-java-io-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>
+        <!-- Mime Type Resolution Libraries -->
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-core</artifactId>
+            <version>${tika.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.jmimemagic</groupId>
+            <artifactId>jmimemagic</artifactId>
+            <version>${jmime-magic.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jodd</groupId>
+            <artifactId>jodd-util</artifactId>
+            <version>${jodd-util.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.j256.simplemagic</groupId>
+            <artifactId>simplemagic</artifactId>
+            <version>${simplemagic.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>core-java-io-5</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <!-- Mime Type Libraries -->
+        <tika.version>2.8.0</tika.version>
+        <jmime-magic.version>0.1.5</jmime-magic.version>
+        <jodd-util.version>6.2.1</jodd-util.version>
+        <simplemagic.version>1.17</simplemagic.version>
+    </properties>
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-io/src/test/java/com/baeldung/extension/ExtensionFromMimeTypeUnitTest.java b/core-java-modules/core-java-io-5/src/test/java/com/baeldung/extension/ExtensionFromMimeTypeUnitTest.java
similarity index 87%
rename from core-java-modules/core-java-io/src/test/java/com/baeldung/extension/ExtensionFromMimeTypeUnitTest.java
rename to core-java-modules/core-java-io-5/src/test/java/com/baeldung/extension/ExtensionFromMimeTypeUnitTest.java
index f8f42861cc..6b1fd490a8 100644
--- a/core-java-modules/core-java-io/src/test/java/com/baeldung/extension/ExtensionFromMimeTypeUnitTest.java
+++ b/core-java-modules/core-java-io-5/src/test/java/com/baeldung/extension/ExtensionFromMimeTypeUnitTest.java
@@ -11,11 +11,9 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.tika.mime.MimeTypeException;
-
+import com.j256.simplemagic.ContentType;
 import org.junit.Test;
 
-import com.j256.simplemagic.ContentInfo;
-
 public class ExtensionFromMimeTypeUnitTest {
     private static final String IMAGE_JPEG_MIME_TYPE = "image/jpeg";
     @Test
@@ -37,15 +35,14 @@ public class ExtensionFromMimeTypeUnitTest {
     }
 
     @Test
-    public void whenUsingMimetypesFileTypeMap_thenGetFileExtension() {
+    public void whenUsingSimpleMagic_thenGetFileExtension() {
         List<String> expectedExtensions = Arrays.asList("jpeg", "jpg", "jpe");
-        ContentInfo contentInfo = new ContentInfo("", IMAGE_JPEG_MIME_TYPE, "", true);
-        String[] detectedExtensions = contentInfo.getFileExtensions();
+        String[] detectedExtensions = ContentType.fromMimeType(IMAGE_JPEG_MIME_TYPE).getFileExtensions();
         assertThat(detectedExtensions).containsExactlyElementsOf(expectedExtensions);
     }
 
     @Test
-    public void whenUsingCustomLogic_thenGetFileExtension() {
+    public void whenUsingCustomMap_thenGetFileExtension() {
         Map<String, Set<String>> mimeExtensionsMap = new HashMap<>();
         List<String> expectedExtensions = Arrays.asList(".jpg", ".jpe", ".jpeg");
         addMimeExtensions(mimeExtensionsMap, "image/jpeg", ".jpg");
diff --git a/core-java-modules/core-java-io-5/src/test/java/com/baeldung/rmlinebreaks/RemoveLinebreaksUnitTest.java b/core-java-modules/core-java-io-5/src/test/java/com/baeldung/rmlinebreaks/RemoveLinebreaksUnitTest.java
new file mode 100644
index 0000000000..7cfc7ede79
--- /dev/null
+++ b/core-java-modules/core-java-io-5/src/test/java/com/baeldung/rmlinebreaks/RemoveLinebreaksUnitTest.java
@@ -0,0 +1,72 @@
+package com.baeldung.rmlinebreaks;
+
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+public class RemoveLinebreaksUnitTest {
+
+    private Path file1Path() throws Exception {
+        return Paths.get(this.getClass().getClassLoader().getResource("multiple-line-1.txt").toURI());
+    }
+
+    private Path file2Path() throws Exception {
+        return Paths.get(this.getClass().getClassLoader().getResource("multiple-line-2.txt").toURI());
+    }
+
+    @Test
+    void whenRemovingLineSeparatorFromFile1_thenGetTheExpectedResult() throws Exception {
+        String content = Files.readString(file1Path(), StandardCharsets.UTF_8);
+
+        String result = content.replace(System.getProperty("line.separator"), "");
+        assertEquals("A, B, C, D, E, F", result);
+    }
+
+    @Test
+    void whenRemovingLineSeparatorFromFile2_thenNotGetTheExpectedResult() throws Exception {
+        String content = Files.readString(file2Path(), StandardCharsets.UTF_8);
+
+        String result = content.replace(System.getProperty("line.separator"), "");
+        assertNotEquals("A, B, C, D, E, F", result); // <-- NOT equals assertion!
+    }
+
+    @Test
+    void whenRemovingAllLinebreaks_thenGetTheExpectedResult() throws Exception {
+        String content1 = Files.readString(file1Path(), StandardCharsets.UTF_8);
+
+        // file contains CRLF
+        String content2 = Files.readString(file2Path(), StandardCharsets.UTF_8);
+
+        String result1 = content1.replace("\r", "").replace("\n", "");
+        String result2 = content2.replace("\r", "").replace("\n", "");
+
+        assertEquals("A, B, C, D, E, F", result1);
+        assertEquals("A, B, C, D, E, F", result2);
+
+        String resultReplaceAll = content2.replaceAll("[\\n\\r]", "");
+        assertEquals("A, B, C, D, E, F", resultReplaceAll);
+
+    }
+
+    @Test
+    void whenUsingReadAllLinesAndJoin_thenGetExpectedResult() throws Exception {
+        List<String> lines1 = Files.readAllLines(file1Path(), StandardCharsets.UTF_8);
+
+        // file contains CRLF
+        List<String> lines2 = Files.readAllLines(file2Path(), StandardCharsets.UTF_8);
+
+        String result1 = String.join("", lines1);
+        String result2 = String.join("", lines2);
+
+        assertEquals("A, B, C, D, E, F", result1);
+        assertEquals("A, B, C, D, E, F", result2);
+    }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-io-5/src/test/resources/multiple-line-1.txt b/core-java-modules/core-java-io-5/src/test/resources/multiple-line-1.txt
new file mode 100644
index 0000000000..42e87e734e
--- /dev/null
+++ b/core-java-modules/core-java-io-5/src/test/resources/multiple-line-1.txt
@@ -0,0 +1,6 @@
+A,
+ B,
+ C,
+ D,
+ E,
+ F
diff --git a/core-java-modules/core-java-io-5/src/test/resources/multiple-line-2.txt b/core-java-modules/core-java-io-5/src/test/resources/multiple-line-2.txt
new file mode 100644
index 0000000000..4fe5d5f4ed
--- /dev/null
+++ b/core-java-modules/core-java-io-5/src/test/resources/multiple-line-2.txt
@@ -0,0 +1,4 @@
+A,
 B,
+ C,
+ D,
 E,
+ F
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 cc3c351afc..3ec3220424 100644
--- a/core-java-modules/core-java-io-apis-2/README.md
+++ b/core-java-modules/core-java-io-apis-2/README.md
@@ -7,3 +7,4 @@ This module contains articles about core Java input/output(IO) APIs.
 - [Get the Desktop Path in Java](https://www.baeldung.com/java-desktop-path)
 - [Check if a File Is Empty in Java](https://www.baeldung.com/java-check-file-empty)
 - [Converting Relative to Absolute Paths in Java](https://www.baeldung.com/java-from-relative-to-absolute-paths)
+- [Detect EOF in Java](https://www.baeldung.com/java-file-detect-end-of-file)
diff --git a/core-java-modules/core-java-io-apis-2/src/main/java/com/baeldung/eofdetections/EOFDetection.java b/core-java-modules/core-java-io-apis-2/src/main/java/com/baeldung/eofdetections/EOFDetection.java
new file mode 100644
index 0000000000..c6302a3fc9
--- /dev/null
+++ b/core-java-modules/core-java-io-apis-2/src/main/java/com/baeldung/eofdetections/EOFDetection.java
@@ -0,0 +1,60 @@
+package com.baeldung.eofdetections;
+
+import java.io.*;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+
+public class EOFDetection {
+
+    public String readWithFileInputStream(String pathFile) throws IOException {
+        try (FileInputStream fis = new FileInputStream(pathFile);
+             ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+            int data;
+            while ((data = fis.read()) != -1) {
+                baos.write(data);
+            }
+            return baos.toString();
+        }
+    }
+
+    public String readWithBufferedReader(String pathFile) throws IOException {
+        try (FileInputStream fis = new FileInputStream(pathFile);
+             InputStreamReader isr = new InputStreamReader(fis);
+             BufferedReader reader = new BufferedReader(isr)) {
+            StringBuilder actualContent = new StringBuilder();
+            String line;
+            while ((line = reader.readLine()) != null) {
+                actualContent.append(line);
+            }
+            return actualContent.toString();
+        }
+    }
+
+    public String readWithScanner(String pathFile) throws IOException {
+        File file = new File(pathFile);
+        Scanner scanner = new Scanner(file);
+        StringBuilder actualContent = new StringBuilder();
+        while (scanner.hasNext()) {
+            String line = scanner.nextLine();
+            actualContent.append(line);
+        }
+        scanner.close();
+        return actualContent.toString();
+    }
+
+    public String readFileWithFileChannelAndByteBuffer(String pathFile) throws IOException {
+        try (FileInputStream fis = new FileInputStream(pathFile);
+             FileChannel channel = fis.getChannel()) {
+
+            ByteBuffer buffer = ByteBuffer.allocate((int) channel.size());
+            while (channel.read(buffer) != -1) {
+                buffer.flip();
+                buffer.clear();
+            }
+            return StandardCharsets.UTF_8.decode(buffer).toString();
+        }
+    }
+}
+
diff --git a/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/eofdetections/EOFDetectionUnitTest.java b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/eofdetections/EOFDetectionUnitTest.java
new file mode 100644
index 0000000000..525b242bf9
--- /dev/null
+++ b/core-java-modules/core-java-io-apis-2/src/test/java/com/baeldung/eofdetections/EOFDetectionUnitTest.java
@@ -0,0 +1,80 @@
+package com.baeldung.eofdetections;
+
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+public class EOFDetectionUnitTest {
+
+    static final String LOREM_IPSUM = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum";
+    String pathToFile = "sample.txt"; // init sample file path
+    EOFDetection eofDetection = new EOFDetection();
+    @Test
+    @Order(1)
+    public void givenDummyText_whenReadWithFileInputStream_returnText() {
+        try {
+            String actualText = eofDetection.readWithFileInputStream(pathToFile);
+            assertEquals(LOREM_IPSUM, actualText);
+        } catch (IOException e) {
+            fail(e.getMessage());
+        }
+    }
+
+    @Test
+    @Order(2)
+    public void givenDummyText_whenReadFileWithBufferedReader_returnText() {
+        try {
+            String actualText = eofDetection.readWithBufferedReader(pathToFile);
+            assertEquals(LOREM_IPSUM, actualText);
+        } catch (IOException e) {
+            fail(e.getMessage());
+        }
+    }
+
+    @Test
+    @Order(3)
+    public void givenDummyText_whenReadFileWithScanner_returnText() {
+        try {
+            String actualText = eofDetection.readWithScanner(pathToFile);
+            assertEquals(LOREM_IPSUM, actualText);
+        } catch (IOException e) {
+            fail(e.getMessage());
+        }
+    }
+
+    @Test
+    @Order(4)
+    public void givenDummyText_whenReadFileWithFileChannelAndByteBuffer_returnText() {
+        try {
+            String actualText = eofDetection.readFileWithFileChannelAndByteBuffer(pathToFile);
+            assertEquals(LOREM_IPSUM, actualText);
+        } catch (IOException e) {
+            fail(e.getMessage());
+        }
+    }
+    @Test
+    @Order(0)
+    public void prepareFileForTest() {
+        File file = new File(pathToFile);
+
+        if (!file.exists()) {
+            try {
+                file.createNewFile();
+                FileWriter writer = new FileWriter(file);
+                writer.write(LOREM_IPSUM);
+                writer.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}
diff --git a/core-java-modules/core-java-io/pom.xml b/core-java-modules/core-java-io/pom.xml
index 12e957a3ba..faeddafd81 100644
--- a/core-java-modules/core-java-io/pom.xml
+++ b/core-java-modules/core-java-io/pom.xml
@@ -43,17 +43,6 @@
             <version>${angus-activation.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jodd</groupId>
-            <artifactId>jodd-util</artifactId>
-            <version>${jodd-util.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.j256.simplemagic</groupId>
-            <artifactId>simplemagic</artifactId>
-            <version>${simplemagic.version}</version>
-        </dependency>
-
     </dependencies>
 
     <build>
@@ -153,8 +142,6 @@
         <fscontext.version>4.4.2</fscontext.version>
         <jakarta-activation-api.version>2.1.2</jakarta-activation-api.version>
         <angus-activation.version>2.0.1</angus-activation.version>
-        <jodd-util.version>6.2.1</jodd-util.version>
-        <simplemagic.version>1.17</simplemagic.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-lang-6/pom.xml b/core-java-modules/core-java-lang-6/pom.xml
index 53ef36a898..6561c4fdcc 100644
--- a/core-java-modules/core-java-lang-6/pom.xml
+++ b/core-java-modules/core-java-lang-6/pom.xml
@@ -18,7 +18,11 @@
             <artifactId>mapstruct</artifactId>
             <version>${mapstruct.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/core-java-modules/core-java-lang-6/src/main/java/com/baeldung/compareobjects/Address.java b/core-java-modules/core-java-lang-6/src/main/java/com/baeldung/compareobjects/Address.java
new file mode 100644
index 0000000000..e82a1018ce
--- /dev/null
+++ b/core-java-modules/core-java-lang-6/src/main/java/com/baeldung/compareobjects/Address.java
@@ -0,0 +1,47 @@
+package com.baeldung.compareobjects;
+
+import java.util.Objects;
+
+public class Address {
+    private String streetAddress;
+    private String city;
+    private String postalCode;
+
+    public Address(String streetAddress, String city, String postalCode) {
+        this.streetAddress = streetAddress;
+        this.city = city;
+        this.postalCode = postalCode;
+    }
+
+    public String getStreetAddress() {
+        return streetAddress;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public String getPostalCode() {
+        return postalCode;
+    }
+
+    @Override
+    public String toString() {
+        return "Address{" + "streetAddress='" + streetAddress + '\'' + ", city='" + city + '\'' + ", postalCode='" + postalCode + '\'' + '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        Address address = (Address) o;
+        return Objects.equals(streetAddress, address.streetAddress) && Objects.equals(city, address.city) && Objects.equals(postalCode, address.postalCode);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(streetAddress, city, postalCode);
+    }
+}
diff --git a/core-java-modules/core-java-lang-6/src/main/java/com/baeldung/compareobjects/Person.java b/core-java-modules/core-java-lang-6/src/main/java/com/baeldung/compareobjects/Person.java
new file mode 100644
index 0000000000..6ba244ff17
--- /dev/null
+++ b/core-java-modules/core-java-lang-6/src/main/java/com/baeldung/compareobjects/Person.java
@@ -0,0 +1,58 @@
+package com.baeldung.compareobjects;
+
+import java.util.List;
+import java.util.Objects;
+
+import org.apache.commons.lang3.builder.DiffExclude;
+
+public class Person {
+    private String firstName;
+    private String lastName;
+    private int age;
+    private List<PhoneNumber> phoneNumbers;
+    @DiffExclude
+    private Address address;
+
+    public Person(String firstName, String lastName, int age, List<PhoneNumber> phoneNumbers, Address address) {
+        this.firstName = firstName;
+        this.lastName = lastName;
+        this.age = age;
+        this.phoneNumbers = phoneNumbers;
+        this.address = address;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public List<PhoneNumber> getPhoneNumbers() {
+        return phoneNumbers;
+    }
+
+    public Address getAddress() {
+        return address;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        Person person = (Person) o;
+        return age == person.age && Objects.equals(firstName, person.firstName) && Objects.equals(lastName, person.lastName) && Objects.equals(phoneNumbers, person.phoneNumbers) && Objects.equals(address, person.address);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(firstName, lastName, age, phoneNumbers, address);
+    }
+}
diff --git a/core-java-modules/core-java-lang-6/src/main/java/com/baeldung/compareobjects/PersonDiffBuilder.java b/core-java-modules/core-java-lang-6/src/main/java/com/baeldung/compareobjects/PersonDiffBuilder.java
new file mode 100644
index 0000000000..9e21f5d7c3
--- /dev/null
+++ b/core-java-modules/core-java-lang-6/src/main/java/com/baeldung/compareobjects/PersonDiffBuilder.java
@@ -0,0 +1,32 @@
+package com.baeldung.compareobjects;
+
+import org.apache.commons.lang3.builder.DiffBuilder;
+import org.apache.commons.lang3.builder.DiffResult;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+public class PersonDiffBuilder {
+    public static DiffResult compare(Person first, Person second) {
+        DiffBuilder diffBuilder = new DiffBuilder(first, second, ToStringStyle.DEFAULT_STYLE).append("person", first.getFirstName(), second.getFirstName())
+            .append("lastName", first.getLastName(), second.getLastName())
+            .append("streetAddress", first.getAddress()
+                .getStreetAddress(), second.getAddress()
+                .getStreetAddress())
+            .append("city", first.getAddress()
+                .getCity(), second.getAddress()
+                .getCity())
+            .append("postalCode", first.getAddress()
+                .getPostalCode(), second.getAddress()
+                .getPostalCode())
+            .append("age", first.getAge(), second.getAge());
+
+        for (int i = 0; i < first.getPhoneNumbers()
+            .size(); i++) {
+            diffBuilder.append("phoneNumbers[" + i + "].number", first.getPhoneNumbers()
+                .get(i)
+                .getNumber(), second.getPhoneNumbers()
+                .get(i)
+                .getNumber());
+        }
+        return diffBuilder.build();
+    }
+}
diff --git a/core-java-modules/core-java-lang-6/src/main/java/com/baeldung/compareobjects/PersonReflectionDiffBuilder.java b/core-java-modules/core-java-lang-6/src/main/java/com/baeldung/compareobjects/PersonReflectionDiffBuilder.java
new file mode 100644
index 0000000000..82081e7282
--- /dev/null
+++ b/core-java-modules/core-java-lang-6/src/main/java/com/baeldung/compareobjects/PersonReflectionDiffBuilder.java
@@ -0,0 +1,11 @@
+package com.baeldung.compareobjects;
+
+import org.apache.commons.lang3.builder.DiffResult;
+import org.apache.commons.lang3.builder.ReflectionDiffBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+public class PersonReflectionDiffBuilder {
+    public static DiffResult compare(Person first, Person second) {
+        return new ReflectionDiffBuilder<>(first, second, ToStringStyle.SHORT_PREFIX_STYLE).build();
+    }
+}
diff --git a/core-java-modules/core-java-lang-6/src/main/java/com/baeldung/compareobjects/PhoneNumber.java b/core-java-modules/core-java-lang-6/src/main/java/com/baeldung/compareobjects/PhoneNumber.java
new file mode 100644
index 0000000000..4ab2b4a4bd
--- /dev/null
+++ b/core-java-modules/core-java-lang-6/src/main/java/com/baeldung/compareobjects/PhoneNumber.java
@@ -0,0 +1,43 @@
+package com.baeldung.compareobjects;
+
+import java.util.Objects;
+
+import org.apache.commons.lang3.builder.DiffExclude;
+
+public class PhoneNumber {
+    private String type;
+    private String number;
+
+    public PhoneNumber(String type, String number) {
+        this.type = type;
+        this.number = number;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    @Override
+    public String toString() {
+        return "PhoneNumber{" + "type='" + type + '\'' + ", number='" + number + '\'' + '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        PhoneNumber that = (PhoneNumber) o;
+        return Objects.equals(number, that.number);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(number);
+    }
+}
diff --git a/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/compareobjects/PersonDiffBuilderUnitTest.java b/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/compareobjects/PersonDiffBuilderUnitTest.java
new file mode 100644
index 0000000000..417e9da0ea
--- /dev/null
+++ b/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/compareobjects/PersonDiffBuilderUnitTest.java
@@ -0,0 +1,38 @@
+package com.baeldung.compareobjects;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.builder.Diff;
+import org.apache.commons.lang3.builder.DiffResult;
+import org.junit.jupiter.api.Test;
+
+public class PersonDiffBuilderUnitTest {
+
+    @Test
+    void givenTwoPeopleDifferent_whenComparingWithDiffBuilder_thenDifferencesFound() {
+        List<PhoneNumber> phoneNumbers1 = new ArrayList<>();
+        phoneNumbers1.add(new PhoneNumber("home", "123-456-7890"));
+        phoneNumbers1.add(new PhoneNumber("work", "987-654-3210"));
+
+        List<PhoneNumber> phoneNumbers2 = new ArrayList<>();
+        phoneNumbers2.add(new PhoneNumber("mobile1", "123-456-7890"));
+        phoneNumbers2.add(new PhoneNumber("mobile2", "987-654-3210"));
+
+        Address address1 = new Address("123 Main St", "London", "12345");
+        Address address2 = new Address("123 Main St", "Paris", "54321");
+
+        Person person1 = new Person("John", "Doe", 30, phoneNumbers1, address1);
+        Person person2 = new Person("Jane", "Smith", 28, phoneNumbers2, address2);
+
+        DiffResult<Person> diff = PersonDiffBuilder.compare(person1, person2);
+        for (Diff<?> d : diff.getDiffs()) {
+            System.out.println(d.getFieldName() + ": " + d.getLeft() + " != " + d.getRight());
+        }
+
+        assertFalse(diff.getDiffs()
+            .isEmpty());
+    }
+}
diff --git a/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/compareobjects/PersonReflectionDiffBuilderUnitTest.java b/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/compareobjects/PersonReflectionDiffBuilderUnitTest.java
new file mode 100644
index 0000000000..fffa56dccc
--- /dev/null
+++ b/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/compareobjects/PersonReflectionDiffBuilderUnitTest.java
@@ -0,0 +1,37 @@
+package com.baeldung.compareobjects;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.builder.Diff;
+import org.apache.commons.lang3.builder.DiffResult;
+import org.junit.jupiter.api.Test;
+
+public class PersonReflectionDiffBuilderUnitTest {
+    @Test
+    void givenTwoPeopleDifferent_whenComparingWithReflectionDiffBuilder_thenDifferencesFound() {
+        List<PhoneNumber> phoneNumbers1 = new ArrayList<>();
+        phoneNumbers1.add(new PhoneNumber("home", "123-456-7890"));
+        phoneNumbers1.add(new PhoneNumber("work", "987-654-3210"));
+
+        List<PhoneNumber> phoneNumbers2 = new ArrayList<>();
+        phoneNumbers2.add(new PhoneNumber("mobile1", "123-456-7890"));
+        phoneNumbers2.add(new PhoneNumber("mobile2", "987-654-3210"));
+
+        Address address1 = new Address("123 Main St", "London", "12345");
+        Address address2 = new Address("123 Main St", "Paris", "54321");
+
+        Person person1 = new Person("John", "Doe", 30, phoneNumbers1, address1);
+        Person person2 = new Person("Jane", "Smith", 28, phoneNumbers2, address2);
+
+        DiffResult<Person> diff = PersonReflectionDiffBuilder.compare(person1, person2);
+        for (Diff<?> d : diff.getDiffs()) {
+            System.out.println(d.getFieldName() + ": " + d.getLeft() + " != " + d.getRight());
+        }
+
+        assertFalse(diff.getDiffs()
+            .isEmpty());
+    }
+}
diff --git a/core-java-modules/core-java-lang-oop-inheritance/README.md b/core-java-modules/core-java-lang-oop-inheritance/README.md
index 430f88e717..6091b15024 100644
--- a/core-java-modules/core-java-lang-oop-inheritance/README.md
+++ b/core-java-modules/core-java-lang-oop-inheritance/README.md
@@ -12,4 +12,4 @@ This module contains articles about inheritance in Java
 - [Guide to Inheritance in Java](https://www.baeldung.com/java-inheritance)
 - [Object Type Casting in Java](https://www.baeldung.com/java-type-casting)
 - [Variable and Method Hiding in Java](https://www.baeldung.com/java-variable-method-hiding)
-- [Inner Classes Vs. Subclasses in Java](https://www.baeldung.com/java-inner-classes-vs-subclasses)
+- [Inner Classes vs. Subclasses in Java](https://www.baeldung.com/java-inner-classes-vs-subclasses)
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 87d9d7a620..ca04263689 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
@@ -2,10 +2,15 @@ package com.baeldung.networking.url;
 
 import static java.util.stream.Collectors.toList;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
+import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Map;
 
 import org.apache.http.client.utils.URIBuilder;
@@ -149,4 +154,24 @@ public class UrlUnitTest {
         assertEquals("http://baeldung.com:9090/articles?topic=java&version=8", url.toString());
     }
 
+    @Test
+    public void givenURI_whenConvertingToURL_thenCorrect() throws IOException, URISyntaxException {
+        String aURIString = "http://courses.baeldung.com";
+        URI uri = new URI(aURIString);
+        URL url = uri.toURL();
+        assertNotNull(url);
+        assertEquals(aURIString, url.toString());
+    }
+
+    @Test
+    public void givenPath_whenConvertingToURIAndThenURL_thenCorrect() throws IOException, URISyntaxException {
+        String finalPath = "file:/D:/baeldung/java-url";
+        Path path = Paths.get("/baeldung/java-url");
+        URI uri = path.toUri();
+        URL url = uri.toURL();
+        assertNotNull(url);
+        // Adapt the finalPath value to match your own path
+        // assertEquals(finalPath, url.toString());
+    }
+
 }
\ No newline at end of file
diff --git a/core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/EchoIntegrationTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/EchoIntegrationTest.java
index 103824b6aa..1e85b9d6dd 100644
--- a/core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/EchoIntegrationTest.java
+++ b/core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/EchoIntegrationTest.java
@@ -24,7 +24,7 @@ public class EchoIntegrationTest {
 
         Executors.newSingleThreadExecutor()
             .submit(() -> new EchoServer().start(port));
-        Thread.sleep(500);
+        Thread.sleep(2000);
     }
 
     private EchoClient client = new EchoClient();
diff --git a/core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/GreetServerIntegrationTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/GreetServerIntegrationTest.java
index 2bded156c5..09f20c970d 100644
--- a/core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/GreetServerIntegrationTest.java
+++ b/core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/GreetServerIntegrationTest.java
@@ -27,7 +27,7 @@ public class GreetServerIntegrationTest {
         
         Executors.newSingleThreadExecutor()
             .submit(() -> new GreetServer().start(port));
-        Thread.sleep(500);
+        Thread.sleep(2000);
     }
 
     @Before
diff --git a/core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/SocketEchoMultiIntegrationTest.java b/core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/SocketEchoMultiIntegrationTest.java
index 62e2dd44ae..f08542c1aa 100644
--- a/core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/SocketEchoMultiIntegrationTest.java
+++ b/core-java-modules/core-java-networking/src/test/java/com/baeldung/socket/SocketEchoMultiIntegrationTest.java
@@ -23,7 +23,7 @@ public class SocketEchoMultiIntegrationTest {
         s.close();
 
         Executors.newSingleThreadExecutor().submit(() -> new EchoMultiServer().start(port));
-        Thread.sleep(500);
+        Thread.sleep(2000);
     }
 
     @Test
diff --git a/core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/integerToBinary/IntegerToBinaryUnitTest.java b/core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/integerToBinary/IntegerToBinaryUnitTest.java
index 38ae79f2f5..9439f012e3 100644
--- a/core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/integerToBinary/IntegerToBinaryUnitTest.java
+++ b/core-java-modules/core-java-numbers-3/src/test/java/com/baeldung/integerToBinary/IntegerToBinaryUnitTest.java
@@ -1,6 +1,8 @@
 package com.baeldung.integerToBinary;
 
+import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 
 public class IntegerToBinaryUnitTest {
@@ -24,4 +26,18 @@ public class IntegerToBinaryUnitTest {
         String binaryString = Integer.toString(n, 2);
         assertEquals("111", binaryString);
     }
-}
+
+    @Test
+    public void givenAnInteger_whenFormatAndReplaceCalled_thenZeroPaddedBinaryString() {
+        int n = 7;
+        String binaryString = String.format("%8s", Integer.toBinaryString(n)).replace(" ", "0");
+        assertEquals("00000111", binaryString);
+    }
+
+    @Test
+    public void givenAnInteger_whenUsingApacheStringUtils_thenZeroPaddedBinaryString() {
+        int n = 7;
+        String binaryString = StringUtils.leftPad(Integer.toBinaryString(n), 8, "0");
+        assertEquals("00000111", binaryString);
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-numbers-6/README.md b/core-java-modules/core-java-numbers-6/README.md
index 254b2b58d7..3bd9fe6ddb 100644
--- a/core-java-modules/core-java-numbers-6/README.md
+++ b/core-java-modules/core-java-numbers-6/README.md
@@ -4,4 +4,5 @@
 - [Integer.class vs Integer.TYPE vs int.class](https://www.baeldung.com/java-integer-class-vs-type-vs-int)
 - [Does Java Read Integers in Little Endian or Big Endian?](https://www.baeldung.com/java-integers-little-big-endian)
 - [How to Split an Integer Number Into Digits in Java](https://www.baeldung.com/java-integer-individual-digits)
+- [Java Double vs. BigDecimal](https://www.baeldung.com/java-double-vs-bigdecimal)
 - 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
index 531f1293d1..7a3b3d4426 100644
--- a/core-java-modules/core-java-numbers-6/pom.xml
+++ b/core-java-modules/core-java-numbers-6/pom.xml
@@ -25,8 +25,12 @@
             <version>${commons-codec}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
     </dependencies>
-
     <build>
         <finalName>core-java-numbers-6</finalName>
         <resources>
@@ -39,5 +43,6 @@
 
     <properties>
         <commons-codec>1.15</commons-codec>
+        <guava.version>32.1.2-jre</guava.version>
     </properties>
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-numbers-6/src/main/java/com/baeldung/bigintegerroot/BenchmarkRunner.java b/core-java-modules/core-java-numbers-6/src/main/java/com/baeldung/bigintegerroot/BenchmarkRunner.java
new file mode 100644
index 0000000000..2ac57a9c0c
--- /dev/null
+++ b/core-java-modules/core-java-numbers-6/src/main/java/com/baeldung/bigintegerroot/BenchmarkRunner.java
@@ -0,0 +1,8 @@
+package com.baeldung.bigintegerroot;
+
+public class BenchmarkRunner {
+    public static void main(String[] args) throws Exception {
+        org.openjdk.jmh.Main.main(args);
+    }
+}
+
diff --git a/core-java-modules/core-java-numbers-6/src/main/java/com/baeldung/bigintegerroot/BigIntegerHolder.java b/core-java-modules/core-java-numbers-6/src/main/java/com/baeldung/bigintegerroot/BigIntegerHolder.java
new file mode 100644
index 0000000000..c2d2f30827
--- /dev/null
+++ b/core-java-modules/core-java-numbers-6/src/main/java/com/baeldung/bigintegerroot/BigIntegerHolder.java
@@ -0,0 +1,10 @@
+package com.baeldung.bigintegerroot;
+
+public class BigIntegerHolder {
+
+    private BigIntegerHolder() {
+    }
+    public static final String BIG_NUMBER = "179769313000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
+    public static final String VERY_BIG_NUMBER = "32473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834";
+    public static final String INSANELY_BIG_NUMBER = "3247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834324739274923749279342847923749237492374987230480128343247392749237492793428479237492374923749872304801283432473927492374927934284792374923749237498723048012834";
+}
diff --git a/core-java-modules/core-java-numbers-6/src/main/java/com/baeldung/bigintegerroot/BigIntegerSquareRootBenchmark.java b/core-java-modules/core-java-numbers-6/src/main/java/com/baeldung/bigintegerroot/BigIntegerSquareRootBenchmark.java
new file mode 100644
index 0000000000..645e4eb2dd
--- /dev/null
+++ b/core-java-modules/core-java-numbers-6/src/main/java/com/baeldung/bigintegerroot/BigIntegerSquareRootBenchmark.java
@@ -0,0 +1,60 @@
+package com.baeldung.bigintegerroot;
+
+import static com.baeldung.bigintegerroot.BigIntegerHolder.*;
+
+import com.baeldung.bigintegerroot.algorithms.Newton;
+import com.baeldung.bigintegerroot.algorithms.NewtonPlus;
+import com.google.common.math.BigIntegerMath;
+import java.math.BigInteger;
+import java.math.RoundingMode;
+import java.util.concurrent.TimeUnit;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+@Warmup(iterations = 1)
+@Measurement(iterations = 1, time = 1, timeUnit = TimeUnit.MINUTES)
+@Fork(1)
+@State(Scope.Benchmark)
+public class BigIntegerSquareRootBenchmark {
+
+    @Param({BIG_NUMBER, VERY_BIG_NUMBER, INSANELY_BIG_NUMBER})
+    public String number;
+    @Benchmark
+    @BenchmarkMode(Mode.Throughput)
+    public void calculateRootWithJava(Blackhole blackhole) {
+        final BigInteger integer = new BigInteger(number);
+        final BigInteger root = integer.sqrt();
+        blackhole.consume(root);
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.Throughput)
+    public void calculateRootWithGuava(Blackhole blackhole) {
+        final BigInteger integer = new BigInteger(number);
+        final BigInteger root = BigIntegerMath.sqrt(integer, RoundingMode.DOWN);
+        blackhole.consume(root);
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.Throughput)
+    public void calculateRootWithNewtonPlus(Blackhole blackhole) {
+        final BigInteger integer = new BigInteger(number);
+        final BigInteger root = NewtonPlus.sqrt(integer);
+        blackhole.consume(root);
+    }
+    @Benchmark
+    @BenchmarkMode(Mode.Throughput)
+    public void calculateRootWithNewton(Blackhole blackhole) {
+        final BigInteger integer = new BigInteger(number);
+        final BigInteger root = Newton.sqrt(integer);
+        blackhole.consume(root);
+    }
+}
diff --git a/core-java-modules/core-java-numbers-6/src/main/java/com/baeldung/bigintegerroot/algorithms/Newton.java b/core-java-modules/core-java-numbers-6/src/main/java/com/baeldung/bigintegerroot/algorithms/Newton.java
new file mode 100644
index 0000000000..07acba7537
--- /dev/null
+++ b/core-java-modules/core-java-numbers-6/src/main/java/com/baeldung/bigintegerroot/algorithms/Newton.java
@@ -0,0 +1,29 @@
+package com.baeldung.bigintegerroot.algorithms;
+
+import java.math.BigInteger;
+
+public class Newton {
+
+    private Newton() {
+    }
+
+    public static BigInteger sqrt(BigInteger n) {
+        // Initial approximation
+        BigInteger x = n.divide(BigInteger.TWO);
+
+        // Tolerance level (small positive integer)
+        BigInteger tolerance = BigInteger.ONE;
+
+        while (true) {
+            // x_new = 0.5 * (x + n / x)
+            BigInteger xNew = x.add(n.divide(x)).divide(BigInteger.TWO);
+
+            // Check for convergence within tolerance
+            if (x.subtract(xNew).abs().compareTo(tolerance) <= 0) {
+                return xNew;
+            }
+
+            x = xNew;
+        }
+    }
+}
diff --git a/core-java-modules/core-java-numbers-6/src/main/java/com/baeldung/bigintegerroot/algorithms/NewtonPlus.java b/core-java-modules/core-java-numbers-6/src/main/java/com/baeldung/bigintegerroot/algorithms/NewtonPlus.java
new file mode 100644
index 0000000000..80d50c0ca5
--- /dev/null
+++ b/core-java-modules/core-java-numbers-6/src/main/java/com/baeldung/bigintegerroot/algorithms/NewtonPlus.java
@@ -0,0 +1,108 @@
+package com.baeldung.bigintegerroot.algorithms;
+
+import java.math.BigInteger;
+
+public class NewtonPlus {
+
+    private NewtonPlus() {
+    }
+
+    // A fast square root by Ryan Scott White.
+    public static BigInteger sqrt(BigInteger x) {
+        if (x.compareTo(BigInteger.valueOf(144838757784765629L)) < 0) {
+            long xAsLong = x.longValue();
+            long vInt = (long)Math.sqrt(xAsLong);
+            if (vInt * vInt > xAsLong)
+                vInt--;
+            return BigInteger.valueOf(vInt); }
+
+        double xAsDub = x.doubleValue();
+        BigInteger val;
+        if (xAsDub < 2.1267e37) // 2.12e37 largest here
+        // since sqrt(long.max*long.max) > long.max
+        {
+            long vInt = (long)Math.sqrt(xAsDub);
+            val = BigInteger.valueOf
+                ((vInt + x.divide(BigInteger.valueOf(vInt)).longValue()) >> 1);
+        }
+        else if (xAsDub < 4.3322e127) {
+            // Convert a double to a BigInteger
+            long bits = Double.doubleToLongBits(Math.sqrt(xAsDub));
+            int exp = ((int) (bits >> 52) & 0x7ff) - 1075;
+            val = BigInteger.valueOf((bits & ((1L << 52)) - 1) | (1L << 52)).shiftLeft(exp);
+
+            val = x.divide(val).add(val).shiftRight(1);
+            if (xAsDub > 2e63) {
+                val = x.divide(val).add(val).shiftRight(1); }
+        }
+        else // handle large numbers over 4.3322e127
+        {
+            int xLen = x.bitLength();
+            int wantedPrecision = ((xLen + 1) / 2);
+            int xLenMod = xLen + (xLen & 1) + 1;
+
+            //////// Do the first Sqrt on Hardware ////////
+            long tempX = x.shiftRight(xLenMod - 63).longValue();
+            double tempSqrt1 = Math.sqrt(tempX);
+            long valLong = Double.doubleToLongBits(tempSqrt1) & 0x1fffffffffffffL;
+
+            if (valLong == 0)
+                valLong = 1L << 53;
+
+            //////// Classic Newton Iterations ////////
+            val = BigInteger.valueOf(valLong).shiftLeft(53 - 1)
+                .add((x.shiftRight(xLenMod -
+                                   (3 * 53))).divide(BigInteger.valueOf(valLong)));
+
+            int size = 106;
+            for (; size < 256; size <<= 1) {
+                val = val.shiftLeft(size - 1).add(x.shiftRight
+                    (xLenMod - (3*size)).divide(val));}
+
+            if (xAsDub > 4e254) { // 4e254 = 1<<845.77
+                int numOfNewtonSteps = 31 -
+                                       Integer.numberOfLeadingZeros(wantedPrecision / size)+1;
+
+                ////// Apply Starting Size ////////
+                int wantedSize = (wantedPrecision >> numOfNewtonSteps) + 2;
+                int needToShiftBy = size - wantedSize;
+                val = val.shiftRight(needToShiftBy);
+
+                size = wantedSize;
+                do {
+                    //////// Newton Plus Iteration ////////
+                    int shiftX = xLenMod - (3 * size);
+                    BigInteger valSqrd = val.multiply(val).shiftLeft(size - 1);
+                    BigInteger valSU = x.shiftRight(shiftX).subtract(valSqrd);
+                    val = val.shiftLeft(size).add(valSU.divide(val));
+                    size *= 2;
+                } while (size < wantedPrecision);
+            }
+            val = val.shiftRight(size - wantedPrecision);
+        }
+
+        // Detect a round ups. This function can be further optimized - see article.
+        // For a ~7% speed bump the following line can be removed but round-ups will occur.
+        if (val.multiply(val).compareTo(x) > 0)
+            val = val.subtract(BigInteger.ONE);
+
+        // Enabling the below will guarantee an error is stopped for larger numbers.
+        // Note: As of this writing, there are no known errors.
+        BigInteger tmp = val.multiply(val);
+        if (tmp.compareTo(x) > 0) {
+            System.out.println("val^2(" + val.multiply(val).toString()
+                               + ") ≥ x(" + x.toString()+")");
+            System.console().readLine();
+            //throw new Exception("Sqrt function had internal error - value too high");
+        }
+        if (tmp.add(val.shiftLeft(1)).add(BigInteger.ONE).compareTo(x) <= 0) {
+            System.out.println("(val+1)^2("
+                               + val.add(BigInteger.ONE).multiply(val.add(BigInteger.ONE)).toString()
+                               + ") ≥ x(" + x.toString() + ")");
+            System.console().readLine();
+            //throw new Exception("Sqrt function had internal error - value too low");
+        }
+
+        return val;
+    }
+}
diff --git a/core-java-modules/core-java-numbers-6/src/test/java/com/baeldung/bigintegerroot/BigIntegerSquareRootUnitTest.java b/core-java-modules/core-java-numbers-6/src/test/java/com/baeldung/bigintegerroot/BigIntegerSquareRootUnitTest.java
new file mode 100644
index 0000000000..edb75b16ef
--- /dev/null
+++ b/core-java-modules/core-java-numbers-6/src/test/java/com/baeldung/bigintegerroot/BigIntegerSquareRootUnitTest.java
@@ -0,0 +1,39 @@
+package com.baeldung.bigintegerroot;
+
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.baeldung.bigintegerroot.algorithms.Newton;
+import com.baeldung.bigintegerroot.algorithms.NewtonPlus;
+import com.google.common.math.BigIntegerMath;
+import java.math.BigInteger;
+import java.math.RoundingMode;
+import java.util.stream.Stream;
+import org.apache.commons.math3.util.Pair;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+class BigIntegerSquareRootUnitTest {
+
+    @ParameterizedTest
+    @ValueSource(strings = {
+        BigIntegerHolder.BIG_NUMBER,
+        BigIntegerHolder.VERY_BIG_NUMBER,
+        BigIntegerHolder.VERY_BIG_NUMBER
+    })
+    void squareRootTest(String number) {
+        final BigInteger bigInteger = new BigInteger(number);
+        final BigInteger javaRoot = bigInteger.sqrt();
+        final BigInteger guavaRoot = BigIntegerMath.sqrt(bigInteger, RoundingMode.DOWN);
+        final BigInteger newtonRoot = Newton.sqrt(bigInteger);
+        final BigInteger newtonPlusRoot = NewtonPlus.sqrt(bigInteger);
+
+        assertTrue(Stream.of(
+            new Pair<>(javaRoot, guavaRoot),
+            new Pair<>(guavaRoot, newtonRoot),
+            new Pair<>(newtonRoot, newtonPlusRoot)
+        ).allMatch(pair -> pair.getFirst().equals(pair.getSecond())));
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-numbers-6/src/test/java/com/baeldung/javadoublevsbigdecimal/BigDecimalConversionUnitTest.java b/core-java-modules/core-java-numbers-6/src/test/java/com/baeldung/javadoublevsbigdecimal/BigDecimalConversionUnitTest.java
new file mode 100644
index 0000000000..76c218d85f
--- /dev/null
+++ b/core-java-modules/core-java-numbers-6/src/test/java/com/baeldung/javadoublevsbigdecimal/BigDecimalConversionUnitTest.java
@@ -0,0 +1,28 @@
+package com.baeldung.javadoublevsbigdecimal;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+import org.junit.jupiter.api.Test;
+
+public class BigDecimalConversionUnitTest {
+
+    @Test
+    void whenConvertingDoubleToBigDecimal_thenConversionIsCorrect() {
+        double doubleValue = 123.456;
+        BigDecimal bigDecimalValue = BigDecimal.valueOf(doubleValue);
+        BigDecimal expected = new BigDecimal("123.456").setScale(3, RoundingMode.HALF_UP);
+        assertEquals(expected, bigDecimalValue.setScale(3, RoundingMode.HALF_UP));
+    }
+
+    @Test
+    void givenDecimalPlacesGreaterThan15_whenConvertingBigDecimalToDouble_thenPrecisionIsLost() {
+        BigDecimal bigDecimalValue = new BigDecimal("789.1234567890123456");
+        double doubleValue = bigDecimalValue.doubleValue();
+        BigDecimal convertedBackToBigDecimal = BigDecimal.valueOf(doubleValue);
+        assertNotEquals(bigDecimalValue, convertedBackToBigDecimal);
+    }
+}
diff --git a/core-java-modules/core-java-numbers-6/src/test/java/com/baeldung/javadoublevsbigdecimal/BigDecimalUnitTest.java b/core-java-modules/core-java-numbers-6/src/test/java/com/baeldung/javadoublevsbigdecimal/BigDecimalUnitTest.java
new file mode 100644
index 0000000000..3ee611f315
--- /dev/null
+++ b/core-java-modules/core-java-numbers-6/src/test/java/com/baeldung/javadoublevsbigdecimal/BigDecimalUnitTest.java
@@ -0,0 +1,42 @@
+package com.baeldung.javadoublevsbigdecimal;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+import org.junit.jupiter.api.Test;
+
+public class BigDecimalUnitTest {
+
+    private BigDecimal bigDecimal1 = new BigDecimal("124567890.0987654321");
+    private BigDecimal bigDecimal2 = new BigDecimal("987654321.123456789");
+
+    @Test
+    public void givenTwoBigDecimals_whenAdd_thenCorrect() {
+        BigDecimal expected = new BigDecimal("1112222211.2222222211");
+        BigDecimal actual = bigDecimal1.add(bigDecimal2);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void givenTwoBigDecimals_whenMultiply_thenCorrect() {
+        BigDecimal expected = new BigDecimal("123030014929277547.5030955772112635269");
+        BigDecimal actual = bigDecimal1.multiply(bigDecimal2);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void givenTwoBigDecimals_whenSubtract_thenCorrect() {
+        BigDecimal expected = new BigDecimal("-863086431.0246913569");
+        BigDecimal actual = bigDecimal1.subtract(bigDecimal2);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void givenTwoBigDecimals_whenDivide_thenCorrect() {
+        BigDecimal expected = new BigDecimal("0.13");
+        BigDecimal actual = bigDecimal1.divide(bigDecimal2, 2, RoundingMode.HALF_UP);
+        assertEquals(expected, actual);
+    }
+}
diff --git a/core-java-modules/core-java-numbers-6/src/test/java/com/baeldung/javadoublevsbigdecimal/JavaDoubleUnitTest.java b/core-java-modules/core-java-numbers-6/src/test/java/com/baeldung/javadoublevsbigdecimal/JavaDoubleUnitTest.java
new file mode 100644
index 0000000000..8697e1bfce
--- /dev/null
+++ b/core-java-modules/core-java-numbers-6/src/test/java/com/baeldung/javadoublevsbigdecimal/JavaDoubleUnitTest.java
@@ -0,0 +1,15 @@
+package com.baeldung.javadoublevsbigdecimal;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+public class JavaDoubleUnitTest {
+
+    @Test
+    public void givenDoubleLiteral_whenAssigningToDoubleVariable_thenValueIsNotExactlyEqual() {
+        double doubleValue = 0.1;
+        double epsilon = 0.0000000000000001;
+        assertEquals(0.1, doubleValue, epsilon);
+    }
+}
diff --git a/core-java-modules/core-java-numbers-conversions/pom.xml b/core-java-modules/core-java-numbers-conversions/pom.xml
index f745b83f8a..d014675ead 100644
--- a/core-java-modules/core-java-numbers-conversions/pom.xml
+++ b/core-java-modules/core-java-numbers-conversions/pom.xml
@@ -18,6 +18,18 @@
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang3.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/core-java-modules/core-java-numbers-conversions/src/main/java/com/baeldung/floatdoubleconversions/FloatAndDoubleConversions.java b/core-java-modules/core-java-numbers-conversions/src/main/java/com/baeldung/floatdoubleconversions/FloatAndDoubleConversions.java
new file mode 100644
index 0000000000..f4fd68550c
--- /dev/null
+++ b/core-java-modules/core-java-numbers-conversions/src/main/java/com/baeldung/floatdoubleconversions/FloatAndDoubleConversions.java
@@ -0,0 +1,15 @@
+package com.baeldung.floatdoubleconversions;
+
+public class FloatAndDoubleConversions {
+    public static void main(String args[]){
+        float vatRate = 14.432511f;
+        System.out.println("vatRate:"+vatRate);
+        Float localTaxRate = 20.12434f;
+        System.out.println("localTaxRate:"+localTaxRate);
+
+        double shootingAverage = 56.00000000000001;
+        System.out.println("shootingAverage:"+shootingAverage);
+        Double assistAverage = 81.123000000045;
+        System.out.println("assistAverage:"+assistAverage);
+    }
+}
diff --git a/core-java-modules/core-java-numbers-conversions/src/test/java/com/baeldung/floatdoubleconversions/FloatDoubleConversionsTest.java b/core-java-modules/core-java-numbers-conversions/src/test/java/com/baeldung/floatdoubleconversions/FloatDoubleConversionsTest.java
new file mode 100644
index 0000000000..9c6b01e9de
--- /dev/null
+++ b/core-java-modules/core-java-numbers-conversions/src/test/java/com/baeldung/floatdoubleconversions/FloatDoubleConversionsTest.java
@@ -0,0 +1,29 @@
+package com.baeldung.floatdoubleconversions;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class FloatDoubleConversionsTest {
+
+    @Test
+    public void whenDoubleType_thenFloatTypeSuccess(){
+        double interestRatesYearly = 13.333333333333334;
+        float interest = (float) interestRatesYearly;
+        Assert.assertEquals(13.333333f, interest, 0.000004f);
+
+        Double monthlyRates = 2.111111111111112;
+        float rates = monthlyRates.floatValue();
+        Assert.assertEquals(2.1111112f, rates, 0.00000013);
+    }
+    @Test
+    public void whenFloatType_thenDoubleTypeSuccess(){
+        float gradeAverage =2.05f;
+        double average = gradeAverage;
+        Assert.assertEquals(2.05, average, 0.06);
+
+        Float monthlyRates = 2.1111112f;
+        Double rates = monthlyRates.doubleValue();
+        Assert.assertEquals(2.11111112, rates, 0.0000002);//true
+    }
+
+}
diff --git a/core-java-modules/core-java-numbers-conversions/src/test/java/com/baeldung/floattobigdecimal/FloatToBigDecimalUnitTest.java b/core-java-modules/core-java-numbers-conversions/src/test/java/com/baeldung/floattobigdecimal/FloatToBigDecimalUnitTest.java
new file mode 100644
index 0000000000..f783d00976
--- /dev/null
+++ b/core-java-modules/core-java-numbers-conversions/src/test/java/com/baeldung/floattobigdecimal/FloatToBigDecimalUnitTest.java
@@ -0,0 +1,49 @@
+package com.baeldung.floattobigdecimal;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+import java.math.BigDecimal;
+
+import org.junit.jupiter.api.Test;
+
+class FloatToBigDecimalUnitTest {
+
+    @Test
+    public void whenFloatComparedWithDifferentValues_thenCouldMatch() {
+        assertNotEquals(1.1f, 1.09f);
+        assertEquals(1.1f, 1.09999999f);
+    }
+
+    @Test
+    public void whenCreatedFromFloat_thenMatchesInternallyStoredValue() {
+        float floatToConvert = 1.10000002384185791015625f;
+        BigDecimal bdFromFloat = new BigDecimal(floatToConvert);
+        assertEquals("1.10000002384185791015625", bdFromFloat.toString());
+    }
+
+    @Test
+    public void whenCreatedFromString_thenPreservesTheOriginal() {
+        BigDecimal bdFromString = new BigDecimal("1.1");
+        assertEquals("1.1", bdFromString.toString());
+    }
+
+    @Test
+    public void whenCreatedFromFloatConvertedToString_thenFloatInternalValueGetsTruncated() {
+        String floatValue = Float.toString(1.10000002384185791015625f);
+        BigDecimal bdFromString = new BigDecimal(floatValue);
+        assertEquals("1.1", floatValue);
+        assertEquals("1.1", bdFromString.toString());
+    }
+
+    @Test
+    public void whenCreatedByValueOf_thenFloatValueGetsTruncated() {
+        assertEquals("1.100000023841858", BigDecimal.valueOf(1.10000002384185791015625f).toString());
+    }
+
+    @Test
+    public void whenDoubleConvertsFloatToString_thenFloatValueGetsTruncated() {
+        assertEquals("1.100000023841858", Double.toString(1.10000002384185791015625f));
+    }
+
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-os-2/.gitignore b/core-java-modules/core-java-os-2/.gitignore
new file mode 100644
index 0000000000..3de4cc647e
--- /dev/null
+++ b/core-java-modules/core-java-os-2/.gitignore
@@ -0,0 +1,26 @@
+*.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
+*.txt
+backup-pom.xml
+/bin/
+/temp
+
+#IntelliJ specific
+.idea/
+*.iml
\ No newline at end of file
diff --git a/core-java-modules/core-java-os-2/README.md b/core-java-modules/core-java-os-2/README.md
new file mode 100644
index 0000000000..fa9f504184
--- /dev/null
+++ b/core-java-modules/core-java-os-2/README.md
@@ -0,0 +1,7 @@
+## Core Java OS
+
+This module contains articles about working with the operating system (OS) in Java
+
+### Relevant Articles: 
+
+
diff --git a/core-java-modules/core-java-os-2/pom.xml b/core-java-modules/core-java-os-2/pom.xml
new file mode 100644
index 0000000000..53fdafa7d4
--- /dev/null
+++ b/core-java-modules/core-java-os-2/pom.xml
@@ -0,0 +1,42 @@
+<?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-os</artifactId>
+    <name>core-java-os</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-os</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>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <maven.compiler.source>1.9</maven.compiler.source>
+        <maven.compiler.target>1.9</maven.compiler.target>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-os-2/src/main/java/com/baeldung/system/EnvironmentExample.java b/core-java-modules/core-java-os-2/src/main/java/com/baeldung/system/EnvironmentExample.java
new file mode 100644
index 0000000000..2557c0cfa8
--- /dev/null
+++ b/core-java-modules/core-java-os-2/src/main/java/com/baeldung/system/EnvironmentExample.java
@@ -0,0 +1,9 @@
+package com.baeldung.system;
+
+public class EnvironmentExample {
+    public void getUserName() {
+        String username = System.getenv("USERNAME");
+        System.out.println("User: " + username);
+    }
+
+}
diff --git a/core-java-modules/core-java-os-2/src/main/java/com/baeldung/system/PropertiesExample.java b/core-java-modules/core-java-os-2/src/main/java/com/baeldung/system/PropertiesExample.java
new file mode 100644
index 0000000000..cb203c40c6
--- /dev/null
+++ b/core-java-modules/core-java-os-2/src/main/java/com/baeldung/system/PropertiesExample.java
@@ -0,0 +1,19 @@
+package com.baeldung.system;
+
+public class PropertiesExample {
+    public void getUserName() {
+        String username = System.getProperty("user.name");
+        System.out.println("User: " + username);
+    }
+
+    public void getCustomProp() {
+        String customProperty = System.getProperty("custom.prop");
+        System.out.println("Custom property: " + customProperty);
+    }
+
+    public void getCustomPropWithFallback() {
+        String customProperty = System.getProperty("non-existent-property", "default value");
+        System.out.println("Custom property: " + customProperty);
+    }
+
+}
diff --git a/core-java-modules/core-java-os/README.md b/core-java-modules/core-java-os/README.md
index 6d477de70a..81e67e4663 100644
--- a/core-java-modules/core-java-os/README.md
+++ b/core-java-modules/core-java-os/README.md
@@ -14,5 +14,6 @@ This module contains articles about working with the operating system (OS) in Ja
 - [How to Run a Shell Command in Java](http://www.baeldung.com/run-shell-command-in-java)
 - [Taking Screenshots Using Java](https://www.baeldung.com/java-taking-screenshots)
 - [Java Sound API – Capturing Microphone](https://www.baeldung.com/java-sound-api-capture-mic)
+- [How to Detect the Username Using Java](https://www.baeldung.com/java-get-username)
 
 This module uses Java 9, so make sure to have the JDK 9 installed to run it.
diff --git a/core-java-modules/core-java-os/src/test/java/com/baeldung/system/WhenDetectingOSUnitTest.java b/core-java-modules/core-java-os/src/test/java/com/baeldung/system/WhenDetectingOSUnitTest.java
deleted file mode 100644
index 27a6dd43c6..0000000000
--- a/core-java-modules/core-java-os/src/test/java/com/baeldung/system/WhenDetectingOSUnitTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.baeldung.system;
-
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-@Ignore
-public class WhenDetectingOSUnitTest {
-
-    private DetectOS os = new DetectOS();
-
-    @Test
-    public void whenUsingSystemProperty_shouldReturnOS() {
-        String expected = "Windows 10";
-        String actual = os.getOperatingSystem();
-        Assert.assertEquals(expected, actual);
-    }
-
-    @Test
-    public void whenUsingSystemUtils_shouldReturnOS() {
-        String expected = "Windows 10";
-        String actual = os.getOperatingSystemSystemUtils();
-        Assert.assertEquals(expected, actual);
-    }
-}
diff --git a/core-java-modules/core-java-os/src/test/java/com/baeldung/system/exit/SystemExitUnitTest.java b/core-java-modules/core-java-os/src/test/java/com/baeldung/system/exit/SystemExitUnitTest.java
deleted file mode 100644
index 8ad3f75623..0000000000
--- a/core-java-modules/core-java-os/src/test/java/com/baeldung/system/exit/SystemExitUnitTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.baeldung.system.exit;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.security.Permission;
-
-import static org.junit.Assert.assertEquals;
-
-@Ignore("This test is ignored because it tests deprecated code")
-public class SystemExitUnitTest {
-
-    private SecurityManager securityManager;
-    private SystemExitExample example;
-
-    @Before
-    public void setUp() {
-        example = new SystemExitExample();
-        securityManager = System.getSecurityManager();
-        System.setSecurityManager(new NoExitSecurityManager());
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        System.setSecurityManager(securityManager);
-    }
-
-    @Test
-    public void testExit() throws Exception {
-        try {
-            example.readFile();
-        } catch (ExitException e) {
-            assertEquals("Exit status", 2, e.status);
-        }
-    }
-
-    protected static class ExitException extends SecurityException {
-
-        private static final long serialVersionUID = 1L;
-        public final int status;
-
-        public ExitException(int status) {
-            this.status = status;
-        }
-    }
-
-    private static class NoExitSecurityManager extends SecurityManager {
-        @Override
-        public void checkPermission(Permission perm) {
-        }
-
-        @Override
-        public void checkPermission(Permission perm, Object context) {
-        }
-
-        @Override
-        public void checkExit(int status) {
-            super.checkExit(status);
-            throw new ExitException(status);
-        }
-    }
-}
\ No newline at end of file
diff --git a/core-java-modules/core-java-regex-2/README.md b/core-java-modules/core-java-regex-2/README.md
index 02e470cce5..404b33b65f 100644
--- a/core-java-modules/core-java-regex-2/README.md
+++ b/core-java-modules/core-java-regex-2/README.md
@@ -9,4 +9,5 @@
 - [Regular Expression: \z vs \Z Anchors in Java](https://www.baeldung.com/java-regular-expression-z-vs-z-anchors)
 - [Extract Text Between Square Brackets](https://www.baeldung.com/java-get-content-between-square-brackets)
 - [Get the Indexes of Regex Pattern Matches in Java](https://www.baeldung.com/java-indexes-regex-pattern-matches)
+- [Check if a String is Strictly Alphanumeric With Java](https://www.baeldung.com/java-check-string-contains-only-letters-numbers)
 - More articles: [[<-- prev]](/core-java-modules/core-java-regex)
diff --git a/core-java-modules/core-java-regex-2/src/main/java/com/baeldung/alphanumeric/AlphanumericPerformanceBenchmark.java b/core-java-modules/core-java-regex-2/src/main/java/com/baeldung/alphanumeric/AlphanumericPerformanceBenchmark.java
new file mode 100644
index 0000000000..4b2ecc4c4d
--- /dev/null
+++ b/core-java-modules/core-java-regex-2/src/main/java/com/baeldung/alphanumeric/AlphanumericPerformanceBenchmark.java
@@ -0,0 +1,91 @@
+package com.baeldung.alphanumeric;
+
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+@Warmup(iterations = 1)
+@Measurement(iterations = 1, time = 1, timeUnit = TimeUnit.MINUTES)
+@Fork(1)
+public class AlphanumericPerformanceBenchmark {
+
+    private static final String TEST_STRING = "ABC123abc123";
+    private static final String REGEX = "[^[a-zA-Z0-9]*$]";
+    private static final Pattern PATTERN = Pattern.compile(REGEX);
+
+    @Benchmark
+    @BenchmarkMode(Mode.Throughput)
+    public void alphanumericRegex(Blackhole blackhole) {
+        final Matcher matcher = PATTERN.matcher(TEST_STRING);
+        boolean result = matcher.matches();
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.Throughput)
+    public void alphanumericRegexDirectlyOnString(Blackhole blackhole) {
+        boolean result = TEST_STRING.matches(REGEX);
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.Throughput)
+    public void alphanumericIteration(Blackhole blackhole) {
+        boolean result = true;
+        for (int i = 0; i < TEST_STRING.length(); ++i) {
+            final int codePoint = TEST_STRING.codePointAt(i);
+            if (!isAlphanumeric(codePoint)) {
+                result = false;
+                break;
+            }
+        }
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.Throughput)
+    public void alphanumericIterationWithCharacterChecks(Blackhole blackhole) {
+        boolean result = true;
+        for (int i = 0; i < TEST_STRING.length(); ++i) {
+            final int codePoint = TEST_STRING.codePointAt(i);
+            if (!Character.isAlphabetic(codePoint) || !Character.isDigit(codePoint)) {
+                result = false;
+                break;
+            }
+        }
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.Throughput)
+    public void alphanumericIterationWithCopy(Blackhole blackhole) {
+        boolean result = true;
+        for (final char c : TEST_STRING.toCharArray()) {
+            if (!isAlphanumeric(c)) {
+                result = false;
+                break;
+            }
+        }
+        blackhole.consume(result);
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.Throughput)
+    public void alphanumericIterationWithStream(Blackhole blackhole) {
+        boolean result = TEST_STRING.chars().allMatch(this::isAlphanumeric);
+        blackhole.consume(result);
+    }
+
+    public boolean isAlphanumeric(final int codePoint) {
+        return (codePoint >= 65 && codePoint <= 90) ||
+               (codePoint >= 97 && codePoint <= 172) ||
+               (codePoint >= 48 && codePoint <= 57);
+    }
+}
diff --git a/core-java-modules/core-java-regex-2/src/test/java/com/baeldung/alphanumeric/AlphanumericUnitTest.java b/core-java-modules/core-java-regex-2/src/test/java/com/baeldung/alphanumeric/AlphanumericUnitTest.java
new file mode 100644
index 0000000000..b00bf7c4e3
--- /dev/null
+++ b/core-java-modules/core-java-regex-2/src/test/java/com/baeldung/alphanumeric/AlphanumericUnitTest.java
@@ -0,0 +1,30 @@
+package com.baeldung.alphanumeric;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+class AlphanumericUnitTest {
+
+    private AlphanumericPerformanceBenchmark alphanumericPerformanceBenchmark = new AlphanumericPerformanceBenchmark();
+
+    @ParameterizedTest
+    @CsvSource({
+        "A,true",
+        "B,true",
+        "C,true",
+        "1,true",
+        "2,true",
+        "3,true",
+        "!,false",
+        "@,false",
+        "#,false",
+        "$,false",
+        "%,false"
+    })
+    void shouldCorrectlyIdentifyAlphanumericCharacterTest(char character, boolean result) {
+        boolean actual = alphanumericPerformanceBenchmark.isAlphanumeric(character);
+        assertEquals(actual, result);
+    }
+}
\ No newline at end of file
diff --git a/core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/SecureConnection.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/SecureConnection.java
index 36dee603eb..6f2e3250fc 100644
--- a/core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/SecureConnection.java
+++ b/core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/SecureConnection.java
@@ -7,7 +7,7 @@ import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 
 public class SecureConnection {
-    
+
     public static void main(String[] args) {
         if (args.length != 2) {
             System.out.println("Use: SecureConnection host port");
@@ -20,20 +20,20 @@ public class SecureConnection {
             SSLSocket sslsocket = (SSLSocket) sslsocketfactory.createSocket(host, port);
             InputStream in = sslsocket.getInputStream();
             OutputStream out = sslsocket.getOutputStream();
-            
+
             out.write(1);
-            
+
             while (in.available() > 0) {
                 System.out.print(in.read());
             }
-            
+
             System.out.println("Secured connection performed successfully");
-            
+
         } catch (Exception exception) {
             exception.printStackTrace();
         }
     }
-    
+
     /**
      * Get the host from arguments
      * @param args the arguments
@@ -42,7 +42,7 @@ public class SecureConnection {
     private static String getHost(String[] args) {
         return args[0];
     }
-    
+
     /**
      * Get the port from arguments
      * @param args the arguments
diff --git a/core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/example/SimpleClient.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/example/SimpleClient.java
index d6efc34c3e..cf9a76b39a 100644
--- a/core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/example/SimpleClient.java
+++ b/core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/example/SimpleClient.java
@@ -15,10 +15,8 @@ public class SimpleClient {
         SocketFactory factory = SSLSocketFactory.getDefault();
 
         try (Socket connection = factory.createSocket(host, port)) {
-            ((SSLSocket) connection).setEnabledCipherSuites(
-              new String[] { "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256"});
-            ((SSLSocket) connection).setEnabledProtocols(
-              new String[] { "TLSv1.2"});
+            ((SSLSocket) connection).setEnabledCipherSuites(new String[] { "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256" });
+            ((SSLSocket) connection).setEnabledProtocols(new String[] { "TLSv1.2" });
             SSLParameters sslParams = new SSLParameters();
             sslParams.setEndpointIdentificationAlgorithm("HTTPS");
             ((SSLSocket) connection).setSSLParameters(sslParams);
@@ -28,6 +26,7 @@ public class SimpleClient {
     }
 
     public static void main(String[] args) throws IOException {
+        System.setProperty("javax.net.debug", "ssl:handshake");
         System.out.println(startClient("localhost", 8443));
     }
 }
diff --git a/core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/example/SimpleServer.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/example/SimpleServer.java
index 27d15d04d7..83946ccc1f 100644
--- a/core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/example/SimpleServer.java
+++ b/core-java-modules/core-java-security/src/main/java/com/baeldung/ssl/example/SimpleServer.java
@@ -14,11 +14,10 @@ public class SimpleServer {
         ServerSocketFactory factory = SSLServerSocketFactory.getDefault();
 
         try (ServerSocket listener = factory.createServerSocket(port)) {
+            System.setProperty("javax.net.debug", "ssl:handshake");
             ((SSLServerSocket) listener).setNeedClientAuth(true);
-            ((SSLServerSocket) listener).setEnabledCipherSuites(
-              new String[] { "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256"});
-            ((SSLServerSocket) listener).setEnabledProtocols(
-              new String[] { "TLSv1.2"});
+            ((SSLServerSocket) listener).setEnabledCipherSuites(new String[] { "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256" });
+            ((SSLServerSocket) listener).setEnabledProtocols(new String[] { "TLSv1.2" });
             while (true) {
                 try (Socket socket = listener.accept()) {
                     PrintWriter out = new PrintWriter(socket.getOutputStream(), true);
@@ -29,6 +28,7 @@ public class SimpleServer {
     }
 
     public static void main(String[] args) throws IOException {
+        System.setProperty("javax.net.debug", "ssl:handshake");
         startServer(8443);
     }
 }
\ No newline at end of file
diff --git a/core-java-modules/core-java-streams-5/README.md b/core-java-modules/core-java-streams-5/README.md
index 885949d937..dec4a7a0cb 100644
--- a/core-java-modules/core-java-streams-5/README.md
+++ b/core-java-modules/core-java-streams-5/README.md
@@ -2,3 +2,4 @@
 - [Difference Between parallelStream() and stream().parallel() in Java](https://www.baeldung.com/java-parallelstream-vs-stream-parallel)
 - [Working With Empty Stream in Java](https://www.baeldung.com/java-empty-stream)
 - [Aggregate Runtime Exceptions in Java Streams](https://www.baeldung.com/java-streams-aggregate-exceptions)
+- [Streams vs. Loops in Java](https://www.baeldung.com/java-streams-vs-loops)
diff --git a/core-java-modules/core-java-streams-5/pom.xml b/core-java-modules/core-java-streams-5/pom.xml
index dc97d81b3d..d7baf84d30 100644
--- a/core-java-modules/core-java-streams-5/pom.xml
+++ b/core-java-modules/core-java-streams-5/pom.xml
@@ -43,6 +43,11 @@
             <artifactId>vavr</artifactId>
             <version>${vavr.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -72,6 +77,7 @@
         <maven.compiler.source>12</maven.compiler.source>
         <maven.compiler.target>12</maven.compiler.target>
         <vavr.version>0.10.2</vavr.version>
+        <guava.version>32.1.2-jre</guava.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-streams-5/src/main/java/com/baeldung/streams/partitioning/PartitionStream.java b/core-java-modules/core-java-streams-5/src/main/java/com/baeldung/streams/partitioning/PartitionStream.java
new file mode 100644
index 0000000000..1ef3fa7707
--- /dev/null
+++ b/core-java-modules/core-java-streams-5/src/main/java/com/baeldung/streams/partitioning/PartitionStream.java
@@ -0,0 +1,90 @@
+package com.baeldung.streams.partitioning;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.BiConsumer;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import com.google.common.collect.Iterables;
+
+public class PartitionStream {
+
+    public static <T> Stream<List<T>> partitionList(List<T> source, int batchSize) {
+        if (batchSize <= 0) {
+            throw new IllegalArgumentException(String.format("Expected the batchSize to be greater than ZERO, actual value was: %s", batchSize));
+        }
+        if (source.isEmpty()) {
+            return Stream.empty();
+        }
+        int nrOfFullBatches = (source.size() - 1) / batchSize;
+        return IntStream.rangeClosed(0, nrOfFullBatches)
+          .mapToObj(batch -> {
+              int startIndex = batch * batchSize;
+              int endIndex = (batch == nrOfFullBatches) ? source.size() : (batch + 1) * batchSize;
+              return source.subList(startIndex, endIndex);
+          });
+    }
+
+    public static <T> Iterable<List<T>> partitionUsingGuava(Stream<T> source, int batchSize) {
+        return Iterables.partition(source::iterator, batchSize);
+    }
+
+    public static <T> List<List<T>> partitionStream(Stream<T> source, int batchSize) {
+        return source.collect(partitionBySize(batchSize, Collectors.toList()));
+    }
+
+    public static <T, A, R> Collector<T, ?, R> partitionBySize(int batchSize, Collector<List<T>, A, R> downstream) {
+        Supplier<Accumulator<T, A>> supplier = () -> new Accumulator<>(
+          batchSize,
+          downstream.supplier().get(),
+          downstream.accumulator()::accept
+        );
+
+        BiConsumer<Accumulator<T, A>, T> accumulator = (acc, value) -> acc.add(value);
+
+        BinaryOperator<Accumulator<T, A>> combiner = (acc1, acc2) -> acc1.combine(acc2, downstream.combiner());
+
+        Function<Accumulator<T, A>, R> finisher = acc -> {
+            if (!acc.values.isEmpty()) {
+                downstream.accumulator().accept(acc.downstreamAccumulator, acc.values);
+            }
+            return downstream.finisher().apply(acc.downstreamAccumulator);
+        };
+
+        return Collector.of(supplier, accumulator, combiner, finisher, Collector.Characteristics.UNORDERED);
+    }
+
+    static class Accumulator<T, A> {
+        private final List<T> values = new ArrayList<>();
+        private final int batchSize;
+        private A downstreamAccumulator;
+        private final BiConsumer<A, List<T>> batchFullListener;
+
+        Accumulator(int batchSize, A accumulator, BiConsumer<A, List<T>> onBatchFull) {
+            this.batchSize = batchSize;
+            this.downstreamAccumulator = accumulator;
+            this.batchFullListener = onBatchFull;
+        }
+
+        void add(T value) {
+            values.add(value);
+            if (values.size() == batchSize) {
+                batchFullListener.accept(downstreamAccumulator, new ArrayList<>(values));
+                values.clear();
+            }
+        }
+
+        Accumulator<T, A> combine(Accumulator<T, A> other, BinaryOperator<A> accumulatorCombiner) {
+            this.downstreamAccumulator = accumulatorCombiner.apply(downstreamAccumulator, other.downstreamAccumulator);
+            other.values.forEach(this::add);
+            return this;
+        }
+    }
+
+}
diff --git a/core-java-modules/core-java-streams-5/src/test/java/com/baeldung/partitioning/PartitionStreamsUnitTest.java b/core-java-modules/core-java-streams-5/src/test/java/com/baeldung/partitioning/PartitionStreamsUnitTest.java
new file mode 100644
index 0000000000..df75e69783
--- /dev/null
+++ b/core-java-modules/core-java-streams-5/src/test/java/com/baeldung/partitioning/PartitionStreamsUnitTest.java
@@ -0,0 +1,82 @@
+package com.baeldung.partitioning;
+
+import static com.baeldung.streams.partitioning.PartitionStream.partitionList;
+import static com.baeldung.streams.partitioning.PartitionStream.partitionStream;
+import static com.baeldung.streams.partitioning.PartitionStream.partitionUsingGuava;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.atIndex;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Test;
+
+public class PartitionStreamsUnitTest {
+
+    @Test
+    void whenPartitionList_thenReturnThreeSubLists() {
+        List<Integer> source = List.of(1, 2, 3, 4, 5, 6, 7, 8);
+
+        Stream<List<Integer>> result = partitionList(source, 3);
+
+        assertThat(result)
+          .containsExactlyInAnyOrder(
+            List.of(1, 2, 3),
+            List.of(4, 5, 6),
+            List.of(7, 8)
+          );
+    }
+
+    @Test
+    void whenPartitionEmptyList_thenReturnEmptyStream() {
+        Stream<List<Integer>> result = partitionList(Collections.emptyList(), 3);
+
+        assertThat(result).isEmpty();
+    }
+
+    @Test
+    void whenPartitionListWithNegativeBatchSize_thenThrowException() {
+        assertThatThrownBy(() -> partitionList(List.of(1,2,3), -1))
+          .isInstanceOf(IllegalArgumentException.class)
+          .hasMessage("Expected the batchSize to be greater than ZERO, actual value was: -1");
+    }
+
+    @Test
+    void whenPartitionParallelStream_thenReturnThreeSubLists() {
+        Stream<Integer> source = Stream.of(1, 2, 3, 4, 5, 6, 7, 8).parallel();
+
+        List<List<Integer>> result = partitionStream(source, 3);
+
+        assertThat(result)
+          .hasSize(3)
+          .satisfies(batch -> assertThat(batch).hasSize(3), atIndex(0))
+          .satisfies(batch -> assertThat(batch).hasSize(3), atIndex(1))
+          .satisfies(batch -> assertThat(batch).hasSize(2), atIndex(2));
+    }
+
+    @Test
+    void whenPartitionEmptyParallelStream_thenReturnEmptyList() {
+        Stream<Integer> source = Stream.<Integer>empty().parallel();
+
+        List<List<Integer>> result = partitionStream(source, 3);
+
+        assertThat(result).isEmpty();
+    }
+
+    @Test
+    void whenPartitionParallelStreamWithGuava_thenReturnThreeSubLists() {
+        Stream<Integer> source = Stream.of(1, 2, 3, 4, 5, 6, 7, 8).parallel();
+
+        Iterable<List<Integer>> result = partitionUsingGuava(source, 3);
+
+        assertThat(result)
+          .map(ArrayList::new)
+          .hasSize(3)
+          .satisfies(batch -> assertThat(batch).asList().hasSize(3), atIndex(0))
+          .satisfies(batch -> assertThat(batch).asList().hasSize(3), atIndex(1))
+          .satisfies(batch -> assertThat(batch).asList().hasSize(2), atIndex(2));
+    }
+}
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 2bb70f5c97..3ef07129ed 100644
--- a/core-java-modules/core-java-string-algorithms-3/README.md
+++ b/core-java-modules/core-java-string-algorithms-3/README.md
@@ -11,4 +11,5 @@ This module contains articles about string-related algorithms.
 - [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)
-- [Checking If a String Is a Repeated Substring](https://www.baeldung.com/java-repeated-substring)
\ No newline at end of file
+- [Checking If a String Is a Repeated Substring](https://www.baeldung.com/java-repeated-substring)
+- [Check if Letter Is Emoji With Java](https://www.baeldung.com/java-check-letter-emoji)
diff --git a/core-java-modules/core-java-string-apis/src/test/java/com/baeldung/charsequence/CharSequenceVsStringUnitTest.java b/core-java-modules/core-java-string-apis/src/test/java/com/baeldung/charsequence/CharSequenceVsStringUnitTest.java
index aa15345bcb..13a0407a98 100644
--- a/core-java-modules/core-java-string-apis/src/test/java/com/baeldung/charsequence/CharSequenceVsStringUnitTest.java
+++ b/core-java-modules/core-java-string-apis/src/test/java/com/baeldung/charsequence/CharSequenceVsStringUnitTest.java
@@ -1,11 +1,11 @@
 package com.baeldung.charsequence;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.Test;
+
 public class CharSequenceVsStringUnitTest {
 
     @Test
@@ -44,4 +44,43 @@ public class CharSequenceVsStringUnitTest {
 
         assertEquals(firstAddressOfTest, secondAddressOfTest);
     }
+
+    @Test
+    public void givenCharSequenceAsString_whenConvertingUsingCasting_thenCorrect() {
+        String expected = "baeldung";
+        CharSequence charSequence = "baeldung";
+        String explicitCastedString = (String) charSequence;
+
+        assertEquals(expected, charSequence);
+        assertEquals(expected, explicitCastedString);
+    }
+
+    @Test(expected = ClassCastException.class)
+    public void givenCharSequenceAsStringBuiler_whenConvertingUsingCasting_thenThrowException() {
+        CharSequence charSequence = new StringBuilder("baeldung");
+        String castedString = (String) charSequence;
+    }
+
+    @Test
+    public void givenCharSequence_whenConvertingUsingToString_thenCorrect() {
+        String expected = "baeldung";
+        CharSequence charSequence1 = "baeldung";
+        CharSequence charSequence2 = new StringBuilder("baeldung");
+
+        assertEquals(expected, charSequence1.toString());
+        assertEquals(expected, charSequence2.toString());
+    }
+
+    @Test
+    public void givenCharSequence_whenConvertingUsingValueOf_thenCorrect() {
+        String expected = "baeldung";
+        CharSequence charSequence1 = "baeldung";
+        CharSequence charSequence2 = new StringBuilder("baeldung");
+        CharSequence charSequence3 = null;
+
+        assertEquals(expected, String.valueOf(charSequence1));
+        assertEquals(expected, String.valueOf(charSequence2));
+        assertEquals("null", String.valueOf(charSequence3));
+    }
+
 }
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 21ba1bf985..dffd3c1ab6 100644
--- a/core-java-modules/core-java-string-operations-5/README.md
+++ b/core-java-modules/core-java-string-operations-5/README.md
@@ -10,4 +10,4 @@
 - [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)
\ No newline at end of file
+- [Remove Punctuation From a String in Java](https://www.baeldung.com/java-remove-punctuation-from-string)
diff --git a/core-java-modules/core-java-string-operations-6/README.md b/core-java-modules/core-java-string-operations-6/README.md
index 853d58287d..b4b78d1ad7 100644
--- a/core-java-modules/core-java-string-operations-6/README.md
+++ b/core-java-modules/core-java-string-operations-6/README.md
@@ -10,3 +10,5 @@
 - [Check if a String Contains Non-Alphanumeric Characters](https://www.baeldung.com/java-string-test-special-characters)
 - [Check if a String Has All Unique Characters in Java](https://www.baeldung.com/java-check-string-all-unique-chars)
 - [Performance Comparison Between Different Java String Concatenation Methods](https://www.baeldung.com/java-string-concatenation-methods)
+- [Replacing Single Quote with \’ in Java String](https://www.baeldung.com/java-replacing-single-quote-string)
+
diff --git a/core-java-modules/core-java-string-operations-5/src/test/java/com/baeldung/replace/ReplaceStringUnitTest.java b/core-java-modules/core-java-string-operations-6/src/test/java/com/baeldung/replace/ReplaceStringUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-string-operations-5/src/test/java/com/baeldung/replace/ReplaceStringUnitTest.java
rename to core-java-modules/core-java-string-operations-6/src/test/java/com/baeldung/replace/ReplaceStringUnitTest.java
diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index 7fbd6cf657..ae9ff59222 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -28,13 +28,14 @@
         <!--<module>core-java-streams-2</module> -->
         <!--<module>core-java-sun</module> -->
         <module>core-java-9-improvements</module>
-        <module>core-java-collections-array-list</module>
         <module>core-java-9-streams</module>
         <module>core-java-9</module>
         <module>core-java-10</module>
         <module>core-java-11</module>
         <module>core-java-11-2</module>
         <module>core-java-11-3</module>
+        <module>core-java-collections-array-list</module>
+        <module>core-java-collections-array-list-2</module>
         <module>core-java-collections-list-4</module>
         <module>core-java-collections-list-5</module>
         <module>core-java-collections-maps-4</module>
@@ -65,6 +66,7 @@
         <module>core-java-arrays-convert</module>
         <module>core-java-arrays-operations-basic</module>
         <module>core-java-arrays-operations-advanced</module>
+        <module>core-java-arrays-operations-advanced-2</module>
         <module>core-java-booleans</module>
         <module>core-java-char</module>
         <module>core-java-collections</module>
@@ -77,9 +79,11 @@
         <module>core-java-collections-list</module>
         <module>core-java-collections-list-2</module>
         <module>core-java-collections-list-3</module>
+        <module>core-java-collections-list-6</module>
         <module>core-java-collections-maps</module>
         <module>core-java-collections-maps-2</module>
         <module>core-java-collections-maps-3</module>
+        <module>core-java-collections-maps-7</module>
         <module>core-java-compiler</module>
         <module>core-java-concurrency-2</module>
         <module>core-java-concurrency-advanced</module>
@@ -107,6 +111,7 @@
         <module>core-java-io-2</module>
         <module>core-java-io-3</module>
         <module>core-java-io-4</module>
+        <module>core-java-io-5</module>
         <module>core-java-io-apis</module>
         <module>core-java-io-apis-2</module>
         <module>core-java-io-conversions</module>
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 fd2090aecb..386b2ca4a7 100644
--- a/drools/src/main/java/com/baeldung/drools/config/DroolsBeanFactory.java
+++ b/drools/src/main/java/com/baeldung/drools/config/DroolsBeanFactory.java
@@ -1,8 +1,15 @@
 package com.baeldung.drools.config;
 
+import java.util.Arrays;
+import java.util.List;
+
 import org.drools.decisiontable.DecisionTableProviderImpl;
 import org.kie.api.KieServices;
-import org.kie.api.builder.*;
+import org.kie.api.builder.KieBuilder;
+import org.kie.api.builder.KieFileSystem;
+import org.kie.api.builder.KieModule;
+import org.kie.api.builder.KieRepository;
+import org.kie.api.builder.ReleaseId;
 import org.kie.api.io.Resource;
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
@@ -10,35 +17,19 @@ 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.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  KieFileSystem getKieFileSystem() {
+    private KieFileSystem getKieFileSystem() {
         KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
-        List<String> rules = Arrays.asList("BackwardChaining.drl", "SuggestApplicant.drl", "Product_rules.drl.xls");
-        for(String rule:rules) {
+        List<String> rules = Arrays.asList("com/baeldung/drools/rules/BackwardChaining.drl", "com/baeldung/drools/rules/SuggestApplicant.drl", "com/baeldung/drools/rules/Product_rules.drl.xls");
+        for (String rule : rules) {
             kieFileSystem.write(ResourceFactory.newClassPathResource(rule));
         }
         return kieFileSystem;
-
-    }
-
-    public KieContainer getKieContainer() {
-        getKieRepository();
-
-        KieBuilder kb = kieServices.newKieBuilder(getKieFileSystem());
-        kb.buildAll();
-
-        KieModule kieModule = kb.getKieModule();
-        KieContainer kContainer = kieServices.newKieContainer(kieModule.getReleaseId());
-
-        return kContainer;
-
     }
 
     private void getKieRepository() {
@@ -47,20 +38,14 @@ public class DroolsBeanFactory {
     }
 
     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.drl.xls"));
-        
-        KieBuilder kb = kieServices.newKieBuilder(kieFileSystem);
+        KieBuilder kb = kieServices.newKieBuilder(getKieFileSystem());
         kb.buildAll();
-        KieModule kieModule = kb.getKieModule();
 
-        KieContainer kContainer = kieServices.newKieContainer(kieModule.getReleaseId());
+        KieRepository kieRepository = kieServices.getRepository();
+        ReleaseId krDefaultReleaseId = kieRepository.getDefaultReleaseId();
+        KieContainer kieContainer = kieServices.newKieContainer(krDefaultReleaseId);
 
-        return kContainer.newKieSession();
+        return kieContainer.newKieSession();
     }
 
     public KieSession getKieSession(Resource dt) {
diff --git a/gradle-modules/gradle-5/README.md b/gradle-modules/gradle-5/README.md
index e37c100534..7871c0e822 100644
--- a/gradle-modules/gradle-5/README.md
+++ b/gradle-modules/gradle-5/README.md
@@ -2,3 +2,4 @@
 
 - [Run a Java main Method Using Gradle](https://www.baeldung.com/gradle-run-java-main)
 - [Finding Unused Gradle Dependencies](https://www.baeldung.com/gradle-finding-unused-dependencies)
+- [Intro to Gradle Lint Plugin](https://www.baeldung.com/java-gradle-lint-intro)
diff --git a/jenkins-modules/plugins/pom.xml b/jenkins-modules/plugins/pom.xml
index 42add1664e..c2b1408556 100644
--- a/jenkins-modules/plugins/pom.xml
+++ b/jenkins-modules/plugins/pom.xml
@@ -12,6 +12,7 @@
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
         <version>2.33</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
diff --git a/libraries-apache-commons-2/pom.xml b/libraries-apache-commons-2/pom.xml
index d771aac9ab..ee9b51e6cc 100644
--- a/libraries-apache-commons-2/pom.xml
+++ b/libraries-apache-commons-2/pom.xml
@@ -28,12 +28,18 @@
             <artifactId>commons-vfs2</artifactId>
             <version>${commons-vfs2.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>${apache-commons-text.version}</version>
+        </dependency>
     </dependencies>
 
     <properties>
         <commons-compress.version>1.23.0</commons-compress.version>
         <ant.version>1.10.13</ant.version>
         <commons-vfs2.version>2.9.0</commons-vfs2.version>
+        <apache-commons-text.version>1.10.0</apache-commons-text.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/libraries-apache-commons-2/src/main/java/com/baeldung/commons/convertunicode/UnicodeConverterUtil.java b/libraries-apache-commons-2/src/main/java/com/baeldung/commons/convertunicode/UnicodeConverterUtil.java
new file mode 100644
index 0000000000..c788f6ee61
--- /dev/null
+++ b/libraries-apache-commons-2/src/main/java/com/baeldung/commons/convertunicode/UnicodeConverterUtil.java
@@ -0,0 +1,29 @@
+package com.baeldung.commons.convertunicode;
+
+import org.apache.commons.text.StringEscapeUtils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class UnicodeConverterUtil {
+
+    public static String decodeWithApacheCommons(String input) {
+        return StringEscapeUtils.unescapeJava(input);
+    }
+
+    public static String decodeWithPlainJava(String input) {
+        Pattern pattern = Pattern.compile("\\\\u[0-9a-fA-F]{4}");
+        Matcher matcher = pattern.matcher(input);
+
+        StringBuilder decodedString = new StringBuilder();
+
+        while (matcher.find()) {
+            String unicodeSequence = matcher.group();
+            char unicodeChar = (char) Integer.parseInt(unicodeSequence.substring(2), 16);
+            matcher.appendReplacement(decodedString, Character.toString(unicodeChar));
+        }
+
+        matcher.appendTail(decodedString);
+        return decodedString.toString();
+    }
+}
diff --git a/libraries-apache-commons-2/src/test/java/com/baeldung/commons/convertunicode/UnicodeConverterUnitTest.java b/libraries-apache-commons-2/src/test/java/com/baeldung/commons/convertunicode/UnicodeConverterUnitTest.java
new file mode 100644
index 0000000000..f4a9bbcb77
--- /dev/null
+++ b/libraries-apache-commons-2/src/test/java/com/baeldung/commons/convertunicode/UnicodeConverterUnitTest.java
@@ -0,0 +1,39 @@
+package com.baeldung.commons.convertunicode;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class UnicodeConverterUnitTest {
+
+    @Test
+    public void whenInputHaveUnicodeSequences_ThenDecode() {
+        String encodedString = "\\u0048\\u0065\\u006C\\u006C\\u006F World";
+        String expectedDecodedString = "Hello World";
+        assertEquals(expectedDecodedString, UnicodeConverterUtil.decodeWithApacheCommons(encodedString));
+        assertEquals(expectedDecodedString, UnicodeConverterUtil.decodeWithPlainJava(encodedString));
+    }
+
+    @Test
+    public void whenInputHaveNoUnicodeSequences_ThenDoNothing() {
+        String inputString = "Hello World";
+        assertEquals(inputString, UnicodeConverterUtil.decodeWithApacheCommons(inputString));
+        assertEquals(inputString, UnicodeConverterUtil.decodeWithPlainJava(inputString));
+    }
+
+    @Test
+    public void whenInputHaveUnicodeSequencesInMiddle_ThenDecode() {
+        String encodedString = "This is a test \\u0069\\u006E the middle.";
+        String expectedDecodedString = "This is a test in the middle.";
+        assertEquals(expectedDecodedString, UnicodeConverterUtil.decodeWithApacheCommons(encodedString));
+        assertEquals(expectedDecodedString, UnicodeConverterUtil.decodeWithPlainJava(encodedString));
+    }
+
+    @Test
+    public void whenInputHaveMultipleUnicodeSequences_ThenDecode() {
+        String encodedString = "Unicode: \\u0048\\u0065\\u006C\\u006C\\u006F \\u0057\\u006F\\u0072\\u006C\\u0064";
+        String expectedDecodedString = "Unicode: Hello World";
+        assertEquals(expectedDecodedString, UnicodeConverterUtil.decodeWithApacheCommons(encodedString));
+        assertEquals(expectedDecodedString, UnicodeConverterUtil.decodeWithPlainJava(encodedString));
+    }
+}
diff --git a/libraries-io/pom.xml b/libraries-io/pom.xml
index e92f6e11e1..fa89ebeabe 100644
--- a/libraries-io/pom.xml
+++ b/libraries-io/pom.xml
@@ -5,6 +5,18 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>libraries-io</artifactId>
     <name>libraries-io</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>17</source>
+                    <target>17</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
     <parent>
         <groupId>com.baeldung</groupId>
@@ -34,6 +46,11 @@
             <artifactId>zip4j</artifactId>
             <version>${zip4j.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.opencsv</groupId>
+            <artifactId>opencsv</artifactId>
+            <version>${opencsv.version}</version>
+        </dependency>
     </dependencies>
 
     <properties>
@@ -42,6 +59,10 @@
         <sshj.version>0.27.0</sshj.version>
         <vfs.version>2.4</vfs.version>
         <zip4j.version>2.9.0</zip4j.version>
+        <opencsv.version>5.7.1</opencsv.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/libraries-io/src/main/java/com/baeldung/java/io/pojotocsv/Application.java b/libraries-io/src/main/java/com/baeldung/java/io/pojotocsv/Application.java
new file mode 100644
index 0000000000..b84da6229b
--- /dev/null
+++ b/libraries-io/src/main/java/com/baeldung/java/io/pojotocsv/Application.java
@@ -0,0 +1,4 @@
+package com.baeldung.java.io.pojotocsv;
+
+public record Application(String id, String name, Integer age, String created_at) {
+}
diff --git a/libraries-io/src/main/java/com/baeldung/java/io/pojotocsv/ApplicationWithAnnotation.java b/libraries-io/src/main/java/com/baeldung/java/io/pojotocsv/ApplicationWithAnnotation.java
new file mode 100644
index 0000000000..a0cd158843
--- /dev/null
+++ b/libraries-io/src/main/java/com/baeldung/java/io/pojotocsv/ApplicationWithAnnotation.java
@@ -0,0 +1,8 @@
+package com.baeldung.java.io.pojotocsv;
+
+import com.opencsv.bean.CsvBindByName;
+import com.opencsv.bean.CsvBindByPosition;
+
+public record ApplicationWithAnnotation(@CsvBindByName(column = "id", required = true) @CsvBindByPosition(position = 1) String id, @CsvBindByName(column = "name", required = true) @CsvBindByPosition(position = 0) String name,
+                                        @CsvBindByName(column = "age", required = true) @CsvBindByPosition(position = 2) Integer age, @CsvBindByName(column = "position", required = true) @CsvBindByPosition(position = 3) String created_at) {
+}
\ No newline at end of file
diff --git a/libraries-io/src/main/java/com/baeldung/java/io/pojotocsv/BeanToCsv.java b/libraries-io/src/main/java/com/baeldung/java/io/pojotocsv/BeanToCsv.java
new file mode 100644
index 0000000000..f66c16beda
--- /dev/null
+++ b/libraries-io/src/main/java/com/baeldung/java/io/pojotocsv/BeanToCsv.java
@@ -0,0 +1,55 @@
+package com.baeldung.java.io.pojotocsv;
+
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.List;
+
+import com.opencsv.CSVWriter;
+import com.opencsv.bean.StatefulBeanToCsvBuilder;
+import com.opencsv.exceptions.CsvDataTypeMismatchException;
+import com.opencsv.exceptions.CsvRequiredFieldEmptyException;
+
+public class BeanToCsv {
+
+    public void beanToCSVWithDefault(List<Application> applications) throws Exception {
+        try (FileWriter writer = new FileWriter("src/main/resources/application.csv")) {
+            var builder = new StatefulBeanToCsvBuilder<Application>(writer).withQuotechar(CSVWriter.NO_QUOTE_CHARACTER)
+                .withSeparator(',')
+                .build();
+            builder.write(applications);
+        }
+    }
+
+    public void beanToCSVWithCustomHeaderStrategy(List<Application> applications) throws IOException, CsvRequiredFieldEmptyException, CsvDataTypeMismatchException {
+        try (FileWriter writer = new FileWriter("src/main/resources/application2.csv")) {
+            var mappingStrategy = new CustomHeaderStrategy<Application>();
+            mappingStrategy.setType(Application.class);
+
+            var builder = new StatefulBeanToCsvBuilder<Application>(writer).withQuotechar(CSVWriter.NO_QUOTE_CHARACTER)
+                .withMappingStrategy(mappingStrategy)
+                .build();
+            builder.write(applications);
+        }
+    }
+
+    public void beanToCSVWithCustomPositionStrategy(List<ApplicationWithAnnotation> applications) throws Exception {
+        try (FileWriter writer = new FileWriter("src/main/resources/application3.csv")) {
+            var builder = new StatefulBeanToCsvBuilder<ApplicationWithAnnotation>(writer).withQuotechar(CSVWriter.NO_QUOTE_CHARACTER)
+                .build();
+            builder.write(applications);
+        }
+    }
+
+    public void beanToCSVWithCustomHeaderAndPositionStrategy(List<ApplicationWithAnnotation> applications) throws IOException, CsvRequiredFieldEmptyException, CsvDataTypeMismatchException {
+        try (FileWriter writer = new FileWriter("src/main/resources/application4.csv")) {
+            var mappingStrategy = new CustomColumnPositionStrategy<ApplicationWithAnnotation>();
+            mappingStrategy.setType(ApplicationWithAnnotation.class);
+
+            var builder = new StatefulBeanToCsvBuilder<ApplicationWithAnnotation>(writer).withQuotechar(CSVWriter.NO_QUOTE_CHARACTER)
+                .withMappingStrategy(mappingStrategy)
+                .build();
+            builder.write(applications);
+        }
+    }
+
+}
diff --git a/libraries-io/src/main/java/com/baeldung/java/io/pojotocsv/CustomColumnPositionStrategy.java b/libraries-io/src/main/java/com/baeldung/java/io/pojotocsv/CustomColumnPositionStrategy.java
new file mode 100644
index 0000000000..204bf3f917
--- /dev/null
+++ b/libraries-io/src/main/java/com/baeldung/java/io/pojotocsv/CustomColumnPositionStrategy.java
@@ -0,0 +1,12 @@
+package com.baeldung.java.io.pojotocsv;
+
+import com.opencsv.bean.ColumnPositionMappingStrategy;
+import com.opencsv.exceptions.CsvRequiredFieldEmptyException;
+
+public class CustomColumnPositionStrategy<T> extends ColumnPositionMappingStrategy<T> {
+    @Override
+    public String[] generateHeader(T bean) throws CsvRequiredFieldEmptyException {
+        super.generateHeader(bean);
+        return super.getColumnMapping();
+    }
+}
diff --git a/libraries-io/src/main/java/com/baeldung/java/io/pojotocsv/CustomHeaderStrategy.java b/libraries-io/src/main/java/com/baeldung/java/io/pojotocsv/CustomHeaderStrategy.java
new file mode 100644
index 0000000000..8e81c8ec28
--- /dev/null
+++ b/libraries-io/src/main/java/com/baeldung/java/io/pojotocsv/CustomHeaderStrategy.java
@@ -0,0 +1,16 @@
+package com.baeldung.java.io.pojotocsv;
+
+import java.util.Arrays;
+
+import com.opencsv.bean.HeaderColumnNameMappingStrategy;
+import com.opencsv.exceptions.CsvRequiredFieldEmptyException;
+
+public class CustomHeaderStrategy<T> extends HeaderColumnNameMappingStrategy<T> {
+    @Override
+    public String[] generateHeader(T bean) throws CsvRequiredFieldEmptyException {
+        String[] header = super.generateHeader(bean);
+        return Arrays.stream(header)
+            .map(String::toLowerCase)
+            .toArray(String[]::new);
+    }
+}
diff --git a/libraries-io/src/main/resources/application.csv b/libraries-io/src/main/resources/application.csv
new file mode 100644
index 0000000000..d4040e18e1
--- /dev/null
+++ b/libraries-io/src/main/resources/application.csv
@@ -0,0 +1,4 @@
+AGE,CREATED_AT,ID,NAME
+34,2023-08-11,123,Sam
+44,2023-02-11,456,Tam
+54,2023-03-11,890,Jam
diff --git a/libraries-io/src/main/resources/application2.csv b/libraries-io/src/main/resources/application2.csv
new file mode 100644
index 0000000000..92bbced703
--- /dev/null
+++ b/libraries-io/src/main/resources/application2.csv
@@ -0,0 +1,4 @@
+age,created_at,id,name
+34,2023-08-11,123,Sam
+44,2023-02-11,456,Tam
+54,2023-03-11,890,Jam
diff --git a/libraries-io/src/main/resources/application3.csv b/libraries-io/src/main/resources/application3.csv
new file mode 100644
index 0000000000..165107b103
--- /dev/null
+++ b/libraries-io/src/main/resources/application3.csv
@@ -0,0 +1,3 @@
+Sam,123,34,2023-08-11
+Tam,456,44,2023-02-11
+Jam,789,54,2023-03-11
diff --git a/libraries-io/src/main/resources/application4.csv b/libraries-io/src/main/resources/application4.csv
new file mode 100644
index 0000000000..b7999ae227
--- /dev/null
+++ b/libraries-io/src/main/resources/application4.csv
@@ -0,0 +1,4 @@
+name,id,age,created_at
+Sam,123,34,2023-08-11
+Tam,456,44,2023-02-11
+Jam,789,54,2023-03-11
diff --git a/libraries-io/src/test/java/com/baeldung/java/io/pojotocsv/BeanToCsvUnitTest.java b/libraries-io/src/test/java/com/baeldung/java/io/pojotocsv/BeanToCsvUnitTest.java
new file mode 100644
index 0000000000..50cd1b1e0e
--- /dev/null
+++ b/libraries-io/src/test/java/com/baeldung/java/io/pojotocsv/BeanToCsvUnitTest.java
@@ -0,0 +1,80 @@
+package com.baeldung.java.io.pojotocsv;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+import java.io.BufferedReader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class BeanToCsvUnitTest {
+
+    List<Application> applications = new ArrayList<>();
+    List<ApplicationWithAnnotation> applicationsWithAnnotation = new ArrayList<>();
+
+    @BeforeEach
+    public void beforeEach() {
+        applications = List.of(new Application("123", "Sam", 34, "2023-08-11"), new Application("456", "Tam", 44, "2023-02-11"), new Application("890", "Jam", 54, "2023-03-11"));
+
+        applicationsWithAnnotation = List.of(new ApplicationWithAnnotation("123", "Sam", 34, "2023-08-11"), new ApplicationWithAnnotation("456", "Tam", 44, "2023-02-11"), new ApplicationWithAnnotation("789", "Jam", 54, "2023-03-11"));
+    }
+
+    @Test
+    public void givenApplicationPOJO_whenUsingDefaultStrategy_thenReceiveCSVFormatWithAscendingOrderOfField() throws Exception {
+        BeanToCsv beanToCsv = new BeanToCsv();
+        beanToCsv.beanToCSVWithDefault(applications);
+        try (BufferedReader bufferedReader = Files.newBufferedReader(Path.of("src/main/resources/application.csv"))) {
+            List<String> content = bufferedReader.lines()
+                .toList();
+            assertThat(content.get(0)).isEqualTo("AGE,CREATED_AT,ID,NAME");
+            assertThat(content.get(1)).isEqualTo("34,2023-08-11,123,Sam");
+            assertThat(content.get(2)).isEqualTo("44,2023-02-11,456,Tam");
+            assertThat(content.get(3)).isEqualTo("54,2023-03-11,890,Jam");
+        }
+    }
+
+    @Test
+    public void givenApplicationPOJO_whenUsingCustomHeaderStrategy_thenReceiveCSVFormatWithCustomHeaders() throws Exception {
+        BeanToCsv beanToCsv = new BeanToCsv();
+        beanToCsv.beanToCSVWithCustomHeaderStrategy(applications);
+        try (BufferedReader bufferedReader = Files.newBufferedReader(Path.of("src/main/resources/application2.csv"))) {
+            List<String> content = bufferedReader.lines()
+                .toList();
+            assertThat(content.get(0)).isEqualTo("age,created_at,id,name");
+            assertThat(content.get(1)).isEqualTo("34,2023-08-11,123,Sam");
+            assertThat(content.get(2)).isEqualTo("44,2023-02-11,456,Tam");
+            assertThat(content.get(3)).isEqualTo("54,2023-03-11,890,Jam");
+        }
+    }
+
+    @Test
+    public void givenApplicationPOJOWithAnnotation_whenUsingCustomPositionStrategy_thenReceiveCSVFormatWithCustomPosition() throws Exception {
+        BeanToCsv beanToCsv = new BeanToCsv();
+        beanToCsv.beanToCSVWithCustomPositionStrategy(applicationsWithAnnotation);
+        try (BufferedReader bufferedReader = Files.newBufferedReader(Path.of("src/main/resources/application3.csv"))) {
+            List<String> content = bufferedReader.lines()
+                .toList();
+            assertThat(content.get(0)).isEqualTo("Sam,123,34,2023-08-11");
+            assertThat(content.get(1)).isEqualTo("Tam,456,44,2023-02-11");
+            assertThat(content.get(2)).isEqualTo("Jam,789,54,2023-03-11");
+        }
+    }
+
+    @Test
+    public void givenApplicationPOJOWithAnnotation_whenUsingCustomHeaderPositionStrategy_thenReceiveCSVFormatWithCustomHeaderPosition() throws Exception {
+        BeanToCsv beanToCsv = new BeanToCsv();
+        beanToCsv.beanToCSVWithCustomHeaderAndPositionStrategy(applicationsWithAnnotation);
+        try (BufferedReader bufferedReader = Files.newBufferedReader(Path.of("src/main/resources/application4.csv"))) {
+            List<String> content = bufferedReader.lines()
+                .toList();
+            assertThat(content.get(0)).isEqualTo("name,id,age,created_at");
+            assertThat(content.get(1)).isEqualTo("Sam,123,34,2023-08-11");
+            assertThat(content.get(2)).isEqualTo("Tam,456,44,2023-02-11");
+            assertThat(content.get(3)).isEqualTo("Jam,789,54,2023-03-11");
+        }
+    }
+}
diff --git a/logging-modules/log4j/README.md b/logging-modules/log4j/README.md
index a47d0ae89b..32ea358369 100644
--- a/logging-modules/log4j/README.md
+++ b/logging-modules/log4j/README.md
@@ -4,3 +4,4 @@
 - [A Guide to Rolling File Appenders](http://www.baeldung.com/java-logging-rolling-file-appenders)
 - [Logging Exceptions Using SLF4J](https://www.baeldung.com/slf4j-log-exceptions)
 - [Log4j Warning: “No Appenders Could Be Found for Logger”](https://www.baeldung.com/log4j-no-appenders-found)
+- [A Guide to Log4j and the log4j.properties File in Java](https://www.baeldung.com/java-log4j-properties-guide)
diff --git a/logging-modules/log4j2/README.md b/logging-modules/log4j2/README.md
index 87e92e0d48..fa7133ffdd 100644
--- a/logging-modules/log4j2/README.md
+++ b/logging-modules/log4j2/README.md
@@ -9,3 +9,4 @@
 - [Log4j 2 Plugins](https://www.baeldung.com/log4j2-plugins)
 - [Printing Thread Info in Log File Using Log4j2](https://www.baeldung.com/log4j2-print-thread-info)
 - [Log4j2 – Logging to Both File and Console](https://www.baeldung.com/java-log4j2-file-and-console)
+- [Log4j 2 Configuration Using a Properties File](https://www.baeldung.com/java-log4j2-config-with-prop-file)
diff --git a/mapstruct/src/main/java/com/baeldung/expression/dto/LicenseDto.java b/mapstruct/src/main/java/com/baeldung/expression/dto/LicenseDto.java
index 025df1a4f6..1d7cacaead 100644
--- a/mapstruct/src/main/java/com/baeldung/expression/dto/LicenseDto.java
+++ b/mapstruct/src/main/java/com/baeldung/expression/dto/LicenseDto.java
@@ -11,6 +11,8 @@ public class LicenseDto {
 
     private LocalDateTime endDate;
 
+    private String licenseType;
+
     public UUID getId() {
         return id;
     }
@@ -35,4 +37,12 @@ public class LicenseDto {
         this.endDate = endDate;
     }
 
+    public String getLicenseType() {
+        return licenseType;
+    }
+
+    public void setLicenseType(String licenseType) {
+        this.licenseType = licenseType;
+    }
+
 }
diff --git a/mapstruct/src/main/java/com/baeldung/expression/mapper/LicenseMapper.java b/mapstruct/src/main/java/com/baeldung/expression/mapper/LicenseMapper.java
index 100588b45d..0d8904e220 100644
--- a/mapstruct/src/main/java/com/baeldung/expression/mapper/LicenseMapper.java
+++ b/mapstruct/src/main/java/com/baeldung/expression/mapper/LicenseMapper.java
@@ -6,6 +6,7 @@ import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 
 import org.mapstruct.AfterMapping;
+import org.mapstruct.Condition;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingTarget;
@@ -40,4 +41,13 @@ public interface LicenseMapper {
             .toDays() <= 14;
     }
 
-}
+    @Condition
+    default boolean mapsToExpectedLicenseType(String licenseType) {
+        try {
+            return licenseType != null && License.LicenseType.valueOf(licenseType) != null;
+        } catch (IllegalArgumentException e) {
+            return false;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/mapstruct/src/main/java/com/baeldung/expression/model/License.java b/mapstruct/src/main/java/com/baeldung/expression/model/License.java
index 71e4f086c0..e36e278a57 100644
--- a/mapstruct/src/main/java/com/baeldung/expression/model/License.java
+++ b/mapstruct/src/main/java/com/baeldung/expression/model/License.java
@@ -3,7 +3,6 @@ package com.baeldung.expression.model;
 import java.time.OffsetDateTime;
 import java.util.UUID;
 
-
 public class License {
 
     private UUID id;
@@ -16,6 +15,8 @@ public class License {
 
     private boolean renewalRequired;
 
+    private LicenseType licenseType;
+
     public UUID getId() {
         return id;
     }
@@ -55,4 +56,16 @@ public class License {
     public void setRenewalRequired(boolean renewalRequired) {
         this.renewalRequired = renewalRequired;
     }
-}
+
+    public enum LicenseType {
+        INDIVIDUAL, FAMILY
+    }
+
+    public LicenseType getLicenseType() {
+        return licenseType;
+    }
+
+    public void setLicenseType(LicenseType licenseType) {
+        this.licenseType = licenseType;
+    }
+}
\ No newline at end of file
diff --git a/mapstruct/src/test/java/com/baeldung/expression/mapper/LicenseMapperUnitTest.java b/mapstruct/src/test/java/com/baeldung/expression/mapper/LicenseMapperUnitTest.java
index dcdda5c1ac..d7521e81f5 100644
--- a/mapstruct/src/test/java/com/baeldung/expression/mapper/LicenseMapperUnitTest.java
+++ b/mapstruct/src/test/java/com/baeldung/expression/mapper/LicenseMapperUnitTest.java
@@ -6,6 +6,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.UUID;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mapstruct.factory.Mappers;
 
@@ -74,4 +75,31 @@ class LicenseMapperUnitTest {
         assertThat(license.getId()).isSameAs(id);
     }
 
+    @Test
+    void givenLicenseDtoWithoutLicenseTypeString_whenMapperMethodIsInvoked_thenLicenseShouldBePopulatedWithoutLicenseType() {
+        LicenseDto licenseDto = new LicenseDto();
+        License license = licenseMapper.toLicense(licenseDto);
+        assertThat(license).isNotNull();
+        Assertions.assertNull(license.getLicenseType());
+    }
+
+    @Test
+    void givenLicenseDtoWithInvalidLicenseTypeString_whenMapperMethodIsInvoked_thenLicenseShouldBePopulatedWithoutLicenseType() {
+        LicenseDto licenseDto = new LicenseDto();
+        licenseDto.setLicenseType("invalid_license_type");
+        License license = licenseMapper.toLicense(licenseDto);
+        assertThat(license).isNotNull();
+        Assertions.assertNull(license.getLicenseType());
+    }
+
+    @Test
+    void givenLicenseDtoWithValidLicenseTypeString_whenMapperMethodIsInvoked_thenLicenseShouldBePopulatedWithMatchingLicenseType() {
+        LicenseDto licenseDto = new LicenseDto();
+        licenseDto.setLicenseType("INDIVIDUAL");
+        License license = licenseMapper.toLicense(licenseDto);
+        assertThat(license).isNotNull();
+        Assertions.assertNotNull(license.getLicenseType());
+        assertThat(license.getLicenseType()).isEqualTo(License.LicenseType.INDIVIDUAL);
+    }
+
 }
\ No newline at end of file
diff --git a/messaging-modules/apache-camel/pom.xml b/messaging-modules/apache-camel/pom.xml
index bb20f178aa..8b49ad4893 100644
--- a/messaging-modules/apache-camel/pom.xml
+++ b/messaging-modules/apache-camel/pom.xml
@@ -17,30 +17,39 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-core</artifactId>
-            <version>${env.camel.version}</version>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-spring-boot-starter</artifactId>
+            <version>${camel.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-jackson-starter</artifactId>
+            <version>${camel.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-spring-javaconfig</artifactId>
-            <version>${env.camel.version}</version>
+            <artifactId>camel-test-spring-junit5</artifactId>
+            <version>${camel.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-jackson</artifactId>
-            <version>${env.camel.version}</version>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test</artifactId>
-            <version>${env.camel.version}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <properties>
-        <env.camel.version>3.14.7</env.camel.version>
+        <camel.version>3.21.0</camel.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/messaging-modules/apache-camel/src/main/java/com/baeldung/camel/apache/Application.java b/messaging-modules/apache-camel/src/main/java/com/baeldung/camel/apache/Application.java
new file mode 100755
index 0000000000..51b2540aa8
--- /dev/null
+++ b/messaging-modules/apache-camel/src/main/java/com/baeldung/camel/apache/Application.java
@@ -0,0 +1,11 @@
+package com.baeldung.camel.apache;
+
+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/messaging-modules/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
index ce4d92e8ab..a0571e7083 100644
--- a/messaging-modules/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
@@ -5,14 +5,17 @@ import java.util.Date;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
+import org.springframework.stereotype.Component;
 
+@Component
 public class FileProcessor implements Processor {
 
+    @Override
     public void process(Exchange exchange) throws Exception {
         String originalFileName = (String) exchange.getIn().getHeader(Exchange.FILE_NAME, String.class);
 
         Date date = new Date();
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss");
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String changedFileName = dateFormat.format(date) + originalFileName;
         exchange.getIn().setHeader(Exchange.FILE_NAME, changedFileName);
     }
diff --git a/messaging-modules/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
index 760f37677b..b57232d41e 100644
--- a/messaging-modules/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
@@ -1,7 +1,9 @@
 package com.baeldung.camel.apache.file;
 
 import org.apache.camel.builder.RouteBuilder;
+import org.springframework.stereotype.Component;
 
+@Component
 public class FileRouter extends RouteBuilder {
 
     private static final String SOURCE_FOLDER = "src/test/source-folder";
diff --git a/messaging-modules/apache-camel/src/main/resources/camel-context-test.xml b/messaging-modules/apache-camel/src/main/resources/camel-context-test.xml
index f306574868..f6177c69b5 100644
--- a/messaging-modules/apache-camel/src/main/resources/camel-context-test.xml
+++ b/messaging-modules/apache-camel/src/main/resources/camel-context-test.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-	 http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+	 http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
 
-	<bean id="fileRouter" class="com.baeldung.camel.apache.file.FileRouter" />
-	<bean id="fileProcessor" class="com.baeldung.camel.apache.file.FileProcessor" />
+	<context:component-scan base-package="com.baeldung.camel.apache"/>
+	<context:annotation-config />
 
 	<camelContext xmlns="http://camel.apache.org/schema/spring">
 		<routeBuilder ref="fileRouter" />
diff --git a/messaging-modules/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
index bc0025b263..ab5993d816 100644
--- a/messaging-modules/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
@@ -1,31 +1,65 @@
 package com.apache.baeldung.camel.jackson;
 
+import com.baeldung.camel.apache.Application;
+import com.baeldung.camel.apache.jackson.Fruit;
+import org.apache.camel.Configuration;
+import org.apache.camel.EndpointInject;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jackson.ListJacksonDataFormat;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
+import org.springframework.test.annotation.DirtiesContext;
+
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.List;
 
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jackson.ListJacksonDataFormat;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertNotNull;
 
-import com.baeldung.camel.apache.jackson.Fruit;
+@CamelSpringBootTest
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+@SpringBootTest(classes = {Application.class, FruitArrayJacksonUnmarshalUnitTest.TestConfig.class})
+public class FruitArrayJacksonUnmarshalUnitTest {
 
-public class FruitArrayJacksonUnmarshalUnitTest extends CamelTestSupport {
+    @Autowired
+    private ProducerTemplate template;
+
+    @EndpointInject("mock:marshalledObject")
+    private MockEndpoint mock;
+
+    @Configuration
+    static class TestConfig {
+        @Bean
+        RoutesBuilder route() {
+            return new RouteBuilder() {
+                @Override
+                public void configure() throws Exception {
+                    from("direct:jsonInput").unmarshal(new ListJacksonDataFormat(Fruit.class))
+                      .to("mock:marshalledObject");
+                }
+            };
+        }
+    }
 
     @Test
     public void givenJsonFruitArray_whenUnmarshalled_thenSuccess() throws Exception {
-        MockEndpoint mock = getMockEndpoint("mock:marshalledObject");
-        mock.expectedMessageCount(1);
+        mock.setExpectedMessageCount(1);
         mock.message(0).body().isInstanceOf(List.class);
 
         String json = readJsonFromFile("/json/fruit-array.json");
         template.sendBody("direct:jsonInput", json);
-        assertMockEndpointsSatisfied();
+        mock.assertIsSatisfied();
 
         @SuppressWarnings("unchecked")
         List<Fruit> fruitList = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
@@ -41,22 +75,10 @@ public class FruitArrayJacksonUnmarshalUnitTest extends CamelTestSupport {
         assertEquals("Fruit name", "Apple", fruit.getName());
         assertEquals("Fruit id", 101, fruit.getId());
     }
-    
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-
-                from("direct:jsonInput").unmarshal(new ListJacksonDataFormat(Fruit.class))
-                    .to("mock:marshalledObject");
-            }
-        };
-    }
 
     private String readJsonFromFile(String path) throws URISyntaxException, IOException {
         URL resource = FruitArrayJacksonUnmarshalUnitTest.class.getResource(path);
-        return new String(Files.readAllBytes(Paths.get(resource.toURI())));
+        return new String(Files.readAllBytes(Paths.get(resource.toURI())), StandardCharsets.UTF_8);
     }
 
 }
diff --git a/messaging-modules/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
index 2d15ebf46b..8120eeffec 100644
--- a/messaging-modules/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
@@ -1,32 +1,64 @@
 package com.apache.baeldung.camel.jackson;
 
+import com.baeldung.camel.apache.Application;
+import com.baeldung.camel.apache.jackson.Fruit;
+import com.baeldung.camel.apache.jackson.FruitList;
+import org.apache.camel.Configuration;
+import org.apache.camel.EndpointInject;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jackson.JacksonDataFormat;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
+
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.List;
 
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jackson.JacksonDataFormat;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertNotNull;
 
-import com.baeldung.camel.apache.jackson.Fruit;
-import com.baeldung.camel.apache.jackson.FruitList;
+@CamelSpringBootTest
+@SpringBootTest(classes = {Application.class, FruitListJacksonUnmarshalUnitTest.TestConfig.class})
+public class FruitListJacksonUnmarshalUnitTest {
 
-public class FruitListJacksonUnmarshalUnitTest extends CamelTestSupport {
+    @Autowired
+    private ProducerTemplate template;
+
+    @EndpointInject("mock:marshalledObject")
+    private MockEndpoint mock;
+
+    @Configuration
+    static class TestConfig {
+        @Bean
+        RoutesBuilder route() {
+            return new RouteBuilder() {
+                @Override
+                public void configure() throws Exception {
+                    from("direct:jsonInput").unmarshal(new JacksonDataFormat(FruitList.class))
+                      .to("mock:marshalledObject");
+                }
+            };
+        }
+    }
 
     @Test
     public void givenJsonFruitList_whenUnmarshalled_thenSuccess() throws Exception {
-        MockEndpoint mock = getMockEndpoint("mock:marshalledObject");
-        mock.expectedMessageCount(1);
+        mock.setExpectedMessageCount(1);
         mock.message(0).body().isInstanceOf(FruitList.class);
 
         String json = readJsonFromFile("/json/fruit-list.json");
         template.sendBody("direct:jsonInput", json);
-        assertMockEndpointsSatisfied();
+        mock.assertIsSatisfied();
 
         FruitList fruitList = mock.getReceivedExchanges().get(0).getIn().getBody(FruitList.class);
         assertNotNull("Fruit lists should not be null", fruitList);
@@ -43,20 +75,9 @@ public class FruitListJacksonUnmarshalUnitTest extends CamelTestSupport {
         assertEquals("Fruit id", 101, fruit.getId());
     }
 
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("direct:jsonInput").unmarshal(new JacksonDataFormat(FruitList.class))
-                    .to("mock:marshalledObject");
-            }
-        };
-    }
-
     private String readJsonFromFile(String path) throws URISyntaxException, IOException {
         URL resource = FruitListJacksonUnmarshalUnitTest.class.getResource(path);
-        return new String(Files.readAllBytes(Paths.get(resource.toURI())));
+        return new String(Files.readAllBytes(Paths.get(resource.toURI())), StandardCharsets.UTF_8);
     }
 
 }
diff --git a/messaging-modules/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
index e4390a95e5..5003021d20 100644
--- a/messaging-modules/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
@@ -1,16 +1,21 @@
 package com.apache.camel.file.processor;
 
-import java.io.File;
-
+import com.baeldung.camel.apache.file.FileProcessor;
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.DefaultCamelContext;
+import org.awaitility.Awaitility;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import com.baeldung.camel.apache.file.FileProcessor;
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 
 public class FileProcessorIntegrationTest {
@@ -52,7 +57,7 @@ public class FileProcessorIntegrationTest {
     }
 
     @Test
-    public void moveFolderContentJavaDSLTest() throws Exception {
+    public void givenJavaDSLRoute_whenCamelStart_thenMoveFolderContent() throws Exception {
         final CamelContext camelContext = new DefaultCamelContext();
         camelContext.addRoutes(new RouteBuilder() {
             @Override
@@ -61,15 +66,26 @@ public class FileProcessorIntegrationTest {
             }
         });
         camelContext.start();
-        Thread.sleep(DURATION_MILIS);
+        verifyFolderContent();
         camelContext.stop();
     }
 
     @Test
-    public void moveFolderContentSpringDSLTest() throws InterruptedException {
+    public void givenSpringDSLRoute_whenCamelStart_thenMoveFolderContent() throws InterruptedException {
         ClassPathXmlApplicationContext applicationContext = new ClassPathXmlApplicationContext("camel-context-test.xml");
-        Thread.sleep(DURATION_MILIS);
+        verifyFolderContent();
         applicationContext.close();
+    }
 
+    private void verifyFolderContent() {
+        Date date = new Date();
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        File destinationFile1 = new File(DESTINATION_FOLDER + "/" + dateFormat.format(date) + "File1.txt");
+        File destinationFile2 = new File(DESTINATION_FOLDER + "/" + dateFormat.format(date) + "File2.txt");
+
+        Awaitility.await().atMost(DURATION_MILIS, TimeUnit.MILLISECONDS).untilAsserted(() -> {
+            assertThat(destinationFile1.exists()).isTrue();
+            assertThat(destinationFile2.exists()).isTrue();
+        });
     }
 }
\ No newline at end of file
diff --git a/microservices-modules/micronaut/pom.xml b/microservices-modules/micronaut/pom.xml
index 716b5497d8..d3f4326a85 100644
--- a/microservices-modules/micronaut/pom.xml
+++ b/microservices-modules/micronaut/pom.xml
@@ -7,6 +7,7 @@
     <artifactId>micronaut</artifactId>
     <version>0.1</version>
     <name>micronaut</name>
+    <packaging>${packaging}</packaging>
 
     <parent>
         <groupId>com.baeldung</groupId>
@@ -18,7 +19,7 @@
         <dependencies>
             <dependency>
                 <groupId>io.micronaut</groupId>
-                <artifactId>bom</artifactId>
+                <artifactId>micronaut-bom</artifactId>
                 <version>${micronaut.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
@@ -29,120 +30,136 @@
     <dependencies>
         <dependency>
             <groupId>io.micronaut</groupId>
-            <artifactId>http-client</artifactId>
+            <artifactId>micronaut-runtime</artifactId>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.micronaut</groupId>
+                    <artifactId>micronaut-jackson-databind</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.micronaut</groupId>
+            <artifactId>micronaut-http-client</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>io.micronaut</groupId>
-            <artifactId>http-server-netty</artifactId>
+            <artifactId>micronaut-http-server-netty</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>io.micronaut</groupId>
-            <artifactId>inject</artifactId>
+            <artifactId>micronaut-inject</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>io.micronaut</groupId>
-            <artifactId>runtime</artifactId>
+            <artifactId>micronaut-validation</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>${annotation.api.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.micronaut</groupId>
-            <artifactId>inject-java</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>io.projectreactor</groupId>
-            <artifactId>reactor-core</artifactId>
-            <version>${reactor.version}</version>
+            <groupId>io.micronaut.rxjava3</groupId>
+            <artifactId>micronaut-rxjava3</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.micronaut.rxjava3</groupId>
+            <artifactId>micronaut-rxjava3-http-client</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.micronaut.serde</groupId>
+            <artifactId>micronaut-serde-jackson</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.micronaut.test</groupId>
+            <artifactId>micronaut-test-junit5</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>io.micronaut.build</groupId>
+                <artifactId>micronaut-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${jdk.version}</source>
+                    <target>${jdk.version}</target>
+                    <compilerArgs>
+                        <arg>-parameters</arg>
+                    </compilerArgs>
+                    <!-- Uncomment to enable incremental compilation -->
+                    <!-- <useIncrementalCompilation>false</useIncrementalCompilation> -->
+
+                    <annotationProcessorPaths combine.self="append">
+
+                        <path>
+                            <groupId>io.micronaut</groupId>
+                            <artifactId>micronaut-inject-java</artifactId>
+                            <version>${micronaut.version}</version>
+                        </path>
+
+                        <path>
+                            <groupId>io.micronaut</groupId>
+                            <artifactId>micronaut-http-validation</artifactId>
+                            <version>${micronaut.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>${shade.plugin.version}</version>
                 <executions>
                     <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <transformers>
-                                <transformer
-                                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>${exec.mainClass}</mainClass>
-                                </transformer>
-                                <transformer
-                                    implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                            </transformers>
-                        </configuration>
+                        <id>default-shade</id>
+                        <phase>none</phase>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <configuration>
-                    <executable>java</executable>
-                    <arguments>
-                        <argument>-classpath</argument>
-                        <classpath/>
-                        <argument>${exec.mainClass}</argument>
-                    </arguments>
-                </configuration>
-            </plugin>
         </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${compiler.plugin.version}</version>
-                    <configuration>
-                        <source>${jdk.version}</source>
-                        <target>${jdk.version}</target>
-                        <compilerArgs>
-                            <arg>-parameters</arg>
-                        </compilerArgs>
-                        <annotationProcessorPaths>
-                            <path>
-                                <groupId>io.micronaut</groupId>
-                                <artifactId>inject-java</artifactId>
-                                <version>${micronaut.version}</version>
-                            </path>
-                        </annotationProcessorPaths>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
     </build>
 
     <properties>
         <!-- <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>
+        <micronaut.version>3.10.1</micronaut.version>
         <jdk.version>17</jdk.version>
-        <annotation.api.version>1.3.2</annotation.api.version>
-        <reactor.version>3.1.6.RELEASE</reactor.version>
+        <release.version>17</release.version>
+        <packaging>jar</packaging>
         <compiler.plugin.version>3.7.0</compiler.plugin.version>
-        <shade.plugin.version>3.1.0</shade.plugin.version>
+        <micronaut.runtime>netty</micronaut.runtime>
+        <shade.plugin.version>3.2.0</shade.plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/custom/client/BirdCountClient.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/custom/client/BirdCountClient.java
new file mode 100644
index 0000000000..d9e09b1c6e
--- /dev/null
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/custom/client/BirdCountClient.java
@@ -0,0 +1,42 @@
+package com.baeldung.micronaut.apiversioning.custom.client;
+
+import io.micronaut.core.annotation.Nullable;
+import io.micronaut.core.async.annotation.SingleResult;
+import io.micronaut.http.HttpHeaders;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.Header;
+import io.micronaut.http.annotation.QueryValue;
+import io.micronaut.http.client.annotation.Client;
+import io.reactivex.rxjava3.core.Flowable;
+
+@Client("/")
+@Header(name = HttpHeaders.ACCEPT, value = "application/json")
+public interface BirdCountClient {
+
+    @Get(
+        uri = "/bird/count",
+        consumes = {"application/json"},
+        produces = {"application/json"}
+    )
+    @Header(name = "api-key", value = "11")
+    @SingleResult
+    Flowable<String> countV1(@QueryValue("max") @Nullable Integer max);
+
+    @Get(
+        uri = "/bird/count",
+        consumes = {"application/json"},
+        produces = {"application/json"}
+    )
+    @Header(name = "api-key", value = "10")
+    @SingleResult
+    Flowable<String> countV2(@QueryValue("max") @Nullable Integer max);
+
+    @Get(
+        uri = "/bird/count",
+        consumes = {"application/json"},
+        produces = {"application/json"}
+    )
+    @Header(name = "api-key", value = "")
+    @SingleResult
+    Flowable<String> countDefault(@QueryValue("max") @Nullable Integer max);
+}
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/custom/server/BirdCountController.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/custom/server/BirdCountController.java
new file mode 100644
index 0000000000..c836761266
--- /dev/null
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/custom/server/BirdCountController.java
@@ -0,0 +1,36 @@
+package com.baeldung.micronaut.apiversioning.custom.server;
+
+import io.micronaut.core.annotation.NonNull;
+import io.micronaut.core.annotation.Nullable;
+import io.micronaut.core.version.annotation.Version;
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.QueryValue;
+import io.reactivex.rxjava3.core.Flowable;
+
+import java.util.stream.Stream;
+
+@Controller("/bird")
+public class BirdCountController {
+
+    @Get(value = "/count", produces = {"application/json"})
+    @Version("1")
+    public Flowable<String> countV1(@QueryValue("max") @Nullable Integer max) {
+        return Flowable.fromStream(
+            Stream.iterate(0, i -> i + 1)
+                .map(index -> "Bird " + index)
+                .limit(max == null ? 10 : max)
+        );
+    }
+
+    @Get(value = "/count", produces = {"application/json"})
+    @Version("2")
+    public Flowable<String> countV2(@QueryValue("max") @NonNull Integer max) {
+        return Flowable.fromStream(
+                Stream.iterate(0, i -> i + 1)
+                        .map(index -> "Bird " + index)
+                        .limit(max)
+        );
+    }
+
+}
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/custom/server/CustomVersionResolver.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/custom/server/CustomVersionResolver.java
new file mode 100644
index 0000000000..3075a135c8
--- /dev/null
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/custom/server/CustomVersionResolver.java
@@ -0,0 +1,31 @@
+package com.baeldung.micronaut.apiversioning.custom.server;
+
+import io.micronaut.context.annotation.Requires;
+import io.micronaut.context.annotation.Value;
+import io.micronaut.http.HttpRequest;
+import io.micronaut.web.router.version.resolution.RequestVersionResolver;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+
+import java.util.Optional;
+
+@Singleton
+@Requires(property = "my.router.versioning.enabled", value = "true")
+public class CustomVersionResolver implements RequestVersionResolver {
+
+    @Inject
+    @Value("${micronaut.router.versioning.default-version}")
+    private String defaultVersion;
+
+    @Override
+    public Optional<String> resolve(HttpRequest<?> request) {
+        var apiKey = Optional.ofNullable(request.getHeaders().get("api-key"));
+
+        if (apiKey.isPresent() && !apiKey.get().isEmpty()) {
+            return Optional.of(Integer.parseInt(apiKey.get())  % 2 == 0 ? "2" : "1");
+        }
+
+        return Optional.of(defaultVersion);
+    }
+
+}
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/header/client/DogCountClient.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/header/client/DogCountClient.java
new file mode 100644
index 0000000000..487bff4d57
--- /dev/null
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/header/client/DogCountClient.java
@@ -0,0 +1,42 @@
+package com.baeldung.micronaut.apiversioning.header.client;
+
+import io.micronaut.core.annotation.Nullable;
+import io.micronaut.core.async.annotation.SingleResult;
+import io.micronaut.core.version.annotation.Version;
+import io.micronaut.http.HttpHeaders;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.Header;
+import io.micronaut.http.annotation.QueryValue;
+import io.micronaut.http.client.annotation.Client;
+import io.reactivex.rxjava3.core.Flowable;
+
+@Client("/")
+@Header(name = HttpHeaders.ACCEPT, value = "application/json")
+public interface DogCountClient {
+
+    @Get(
+        uri = "/dog/count",
+        consumes = {"application/json"},
+        produces = {"application/json"}
+    )
+    @Version("1")
+    @SingleResult
+    Flowable<String> countV1(@QueryValue("max") @Nullable Integer max);
+
+    @Get(
+        uri = "/dog/count",
+        consumes = {"application/json"},
+        produces = {"application/json"}
+    )
+    @Version("2")
+    @SingleResult
+    Flowable<String> countV2(@QueryValue("max") @Nullable Integer max);
+
+    @Get(
+        uri = "/dog/count",
+        consumes = {"application/json"},
+        produces = {"application/json"}
+    )
+    @SingleResult
+    Flowable<String> countDefault(@QueryValue("max") @Nullable Integer max);
+}
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/header/server/DogCountController.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/header/server/DogCountController.java
new file mode 100644
index 0000000000..de0f6788cf
--- /dev/null
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/header/server/DogCountController.java
@@ -0,0 +1,36 @@
+package com.baeldung.micronaut.apiversioning.header.server;
+
+import io.micronaut.core.annotation.NonNull;
+import io.micronaut.core.annotation.Nullable;
+import io.micronaut.core.version.annotation.Version;
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.QueryValue;
+import io.reactivex.rxjava3.core.Flowable;
+
+import java.util.stream.Stream;
+
+@Controller("/dog")
+public class DogCountController {
+
+    @Get(value = "/count", produces = {"application/json"})
+    @Version("1")
+    public Flowable<String> countV1(@QueryValue("max") @Nullable Integer max) {
+        return Flowable.fromStream(
+            Stream.iterate(0, i -> i + 1)
+                .map(index -> "Dog " + index)
+                .limit(max == null ? 10 : max)
+        );
+    }
+
+    @Get(value = "/count", produces = {"application/json"})
+    @Version("2")
+    public Flowable<String> countV2(@QueryValue("max") @NonNull Integer max) {
+        return Flowable.fromStream(
+                Stream.iterate(0, i -> i + 1)
+                        .map(index -> "Dog " + index)
+                        .limit(max)
+        );
+    }
+
+}
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/param/client/CatCountClient.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/param/client/CatCountClient.java
new file mode 100644
index 0000000000..2332ade98e
--- /dev/null
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/param/client/CatCountClient.java
@@ -0,0 +1,23 @@
+package com.baeldung.micronaut.apiversioning.param.client;
+
+import io.micronaut.core.annotation.Nullable;
+import io.micronaut.core.async.annotation.SingleResult;
+import io.micronaut.http.HttpHeaders;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.Header;
+import io.micronaut.http.annotation.QueryValue;
+import io.micronaut.http.client.annotation.Client;
+import io.reactivex.rxjava3.core.Flowable;
+
+@Client("/")
+@Header(name = HttpHeaders.ACCEPT, value = "application/json")
+public interface CatCountClient {
+
+    @Get(
+        uri = "/cat/count",
+        consumes = {"application/json"},
+        produces = {"application/json"}
+    )
+    @SingleResult
+    Flowable<String> count(@QueryValue("max") @Nullable Integer max, @QueryValue(value = "v", defaultValue = "1") @Nullable Integer version);
+}
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/param/server/CatCountController.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/param/server/CatCountController.java
new file mode 100644
index 0000000000..43a34a2272
--- /dev/null
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/param/server/CatCountController.java
@@ -0,0 +1,37 @@
+package com.baeldung.micronaut.apiversioning.param.server;
+
+import io.micronaut.core.annotation.NonNull;
+import io.micronaut.core.annotation.Nullable;
+import io.micronaut.core.version.annotation.Version;
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.QueryValue;
+import io.reactivex.rxjava3.core.Flowable;
+
+import java.util.stream.Stream;
+
+@Controller("/cat")
+public class CatCountController {
+
+    @Get(value = "/count", produces = {"application/json"})
+    @Version("1")
+    public Flowable<String> countV1(@QueryValue("max") @Nullable Integer max) {
+        return Flowable.fromStream(
+            Stream.iterate(0, i -> i + 1)
+                .map(index -> "Cat " + index)
+                .limit(max == null ? 10 : max)
+        );
+    }
+
+
+    @Get(value = "/count", produces = {"application/json"})
+    @Version("2")
+    public Flowable<String> countV2(@QueryValue("max") @NonNull Integer max) {
+        return Flowable.fromStream(
+                Stream.iterate(0, i -> i + 1)
+                        .map(index -> "Cat " + index)
+                        .limit(max)
+        );
+    }
+
+}
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/url/client/SheepCountClient.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/url/client/SheepCountClient.java
new file mode 100644
index 0000000000..cdb344b4e5
--- /dev/null
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/url/client/SheepCountClient.java
@@ -0,0 +1,39 @@
+package com.baeldung.micronaut.apiversioning.url.client;
+
+import io.micronaut.core.annotation.Nullable;
+import io.micronaut.core.async.annotation.SingleResult;
+import io.micronaut.http.HttpHeaders;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.Header;
+import io.micronaut.http.annotation.QueryValue;
+import io.micronaut.http.client.annotation.Client;
+import io.reactivex.rxjava3.core.Flowable;
+
+@Client("/")
+@Header(name = HttpHeaders.ACCEPT, value = "application/json")
+public interface SheepCountClient {
+
+    @Get(
+        uri = "/v1/sheep/count",
+        consumes = {"application/json"},
+        produces = {"application/json"}
+    )
+    @SingleResult
+    Flowable<String> countV1(@QueryValue("max") @Nullable Integer max);
+
+    @Get(
+        uri = "/v2/sheep/count",
+        consumes = {"application/json"},
+        produces = {"application/json"}
+    )
+    @SingleResult
+    Flowable<String> countV2(@QueryValue("max") @Nullable Integer max);
+
+    @Get(
+        uri = "/sheep/count",
+        consumes = {"application/json"},
+        produces = {"application/json"}
+    )
+    @SingleResult
+    Flowable<String> countDefault(@QueryValue("max")  @Nullable Integer max);
+}
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/url/server/SheepCountControllerV1.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/url/server/SheepCountControllerV1.java
new file mode 100644
index 0000000000..5ee6a2a57d
--- /dev/null
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/url/server/SheepCountControllerV1.java
@@ -0,0 +1,26 @@
+package com.baeldung.micronaut.apiversioning.url.server;
+
+import io.micronaut.core.annotation.Nullable;
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
+import io.reactivex.rxjava3.core.Flowable;
+
+import java.util.stream.Stream;
+
+@Controller("/v1/sheep/count")
+public class SheepCountControllerV1 {
+
+    @Get(
+        uri = "{?max}",
+        consumes = {"application/json"},
+        produces = {"application/json"}
+    )
+    Flowable<String> countV1(@Nullable Integer max) {
+        return Flowable.fromStream(
+            Stream.iterate(0, i -> i + 1)
+                .map(index -> "Sheep " + index)
+                .limit(max == null ? 10 : max)
+        );
+    }
+
+}
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/url/server/SheepCountControllerV2.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/url/server/SheepCountControllerV2.java
new file mode 100644
index 0000000000..d95f4a3cca
--- /dev/null
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/apiversioning/url/server/SheepCountControllerV2.java
@@ -0,0 +1,27 @@
+package com.baeldung.micronaut.apiversioning.url.server;
+
+import io.micronaut.core.annotation.NonNull;
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.QueryValue;
+import io.reactivex.rxjava3.core.Flowable;
+
+import java.util.stream.Stream;
+
+@Controller
+public class SheepCountControllerV2 {
+
+    @Get(
+        uris = {"/v2/sheep/count", "/sheep/count"},
+        consumes = {"application/json"},
+        produces = {"application/json"}
+    )
+    Flowable<String> countV2(@QueryValue("max") @NonNull Integer max) {
+        return Flowable.fromStream(
+            Stream.iterate(0, i -> i + 1)
+                    .map(index -> "Sheep " + index)
+                    .limit(max)
+        );
+    }
+
+}
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/client/ConcreteGreetingClient.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/client/ConcreteGreetingClient.java
index 96bc51f235..943b2f703e 100644
--- a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/client/ConcreteGreetingClient.java
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/client/ConcreteGreetingClient.java
@@ -1,28 +1,27 @@
 package com.baeldung.micronaut.helloworld.client;
 
 import io.micronaut.http.HttpRequest;
+import io.micronaut.http.client.HttpClient;
 import io.micronaut.http.client.annotation.Client;
-import io.micronaut.http.client.RxHttpClient;
-import io.reactivex.Single;
-
-import javax.inject.Singleton;
+import io.reactivex.rxjava3.core.Single;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class ConcreteGreetingClient
 {
-   private RxHttpClient httpClient;
+   private HttpClient httpClient;
 
-   public ConcreteGreetingClient(@Client("/") RxHttpClient httpClient) {
+   public ConcreteGreetingClient(@Client("/") HttpClient httpClient) {
       this.httpClient = httpClient;
    }
 
    public String greet(String name) {
       HttpRequest<String> req = HttpRequest.GET("/greet/" + name);
-      return httpClient.retrieve(req).blockingFirst();
+      return Single.fromPublisher(httpClient.retrieve(req)).blockingGet();
    }
 
    public Single<String> greetAsync(String name) {
       HttpRequest<String> req = HttpRequest.GET("/async/greet/" + name);
-      return httpClient.retrieve(req).first("An error as occurred");
+      return Single.fromPublisher(httpClient.retrieve(req));
    }
 }
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/controller/AsyncGreetController.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/controller/AsyncGreetController.java
index 4d86b9dfed..862a822573 100644
--- a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/controller/AsyncGreetController.java
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/controller/AsyncGreetController.java
@@ -3,9 +3,9 @@ package com.baeldung.micronaut.helloworld.server.controller;
 import com.baeldung.micronaut.helloworld.server.service.GreetingService;
 import io.micronaut.http.annotation.Controller;
 import io.micronaut.http.annotation.Get;
-import io.reactivex.Single;
 
-import javax.inject.Inject;
+import io.reactivex.rxjava3.core.Single;
+import jakarta.inject.Inject;
 
 @Controller("/async/greet")
 public class AsyncGreetController {
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/controller/GreetController.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/controller/GreetController.java
index c890c037e4..ba3b6197d8 100644
--- a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/controller/GreetController.java
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/controller/GreetController.java
@@ -7,7 +7,7 @@ import io.micronaut.http.annotation.Controller;
 import io.micronaut.http.annotation.Get;
 import io.micronaut.http.annotation.Post;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @Controller("/greet")
 public class GreetController {
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/EnglishGreetingService.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/EnglishGreetingService.java
index 8ea5172cf6..865ee0b639 100644
--- a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/EnglishGreetingService.java
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/EnglishGreetingService.java
@@ -2,7 +2,7 @@ package com.baeldung.micronaut.helloworld.server.service;
 
 import io.micronaut.context.annotation.Primary;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Primary
 @Singleton
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/SpanishGreetingService.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/SpanishGreetingService.java
index 1ec53d8b2d..e426c2911e 100644
--- a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/SpanishGreetingService.java
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/helloworld/server/service/SpanishGreetingService.java
@@ -1,6 +1,6 @@
 package com.baeldung.micronaut.helloworld.server.service;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class SpanishGreetingService implements GreetingService {
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/CompareApplication.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/CompareApplication.java
index 4654526b28..0fea9f970b 100644
--- a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/CompareApplication.java
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/CompareApplication.java
@@ -1,9 +1,11 @@
 package com.baeldung.micronaut.vs.springboot;
 
+
 import io.micronaut.runtime.Micronaut;
 
 public class CompareApplication {
+
     public static void main(String[] args) {
-        Micronaut.run(CompareApplication.class);
+        Micronaut.run(CompareApplication.class, args);
     }
-}
+}
\ No newline at end of file
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClientImpl.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClientImpl.java
index 6b7ae900be..95e3157bfe 100644
--- a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClientImpl.java
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClientImpl.java
@@ -1,46 +1,46 @@
 package com.baeldung.micronaut.vs.springboot.client;
 
-import javax.inject.Singleton;
-
 import io.micronaut.http.HttpRequest;
-import io.micronaut.http.client.RxHttpClient;
+import io.micronaut.http.client.HttpClient;
 import io.micronaut.http.client.annotation.Client;
+import io.reactivex.rxjava3.core.Single;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class ArithmeticClientImpl {
-    private RxHttpClient httpClient;
+    private HttpClient httpClient;
 
-    public ArithmeticClientImpl(@Client("/") RxHttpClient httpClient) {
+    public ArithmeticClientImpl(@Client("/") HttpClient httpClient) {
         this.httpClient = httpClient;
     }
 
     public String sum(float number1, float number2) {
         HttpRequest<String> req = HttpRequest.GET("/math/sum/" + number1 + "/" + number2);
-        return httpClient.retrieve(req)
-            .blockingFirst();
+        return Single.fromPublisher(httpClient.retrieve(req))
+            .blockingGet();
     }
 
     public String subtract(float number1, float number2) {
         HttpRequest<String> req = HttpRequest.GET("/math/subtract/" + number1 + "/" + number2);
-        return httpClient.retrieve(req)
-            .blockingFirst();
+        return Single.fromPublisher(httpClient.retrieve(req))
+            .blockingGet();
     }
 
     public String multiply(float number1, float number2) {
         HttpRequest<String> req = HttpRequest.GET("/math/multiply/" + number1 + "/" + number2);
-        return httpClient.retrieve(req)
-            .blockingFirst();
+        return Single.fromPublisher(httpClient.retrieve(req))
+                .blockingGet();
     }
 
     public String divide(float number1, float number2) {
         HttpRequest<String> req = HttpRequest.GET("/math/divide/" + number1 + "/" + number2);
-        return httpClient.retrieve(req)
-            .blockingFirst();
+        return Single.fromPublisher(httpClient.retrieve(req))
+                .blockingGet();
     }
 
     public String memory() {
         HttpRequest<String> req = HttpRequest.GET("/math/memory");
-        return httpClient.retrieve(req)
-            .blockingFirst();
+        return Single.fromPublisher(httpClient.retrieve(req))
+                .blockingGet();
     }
 }
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticController.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticController.java
index 5bc0e865e1..b774556ece 100644
--- a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticController.java
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticController.java
@@ -3,7 +3,7 @@ package com.baeldung.micronaut.vs.springboot.controller;
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.baeldung.micronaut.vs.springboot.service.ArithmeticService;
 
diff --git a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/service/ArithmeticService.java b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/service/ArithmeticService.java
index e0e4680495..599a6ee4cf 100644
--- a/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/service/ArithmeticService.java
+++ b/microservices-modules/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/service/ArithmeticService.java
@@ -1,6 +1,6 @@
 package com.baeldung.micronaut.vs.springboot.service;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class ArithmeticService {
diff --git a/microservices-modules/micronaut/src/main/resources/application.yml b/microservices-modules/micronaut/src/main/resources/application.yml
index 32daacd4aa..b265d245aa 100644
--- a/microservices-modules/micronaut/src/main/resources/application.yml
+++ b/microservices-modules/micronaut/src/main/resources/application.yml
@@ -1,5 +1,19 @@
+context-path: /
+
 micronaut:
-    application:
-        name: hello-world-server
-    server:
-        port: ${random.port}
\ No newline at end of file
+  router:
+    versioning:
+      enabled: true
+      default-version: 2
+      parameter:
+        enabled: true
+        names: 'v,api-version'
+      header:
+        enabled: true
+        names:
+          - 'X-API-VERSION'
+
+  application:
+    name: hello-world-server
+  server:
+    port: ${random.port}
diff --git a/microservices-modules/micronaut/src/main/resources/logback.xml b/microservices-modules/micronaut/src/main/resources/logback.xml
index afaebf8e17..4db42a7916 100644
--- a/microservices-modules/micronaut/src/main/resources/logback.xml
+++ b/microservices-modules/micronaut/src/main/resources/logback.xml
@@ -8,6 +8,12 @@
         </encoder>
     </appender>
 
+    <!-- Uncomment these lines to see the request logs  -->
+    <!--
+    <logger name="io.micronaut.http.client" level="TRACE" />
+    <logger name="io.micronaut.http.server" level="DEBUG" />
+    -->
+
     <root level="info">
         <appender-ref ref="STDOUT" />
     </root>
diff --git a/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/apiversioning/custom/client/BirdCountClientUnitTest.java b/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/apiversioning/custom/client/BirdCountClientUnitTest.java
new file mode 100644
index 0000000000..a3a547f9e2
--- /dev/null
+++ b/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/apiversioning/custom/client/BirdCountClientUnitTest.java
@@ -0,0 +1,42 @@
+package com.baeldung.micronaut.apiversioning.custom.client;
+
+import io.micronaut.context.annotation.Property;
+import io.micronaut.http.client.exceptions.HttpClientResponseException;
+import io.micronaut.runtime.EmbeddedApplication;
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import jakarta.inject.Inject;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+@MicronautTest
+@Property(name = "my.router.versioning.enabled", value = "true")
+class BirdCountClientUnitTest {
+
+    @Inject
+    private EmbeddedApplication<?> application;
+
+    @Inject
+    private BirdCountClient client;
+
+    @Test
+    void givenTheCountApi_whenUsingV1ViaCustomStrategy_shouldRouteToProperHandler() {
+       Assertions.assertEquals(10, client.countV1(null).blockingSingle().split(",").length);
+       Assertions.assertEquals(4, client.countV1(4).blockingSingle().split(",").length);
+    }
+
+    @Test
+    void givenTheCountApi_whenUsingV2ViaCustomStrategy_shouldRouteToProperHandler() {
+        Assertions.assertThrows(HttpClientResponseException.class,
+                () -> client.countV2(null).count().blockingGet());
+
+        Assertions.assertEquals(6, client.countV2(6).blockingSingle().split(",").length);
+    }
+
+    @Test
+    void givenTheCountApi_whenUsingDefaultVersionViaCustomStrategy_shouldRouteToProperHandler() {
+        Assertions.assertThrows(HttpClientResponseException.class,
+                () -> client.countDefault(null).count().blockingGet());
+
+        Assertions.assertEquals(6, client.countDefault(6).blockingSingle().split(",").length);
+    }
+}
\ No newline at end of file
diff --git a/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/apiversioning/header/client/DogCountClientUnitTest.java b/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/apiversioning/header/client/DogCountClientUnitTest.java
new file mode 100644
index 0000000000..4a47c76943
--- /dev/null
+++ b/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/apiversioning/header/client/DogCountClientUnitTest.java
@@ -0,0 +1,40 @@
+package com.baeldung.micronaut.apiversioning.header.client;
+
+import io.micronaut.http.client.exceptions.HttpClientResponseException;
+import io.micronaut.runtime.EmbeddedApplication;
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import jakarta.inject.Inject;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+@MicronautTest
+class DogCountClientUnitTest {
+
+    @Inject
+    private EmbeddedApplication<?> application;
+
+    @Inject
+    private DogCountClient dogCountClient;
+
+    @Test
+    void givenTheCountApi_whenUsingV1ViaHeaderStrategy_shouldRouteToProperHandler() {
+       Assertions.assertEquals(10, dogCountClient.countV1(null).blockingSingle().split(",").length);
+       Assertions.assertEquals(4, dogCountClient.countV1(4).blockingSingle().split(",").length);
+    }
+
+    @Test
+    void givenTheCountApi_whenUsingV2ViaHeaderStrategy_shouldRouteToProperHandler() {
+        Assertions.assertThrows(HttpClientResponseException.class,
+                () -> dogCountClient.countV2(null).count().blockingGet());
+
+        Assertions.assertEquals(6, dogCountClient.countV2(6).blockingSingle().split(",").length);
+    }
+
+    @Test
+    void givenTheCountApi_whenUsingDefaultVersionViaHeaderStrategy_shouldRouteToProperHandler() {
+        Assertions.assertThrows(HttpClientResponseException.class,
+                () -> dogCountClient.countDefault(null).count().blockingGet());
+
+        Assertions.assertEquals(6, dogCountClient.countDefault(6).blockingSingle().split(",").length);
+    }
+}
\ No newline at end of file
diff --git a/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/apiversioning/param/client/CatCountClientUnitTest.java b/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/apiversioning/param/client/CatCountClientUnitTest.java
new file mode 100644
index 0000000000..266f72eed8
--- /dev/null
+++ b/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/apiversioning/param/client/CatCountClientUnitTest.java
@@ -0,0 +1,38 @@
+package com.baeldung.micronaut.apiversioning.param.client;
+
+import io.micronaut.http.client.exceptions.HttpClientResponseException;
+import io.micronaut.runtime.EmbeddedApplication;
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import jakarta.inject.Inject;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+@MicronautTest
+class CatCountClientUnitTest {
+
+    @Inject
+    private EmbeddedApplication<?> application;
+
+    @Inject
+    private CatCountClient client;
+
+    @Test
+    void givenTheCountApi_whenUsingV1ViaParameterStrategy_shouldRouteToProperHandler() {
+       Assertions.assertEquals(10, client.count(null, 1).blockingSingle().split(",").length);
+       Assertions.assertEquals(5, client.count(5, 1).blockingSingle().split(",").length);
+    }
+
+    @Test
+    void givenTheCountApi_whenUsingV2ViaParameterStrategy_shouldRouteToProperHandler() {
+        Assertions.assertThrows(HttpClientResponseException.class,
+                () -> client.count(null, 2).count().blockingGet());
+
+        Assertions.assertEquals(6, client.count(6, 2).blockingSingle().split(",").length);
+    }
+
+    @Test
+    void givenTheCountApi_whenUsingDefaultVersionViaParameterStrategy_shouldRouteToProperHandler() {
+        Assertions.assertEquals(10, client.count(null, null).blockingSingle().split(",").length);
+        Assertions.assertEquals(6, client.count(6, null).blockingSingle().split(",").length);
+    }
+}
\ No newline at end of file
diff --git a/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/apiversioning/url/client/SheepCountClientUnitTest.java b/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/apiversioning/url/client/SheepCountClientUnitTest.java
new file mode 100644
index 0000000000..e082793fe1
--- /dev/null
+++ b/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/apiversioning/url/client/SheepCountClientUnitTest.java
@@ -0,0 +1,44 @@
+package com.baeldung.micronaut.apiversioning.url.client;
+
+import io.micronaut.http.client.exceptions.HttpClientResponseException;
+import io.micronaut.runtime.EmbeddedApplication;
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import jakarta.inject.Inject;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@MicronautTest
+class SheepCountClientUnitTest {
+
+    @Inject
+    private EmbeddedApplication<?> application;
+    @Inject
+    private SheepCountClient client;
+
+    @Test
+    void givenTheCountApi_whenUsingV1ViaUrlStrategy_shouldRouteToProperHandler() {
+        Assertions.assertEquals(10, client.countV1(null).blockingSingle().split(",").length);
+        Assertions.assertEquals(4, client.countV1(4).blockingSingle().split(",").length);
+    }
+
+    @Test
+    void givenTheCountApi_whenUsingV2ViaUrlStrategy_shouldRouteToProperHandler() {
+        Assertions.assertThrows(HttpClientResponseException.class,
+                () -> client.countV2(null).count().blockingGet());
+
+        final var actual = client.countV2(4).blockingSingle().split(",").length;
+        Assertions.assertEquals(4, actual);
+    }
+
+    @Test
+    void givenTheCountApi_whenUsingDefaultVersionViaUrlStrategy_shouldRouteToProperHandler() {
+        Assertions.assertThrows(HttpClientResponseException.class,
+                () -> client.countDefault(null).count().blockingGet());
+
+        final var actual = client.countDefault(4).blockingSingle().split(",").length;
+        Assertions.assertEquals(4, actual);
+    }
+}
\ No newline at end of file
diff --git a/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/helloworld/client/ConcreteGreetingClientUnitTest.java b/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/helloworld/client/ConcreteGreetingClientUnitTest.java
index 336374d5a6..88a9782074 100644
--- a/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/helloworld/client/ConcreteGreetingClientUnitTest.java
+++ b/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/helloworld/client/ConcreteGreetingClientUnitTest.java
@@ -1,31 +1,19 @@
 package com.baeldung.micronaut.helloworld.client;
 
-import io.micronaut.context.ApplicationContext;
-import io.micronaut.runtime.server.EmbeddedServer;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import io.micronaut.runtime.EmbeddedApplication;
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import jakarta.inject.Inject;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class ConcreteGreetingClientUnitTest
-{
-   private EmbeddedServer server;
+@MicronautTest
+public class ConcreteGreetingClientUnitTest {
+   @Inject
+   private EmbeddedApplication<?> application;
+   @Inject
    private ConcreteGreetingClient client;
 
-   @Before
-   public void setup()
-   {
-      server = ApplicationContext.run(EmbeddedServer.class);
-      client = server.getApplicationContext().getBean(ConcreteGreetingClient.class);
-   }
-
-   @After
-   public void cleanup()
-   {
-      server.stop();
-   }
-
    @Test
    public void testGreeting() {
       assertEquals(client.greet("Mike"), "Hello Mike");
diff --git a/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/helloworld/client/GreetingClientUnitTest.java b/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/helloworld/client/GreetingClientUnitTest.java
index c47fb3a31d..5b269531e7 100644
--- a/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/helloworld/client/GreetingClientUnitTest.java
+++ b/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/helloworld/client/GreetingClientUnitTest.java
@@ -1,30 +1,21 @@
 package com.baeldung.micronaut.helloworld.client;
 
-import io.micronaut.context.ApplicationContext;
-import io.micronaut.runtime.server.EmbeddedServer;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import io.micronaut.runtime.EmbeddedApplication;
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import jakarta.inject.Inject;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+@MicronautTest
 public class GreetingClientUnitTest {
-    private EmbeddedServer server;
+
+    @Inject
+    private EmbeddedApplication<?> application;
+
+    @Inject
     private GreetingClient client;
 
-    @Before
-    public void setup()
-    {
-        server = ApplicationContext.run(EmbeddedServer.class);
-        client = server.getApplicationContext().getBean(GreetingClient.class);
-    }
-
-    @After
-    public void cleanup()
-    {
-        server.stop();
-    }
-
     @Test
     public void testGreeting() {
         assertEquals(client.greet("Mike"), "Hello Mike");
diff --git a/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/vs/springboot/ArithmeticClientUnitTest.java b/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/vs/springboot/ArithmeticClientUnitTest.java
index 9a1b095d22..fa191778f5 100644
--- a/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/vs/springboot/ArithmeticClientUnitTest.java
+++ b/microservices-modules/micronaut/src/test/java/com/baeldung/micronaut/vs/springboot/ArithmeticClientUnitTest.java
@@ -1,34 +1,21 @@
 package com.baeldung.micronaut.vs.springboot;
 
-import static org.junit.Assert.assertEquals;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-
-import io.micronaut.context.ApplicationContext;
-import io.micronaut.runtime.server.EmbeddedServer;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
 import com.baeldung.micronaut.vs.springboot.client.ArithmeticClientImpl;
+import io.micronaut.runtime.EmbeddedApplication;
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import jakarta.inject.Inject;
+import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@MicronautTest
 public class ArithmeticClientUnitTest {
-    private EmbeddedServer server;
+    @Inject
+    private EmbeddedApplication<?> server;
+    @Inject
     private ArithmeticClientImpl client;
 
-    @Before
-    public void setup() {
-        server = ApplicationContext.run(EmbeddedServer.class);
-        client = server.getApplicationContext()
-            .getBean(ArithmeticClientImpl.class);
-    }
-
-    @After
-    public void cleanup() {
-        server.stop();
-    }
-
     @Test
     public void givenTwoNumbers_whenAdd_thenCorrectAnswerReturned() {
         String expected = Float.valueOf(10 + 20).toString();
@@ -56,6 +43,6 @@ public class ArithmeticClientUnitTest {
     @Test
     public void whenMemory_thenCorrectAnswerReturned() {
         String expected = "Initial:";
-        assertThat(client.memory(), containsString(expected));
+        assertThat(client.memory()).contains(expected);
     }
 }
diff --git a/parent-spring-6/pom.xml b/parent-spring-6/pom.xml
index 77afe2072a..7b28afc9b1 100644
--- a/parent-spring-6/pom.xml
+++ b/parent-spring-6/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>parent-spring-6</artifactId>
     <version>0.0.1-SNAPSHOT</version>
@@ -35,7 +35,7 @@
     </dependencies>
 
     <properties>
-        <spring.version>6.0.10</spring.version>
+        <spring.version>6.0.12</spring.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml
index ec02b0f37c..f35b22a19d 100644
--- a/persistence-modules/pom.xml
+++ b/persistence-modules/pom.xml
@@ -101,6 +101,7 @@
         <module>spring-data-shardingsphere</module>
         <!-- <module>spring-hibernate-3</module> FAILED -->
         <!-- <module>spring-hibernate-5</module> FAILED --> <!-- long running -->
+        <module>spring-hibernate-6</module>
         <module>spring-jpa</module>
         <module>spring-jpa-2</module>
         <module>spring-jdbc</module>
diff --git a/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/InsertIntegrationTest.java b/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/InsertIntegrationLiveTest.java
similarity index 96%
rename from persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/InsertIntegrationTest.java
rename to persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/InsertIntegrationLiveTest.java
index 244959d854..0e6cdae2b4 100644
--- a/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/InsertIntegrationTest.java
+++ b/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/InsertIntegrationLiveTest.java
@@ -10,7 +10,7 @@ import static com.rethinkdb.RethinkDB.r;
 /**
  * Some tests demonstrating inserting data.
  */
-public class InsertIntegrationTest extends TestBase {
+public class InsertIntegrationLiveTest extends TestBase {
     /**
      * Create a table for the tests.
      */
diff --git a/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/QueryIntegrationTest.java b/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/QueryIntegrationLiveTest.java
similarity index 97%
rename from persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/QueryIntegrationTest.java
rename to persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/QueryIntegrationLiveTest.java
index 263dda9bc6..626d15bcb6 100644
--- a/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/QueryIntegrationTest.java
+++ b/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/QueryIntegrationLiveTest.java
@@ -16,7 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 /**
  * Some tests demonstrating querying data.
  */
-public class QueryIntegrationTest extends TestBase {
+public class QueryIntegrationLiveTest extends TestBase {
     /**
      * Create a table for the tests.
      */
diff --git a/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/StreamingIntegrationTest.java b/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/StreamingIntegrationLiveTest.java
similarity index 98%
rename from persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/StreamingIntegrationTest.java
rename to persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/StreamingIntegrationLiveTest.java
index 4ca147cf68..bc105d2e4f 100644
--- a/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/StreamingIntegrationTest.java
+++ b/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/StreamingIntegrationLiveTest.java
@@ -13,7 +13,7 @@ import static com.rethinkdb.RethinkDB.r;
 /**
  * Some tests demonstrating streaming live changes to data.
  */
-public class StreamingIntegrationTest extends TestBase {
+public class StreamingIntegrationLiveTest extends TestBase {
     @Test
     public void getLiveInserts() throws InterruptedException {
         ExecutorService executorService = Executors.newCachedThreadPool();
diff --git a/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/TablesIntegrationTest.java b/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/TablesIntegrationLiveTest.java
similarity index 94%
rename from persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/TablesIntegrationTest.java
rename to persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/TablesIntegrationLiveTest.java
index d60e500373..7bffb189b3 100644
--- a/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/TablesIntegrationTest.java
+++ b/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/TablesIntegrationLiveTest.java
@@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 /**
  * Some tests demonstrating working with tables.
  */
-public class TablesIntegrationTest extends TestBase {
+public class TablesIntegrationLiveTest extends TestBase {
 
     @Test
     public void createTable() {
diff --git a/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/UpdateIntegrationTest.java b/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/UpdateIntegrationLiveTest.java
similarity index 96%
rename from persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/UpdateIntegrationTest.java
rename to persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/UpdateIntegrationLiveTest.java
index 39fad3a878..d47caa0b5e 100644
--- a/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/UpdateIntegrationTest.java
+++ b/persistence-modules/rethinkdb/src/test/java/com/baeldung/rethinkdb/UpdateIntegrationLiveTest.java
@@ -8,7 +8,7 @@ import static com.rethinkdb.RethinkDB.r;
 /**
  * Some tests demonstrating updating data.
  */
-public class UpdateIntegrationTest extends TestBase {
+public class UpdateIntegrationLiveTest extends TestBase {
     /**
      * Create a table for the tests.
      */
diff --git a/persistence-modules/spring-boot-persistence-mongodb-3/pom.xml b/persistence-modules/spring-boot-persistence-mongodb-3/pom.xml
index c48525673a..3f144bae54 100644
--- a/persistence-modules/spring-boot-persistence-mongodb-3/pom.xml
+++ b/persistence-modules/spring-boot-persistence-mongodb-3/pom.xml
@@ -9,27 +9,12 @@
 
     <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>
-        <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>
@@ -37,16 +22,6 @@
         <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>
@@ -57,12 +32,13 @@
             <groupId>de.flapdoodle.embed</groupId>
             <artifactId>de.flapdoodle.embed.mongo</artifactId>
             <scope>test</scope>
+            <version>${de.flapdoodle.embed.mongo.version}</version>
         </dependency>
     </dependencies>
 
     <properties>
-        <mongodb-crypt.version>1.7.3</mongodb-crypt.version>
-        <mongodb-driver.version>4.9.1</mongodb-driver.version>
+        <start-class>com.baeldung.boot.atlassearch.MongoDbAtlasSearchApplication</start-class>
+        <mongodb-crypt.version>1.8.0</mongodb-crypt.version>
+        <de.flapdoodle.embed.mongo.version>4.9.2</de.flapdoodle.embed.mongo.version>
     </properties>
-
 </project>
diff --git a/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/atlassearch/MongoDbAtlasSearchApplication.java b/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/atlassearch/MongoDbAtlasSearchApplication.java
new file mode 100644
index 0000000000..afaf524829
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/atlassearch/MongoDbAtlasSearchApplication.java
@@ -0,0 +1,12 @@
+package com.baeldung.boot.atlassearch;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class MongoDbAtlasSearchApplication {
+
+    public static void main(String... args) {
+        SpringApplication.run(MongoDbAtlasSearchApplication.class, args);
+    }
+}
diff --git a/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/atlassearch/config/IndexConfig.java b/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/atlassearch/config/IndexConfig.java
new file mode 100644
index 0000000000..cb4fae89e4
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/atlassearch/config/IndexConfig.java
@@ -0,0 +1,22 @@
+package com.baeldung.boot.atlassearch.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class IndexConfig {
+
+    @Value("${com.baeldung.atlas-search.index.query}")
+    private String queryIndex;
+
+    @Value("${com.baeldung.atlas-search.index.facet}")
+    private String facetIndex;
+
+    public String getFacetIndex() {
+        return facetIndex;
+    }
+
+    public String getQueryIndex() {
+        return queryIndex;
+    }
+}
diff --git a/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/atlassearch/service/MovieAtlasSearchService.java b/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/atlassearch/service/MovieAtlasSearchService.java
new file mode 100644
index 0000000000..55d47759d5
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/atlassearch/service/MovieAtlasSearchService.java
@@ -0,0 +1,183 @@
+package com.baeldung.boot.atlassearch.service;
+
+import static com.mongodb.client.model.Aggregates.facet;
+import static com.mongodb.client.model.Aggregates.limit;
+import static com.mongodb.client.model.Aggregates.project;
+import static com.mongodb.client.model.Aggregates.replaceWith;
+import static com.mongodb.client.model.Aggregates.search;
+import static com.mongodb.client.model.Aggregates.searchMeta;
+import static com.mongodb.client.model.Aggregates.skip;
+import static com.mongodb.client.model.Projections.excludeId;
+import static com.mongodb.client.model.Projections.fields;
+import static com.mongodb.client.model.Projections.include;
+import static com.mongodb.client.model.Projections.metaSearchScore;
+import static com.mongodb.client.model.search.SearchCount.total;
+import static com.mongodb.client.model.search.SearchFacet.combineToBson;
+import static com.mongodb.client.model.search.SearchFacet.numberFacet;
+import static com.mongodb.client.model.search.SearchFacet.stringFacet;
+import static com.mongodb.client.model.search.SearchOperator.compound;
+import static com.mongodb.client.model.search.SearchOperator.numberRange;
+import static com.mongodb.client.model.search.SearchOperator.of;
+import static com.mongodb.client.model.search.SearchOperator.text;
+import static com.mongodb.client.model.search.SearchOptions.searchOptions;
+import static com.mongodb.client.model.search.SearchPath.fieldPath;
+import static java.util.Arrays.asList;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.logging.log4j.LogManager;
+import org.bson.Document;
+import org.bson.conversions.Bson;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.stereotype.Service;
+
+import com.baeldung.boot.atlassearch.config.IndexConfig;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.model.Facet;
+import com.mongodb.client.model.search.SearchScore;
+
+@Service
+public class MovieAtlasSearchService {
+
+    @Autowired
+    private IndexConfig config;
+
+    private final MongoCollection<Document> collection;
+
+    public MovieAtlasSearchService(MongoTemplate mongoTemplate) {
+        MongoDatabase database = mongoTemplate.getDb();
+        this.collection = database.getCollection("movies");
+    }
+
+    public static void debug(List<Bson> pipeline) {
+        StringBuilder builder = new StringBuilder("[");
+        final AtomicBoolean first = new AtomicBoolean(true);
+        pipeline.forEach(stage -> {
+            builder.append((first.get() ? "" : ",") 
+                + stage.toBsonDocument()
+            );
+
+            first.set(false);
+        });
+        builder.append("]");
+
+        LogManager.getLogger(MovieAtlasSearchService.class)
+            .debug(builder.toString());
+    }
+
+    public Document late90sMovies(int skip, int limit, String keywords, SearchScore modifier) {
+        List<Bson> pipeline = asList(
+            search(
+              compound()
+                .must(asList(
+                  numberRange(
+                    fieldPath("year"))
+                    .gteLt(1995, 2000)
+                ))
+                .should(asList(
+                  text(
+                    fieldPath("fullplot"), keywords
+                  )
+                  .score(modifier)
+                )),
+              searchOptions()
+                .index(config.getQueryIndex())
+            ),
+            project(fields(
+              excludeId(),
+              include("title", "year", "fullplot", "imdb.rating"),
+              metaSearchScore("score")
+            )),
+            facet(
+              new Facet("rows", 
+                skip(skip), 
+                limit(limit)
+              ),
+              new Facet("totalRows",
+                replaceWith("$$SEARCH_META"),
+                limit(1)
+              )
+            )
+        );
+
+        debug(pipeline);
+        return collection.aggregate(pipeline)
+          .first();
+    }
+    
+    public Document countLate90sMovies(String keywords) {
+        List<Bson> pipeline = asList(
+            searchMeta(
+              compound()
+                .must(asList(
+                  numberRange(
+                    fieldPath("year"))
+                    .gteLt(1995, 2000),
+                  text(
+                    fieldPath("fullplot"), keywords
+                  )
+                )),
+              searchOptions()
+                .index(config.getQueryIndex())
+                .count(total())
+            )
+        );
+
+        debug(pipeline);
+        return collection.aggregate(pipeline)
+            .first();
+    }
+    
+    public Collection<Document> moviesByKeywords(String keywords) {
+        List<Bson> pipeline = asList(
+            search(
+              text(
+                fieldPath("fullplot"), keywords
+              ),
+              searchOptions()
+                .index(config.getQueryIndex())
+            ),
+            project(fields(
+              excludeId(),
+              include("title", "year", "fullplot", "imdb.rating")
+            ))
+        );
+
+        debug(pipeline);
+        return collection.aggregate(pipeline)
+            .into(new ArrayList<Document>());
+    }
+
+    public Document genresThroughTheDecades(String genre) {
+        List<Bson> pipeline = asList(
+            searchMeta(of(
+              new Document("facet",
+                new Document("operator",
+                  text(
+                    fieldPath("genres"), genre
+                  )
+                ).append("facets", combineToBson(asList(
+                  stringFacet("genresFacet",
+                    fieldPath("genres")
+                  ).numBuckets(5),
+                  numberFacet("yearFacet",
+                    fieldPath("year"),
+                    asList(1900, 1930, 1960, 1990, 2020)
+                  )
+                )))
+              )),
+              searchOptions()
+                .index(config.getFacetIndex())
+          )
+        );
+        
+        debug(pipeline);
+        return collection.aggregate(pipeline)
+            .first();
+    }
+}
diff --git a/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/atlassearch/web/MovieAtlasSearchController.java b/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/atlassearch/web/MovieAtlasSearchController.java
new file mode 100644
index 0000000000..4c41915347
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb-3/src/main/java/com/baeldung/boot/atlassearch/web/MovieAtlasSearchController.java
@@ -0,0 +1,48 @@
+package com.baeldung.boot.atlassearch.web;
+
+import java.util.Collection;
+
+import org.bson.Document;
+import org.springframework.beans.factory.annotation.Autowired;
+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 com.baeldung.boot.atlassearch.service.MovieAtlasSearchService;
+import com.mongodb.client.model.search.SearchScore;
+
+@RestController
+@RequestMapping("/movies")
+public class MovieAtlasSearchController {
+
+    @Autowired
+    private MovieAtlasSearchService service;
+
+    @GetMapping("with/{keywords}")
+    Collection<Document> getMoviesWithKeywords(@PathVariable String keywords) {
+        return service.moviesByKeywords(keywords);
+    }
+
+    @GetMapping("90s/with/{keywords}/count")
+    Document getCount90sMoviesWithKeywords(@PathVariable String keywords) {
+        return service.countLate90sMovies(keywords);
+    }
+
+    @GetMapping("90s/{skip}/{limit}/with/{keywords}")
+    Document getMoviesUsingScoreBoost(@PathVariable int skip, @PathVariable int limit, @PathVariable String keywords) {
+        return service.late90sMovies(skip, limit, keywords, SearchScore.boost(2));
+    }
+
+    @PostMapping("90s/{skip}/{limit}/with/{keywords}")
+    Document getMoviesUsingScoringFunction(@RequestBody String jsonFunction, @PathVariable int skip, @PathVariable int limit, @PathVariable String keywords) {
+        return service.late90sMovies(skip, limit, keywords, SearchScore.of(new Document("function", Document.parse(jsonFunction))));
+    }
+
+    @GetMapping("by-genre/{genre}")
+    Document getMoviesWithFacets(@PathVariable String genre) {
+        return service.genresThroughTheDecades(genre);
+    }
+}
diff --git a/persistence-modules/spring-boot-persistence-mongodb-3/src/main/resources/application.properties b/persistence-modules/spring-boot-persistence-mongodb-3/src/main/resources/application.properties
index 8309c4461f..02ba79e336 100644
--- a/persistence-modules/spring-boot-persistence-mongodb-3/src/main/resources/application.properties
+++ b/persistence-modules/spring-boot-persistence-mongodb-3/src/main/resources/application.properties
@@ -1 +1,4 @@
 spring.application.name=spring-boot-persistence-mongodb-3
+
+com.baeldung.atlas-search.index.query=idx-queries
+com.baeldung.atlas-search.index.facet=idx-facets
\ No newline at end of file
diff --git a/persistence-modules/spring-boot-persistence-mongodb-3/src/test/java/com/baeldung/boot/atlassearch/MovieAtlasSearchServiceLiveTest.java b/persistence-modules/spring-boot-persistence-mongodb-3/src/test/java/com/baeldung/boot/atlassearch/MovieAtlasSearchServiceLiveTest.java
new file mode 100644
index 0000000000..190ebc19d9
--- /dev/null
+++ b/persistence-modules/spring-boot-persistence-mongodb-3/src/test/java/com/baeldung/boot/atlassearch/MovieAtlasSearchServiceLiveTest.java
@@ -0,0 +1,67 @@
+package com.baeldung.boot.atlassearch;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.bson.Document;
+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.annotation.DirtiesContext;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.boot.atlassearch.service.MovieAtlasSearchService;
+import com.mongodb.client.model.search.SearchScore;
+
+@DirtiesContext
+@RunWith(SpringRunner.class)
+@TestPropertySource("/embedded.properties")
+@SpringBootTest(classes = MongoDbAtlasSearchApplication.class)
+public class MovieAtlasSearchServiceLiveTest {
+
+    @Autowired
+    private MovieAtlasSearchService service;
+
+    @Test
+    public void givenScoreBoost_thenFirstItemContainsPlot() {
+        final String plot = "space";
+
+        Document movies = service.late90sMovies(0, 1, plot, SearchScore.boost(2));
+
+        assertTrue(movies.getList("rows", Document.class)
+            .iterator()
+            .next()
+            .getString("fullplot")
+            .contains(plot));
+    }
+
+    @Test
+    public void givenFacetOperator_thenCorrespondingBucketsReturned() {
+        final String genre = "Sci-Fi";
+
+        Document meta = service.genresThroughTheDecades(genre);
+
+        Long lowerBound = meta
+            .get("count", Document.class)
+            .getLong("lowerBound");
+
+        Document genresFacetFirstBucket = meta.get("facet", Document.class)
+            .get("genresFacet", Document.class)
+            .getList("buckets", Document.class)
+            .iterator()
+            .next();
+
+        Document yearFacetFirstBucket = meta.get("facet", Document.class)
+            .get("yearFacet", Document.class)
+            .getList("buckets", Document.class)
+            .iterator()
+            .next();
+
+        assertEquals(lowerBound, genresFacetFirstBucket.getLong("count"));
+        assertEquals(genre, genresFacetFirstBucket.getString("_id"));
+        assertNotNull(yearFacetFirstBucket);
+    }
+}
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 cd1c1d43c7..f47eca5023 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,4 +1,4 @@
-spring.mongodb.embedded.version=4.4.9
+spring.mongodb.embedded.version=4.9.2
 
 #spring.data.mongodb.uri=changeit
 #spring.data.mongodb.database=changeit
diff --git a/persistence-modules/spring-data-cassandra-2/README.md b/persistence-modules/spring-data-cassandra-2/README.md
index 3f49d6ae93..0578dcc429 100644
--- a/persistence-modules/spring-data-cassandra-2/README.md
+++ b/persistence-modules/spring-data-cassandra-2/README.md
@@ -2,3 +2,4 @@
 
 - [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)
+- [Query With IN Clause in Spring Data Cassandra](https://www.baeldung.com/spring-cassandra-query-in-clause)
diff --git a/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/cassandra/inquery/ProductRepositoryNestedLiveTest.java b/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/cassandra/inquery/ProductRepositoryNestedLiveTest.java
index 3d2433814e..3592c8b80d 100644
--- a/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/cassandra/inquery/ProductRepositoryNestedLiveTest.java
+++ b/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/cassandra/inquery/ProductRepositoryNestedLiveTest.java
@@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 @Testcontainers
 @SpringBootTest
-class ProductRepositoryIntegrationTest {
+class ProductRepositoryNestedLiveTest {
 
     private static final String KEYSPACE_NAME = "mynamespace";
 
diff --git a/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/objectmapper/MapperLiveTest.java b/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/objectmapper/MapperLiveTest.java
index b61663d622..50681d36c5 100644
--- a/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/objectmapper/MapperLiveTest.java
+++ b/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/objectmapper/MapperLiveTest.java
@@ -1,7 +1,8 @@
 package org.baeldung.objectmapper;
 
-import com.datastax.oss.driver.api.core.CqlIdentifier;
-import com.datastax.oss.driver.api.core.CqlSession;
+import java.net.InetSocketAddress;
+import java.util.List;
+
 import org.baeldung.objectmapper.dao.CounterDao;
 import org.baeldung.objectmapper.dao.UserDao;
 import org.baeldung.objectmapper.entity.Counter;
@@ -14,7 +15,8 @@ import org.testcontainers.containers.CassandraContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
-import java.util.List;
+import com.datastax.oss.driver.api.core.CqlIdentifier;
+import com.datastax.oss.driver.api.core.CqlSession;
 
 @Testcontainers
 @SpringBootTest
@@ -23,35 +25,30 @@ public class MapperLiveTest {
     private static final String KEYSPACE_NAME = "baeldung";
 
     @Container
-    private static final CassandraContainer cassandra = (CassandraContainer) new CassandraContainer("cassandra:3.11.2")
-            .withExposedPorts(9042);
+    private static final CassandraContainer cassandra = (CassandraContainer) new CassandraContainer("cassandra:3.11.2").withExposedPorts(9042);
 
+    @BeforeAll
     static void setupCassandraConnectionProperties() {
         System.setProperty("spring.data.cassandra.keyspace-name", KEYSPACE_NAME);
-        System.setProperty("spring.data.cassandra.contact-points", cassandra.getContainerIpAddress());
+        System.setProperty("spring.data.cassandra.contact-points", cassandra.getHost());
         System.setProperty("spring.data.cassandra.port", String.valueOf(cassandra.getMappedPort(9042)));
+        setupCassandra(new InetSocketAddress(cassandra.getHost(), cassandra.getMappedPort(9042)), cassandra.getLocalDatacenter());
     }
 
     static UserDao userDao;
     static CounterDao counterDao;
 
-    @BeforeAll
-    static void setup() {
-        setupCassandraConnectionProperties();
-        CqlSession session = CqlSession.builder().build();
+    static void setupCassandra(InetSocketAddress cassandraEndpoint, String localDataCenter) {
+        CqlSession session = CqlSession.builder()
+            .withLocalDatacenter(localDataCenter)
+            .addContactPoint(cassandraEndpoint)
+            .build();
 
-        String createKeyspace = "CREATE KEYSPACE IF NOT EXISTS baeldung " +
-                "WITH replication = {'class':'SimpleStrategy', 'replication_factor':1};";
+        String createKeyspace = "CREATE KEYSPACE IF NOT EXISTS baeldung " + "WITH replication = {'class':'SimpleStrategy', 'replication_factor':1};";
         String useKeyspace = "USE baeldung;";
-        String createUserTable = "CREATE TABLE IF NOT EXISTS user_profile " +
-                "(id int, username text, user_age int, writetime bigint, PRIMARY KEY (id, user_age)) " +
-                "WITH CLUSTERING ORDER BY (user_age DESC);";
-        String createAdminTable = "CREATE TABLE IF NOT EXISTS admin_profile " +
-                "(id int, username text, user_age int, role text, writetime bigint, department text, " +
-                "PRIMARY KEY (id, user_age)) " +
-                "WITH CLUSTERING ORDER BY (user_age DESC);";
-        String createCounter = "CREATE TABLE IF NOT EXISTS counter " +
-                "(id text, count counter, PRIMARY KEY (id));";
+        String createUserTable = "CREATE TABLE IF NOT EXISTS user_profile " + "(id int, username text, user_age int, writetime bigint, PRIMARY KEY (id, user_age)) " + "WITH CLUSTERING ORDER BY (user_age DESC);";
+        String createAdminTable = "CREATE TABLE IF NOT EXISTS admin_profile " + "(id int, username text, user_age int, role text, writetime bigint, department text, " + "PRIMARY KEY (id, user_age)) " + "WITH CLUSTERING ORDER BY (user_age DESC);";
+        String createCounter = "CREATE TABLE IF NOT EXISTS counter " + "(id text, count counter, PRIMARY KEY (id));";
 
         session.execute(createKeyspace);
         session.execute(useKeyspace);
@@ -75,22 +72,25 @@ public class MapperLiveTest {
     @Test
     void givenCounter_whenIncrement_thenIncremented() {
         Counter users = counterDao.getCounterById("users");
-        long initialCount = users != null ? users.getCount(): 0;
+        long initialCount = users != null ? users.getCount() : 0;
 
         counterDao.incrementCounter("users", 1);
 
         users = counterDao.getCounterById("users");
-        long finalCount = users != null ? users.getCount(): 0;
+        long finalCount = users != null ? users.getCount() : 0;
 
         Assertions.assertEquals(finalCount - initialCount, 1);
     }
 
     @Test
     void givenUser_whenGetUsersOlderThan_thenRetrieved() {
-        User user = new User(2, "JaneDoe", 20);
+        User user = new User(2, "JaneDoe", 32);
+        User userTwo = new User(3, "JohnDoe", 20);
         userDao.insertUser(user);
-        List<User> retrievedUsers = userDao.getUsersOlderThanAge(30).all();
-        Assertions.assertEquals(retrievedUsers.size(), 1);
+        userDao.insertUser(userTwo);
+        List<User> retrievedUsers = userDao.getUsersOlderThanAge(30)
+            .all();
+        Assertions.assertEquals(1, retrievedUsers.size());
     }
 
 }
\ No newline at end of file
diff --git a/persistence-modules/spring-data-couchbase-2/src/test/docker/Dockerfile b/persistence-modules/spring-data-couchbase-2/src/test/docker/Dockerfile
new file mode 100644
index 0000000000..1dffcb31f1
--- /dev/null
+++ b/persistence-modules/spring-data-couchbase-2/src/test/docker/Dockerfile
@@ -0,0 +1,4 @@
+FROM couchbase/server:community-5.0.1
+
+COPY configure.sh /configure.sh
+CMD ["/configure.sh"]
\ No newline at end of file
diff --git a/persistence-modules/spring-data-couchbase-2/src/test/docker/configure.sh b/persistence-modules/spring-data-couchbase-2/src/test/docker/configure.sh
new file mode 100644
index 0000000000..c2b62dba7c
--- /dev/null
+++ b/persistence-modules/spring-data-couchbase-2/src/test/docker/configure.sh
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+function retry() {
+    for i in $(seq 1 10); do
+        $1 "$2"
+	if [[ $? == 0 ]]; then
+	    return 0
+	fi
+	sleep 1
+    done
+    return 1
+}
+
+function bucketCreate(){
+    couchbase-cli bucket-create -c localhost -u Administrator -p password \
+        --bucket="$1" \
+        --bucket-type=couchbase \
+        --bucket-ramsize=512 \
+        --bucket-replica=1 \
+        --wait
+    if [[ $? != 0 ]]; then
+        return 1
+    fi
+}
+
+function userCreate(){
+    createOutput=$(couchbase-cli user-manage -c localhost -u Administrator -p password \
+     --set --rbac-username "$1" --rbac-password "$1" \
+     --roles admin --auth-domain local)
+    if [[ $? != 0 ]]; then
+        echo $createOutput >&2
+        return 1
+    fi
+}
+
+function clusterUp(){
+    # wait for service to come up
+    until $(curl --output /dev/null --silent --head --fail http://localhost:8091); do
+        printf '.'
+        sleep 1
+    done
+
+    # initialize cluster
+    initOutput=$(couchbase-cli cluster-init -c localhost \
+            --cluster-username=Administrator \
+            --cluster-password=password \
+            --cluster-port=8091 \
+            --services=data,index,query,fts \
+            --cluster-ramsize=1024 \
+            --cluster-index-ramsize=256 \
+            --cluster-fts-ramsize=256 \
+            --index-storage-setting=default)
+    if [[ $? != 0 ]]; then
+        echo $initOutput >&2
+        return 1
+    fi
+}
+
+function main(){
+    set -ex
+    echo "Couchbase UI :8091"
+    echo "Couchbase logs /opt/couchbase/var/lib/couchbase/logs"
+    ./entrypoint.sh couchbase-server &
+    if [[ $? != 0 ]]; then
+        echo "Couchbase startup failed. Exiting." >&2
+        exit 1
+    fi
+
+    clusterUp
+    if [[ $? != 0 ]]; then
+        echo "Cluster init failed. Exiting." >&2
+        exit 1
+    fi
+
+    retry userCreate baeldung
+    if [[ $? != 0 ]]; then
+        echo "User create failed. Exiting." >&2
+        exit 1
+    fi
+
+    retry userCreate baeldung2
+    if [[ $? != 0 ]]; then
+        echo "User create failed. Exiting." >&2
+        exit 1
+    fi
+
+    retry bucketCreate baeldung
+    if [[ $? != 0 ]]; then
+        echo "Bucket create failed. Exiting." >&2
+        exit 1
+    fi
+
+    retry bucketCreate baeldung2
+    if [[ $? != 0 ]]; then
+        echo "Bucket create failed. Exiting." >&2
+        exit 1
+    fi
+
+    set +ex
+
+    # entrypoint.sh launches the server but since config.sh is pid 1 we keep it
+    # running so that the docker container does not exit.
+    wait
+}
+
+main
\ No newline at end of file
diff --git a/persistence-modules/spring-data-couchbase-2/src/test/docker/dockerbuild.sh b/persistence-modules/spring-data-couchbase-2/src/test/docker/dockerbuild.sh
new file mode 100644
index 0000000000..37add165c6
--- /dev/null
+++ b/persistence-modules/spring-data-couchbase-2/src/test/docker/dockerbuild.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# setup
+set -ex
+docker rm couchbase_container -f
+
+# main
+docker build -t couchbase_image .
+
+# cleanup
+set +ex
+
+# run
+docker run -d --name couchbase_container -p 8091-8096:8091-8096 -p 11210-11211:11210-11211 couchbase_image
diff --git a/persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/SpringContextLiveTest.java b/persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/SpringContextLiveTest.java
index 553520e6e6..74dccbadd0 100644
--- a/persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/SpringContextLiveTest.java
+++ b/persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/SpringContextLiveTest.java
@@ -12,16 +12,10 @@ import org.springframework.test.context.support.DependencyInjectionTestExecution
 /**
  * This LiveTest requires:
  * 
- * 1- Couchbase instance running (e.g. with `docker run -d --name db -p 8091-8096:8091-8096 -p 11210-11211:11210-11211 couchbase`)
- * 
- * 
- * 2- Couchbase configured with (we can use the console in localhost:8091):
- * 
- * 2.1- Buckets: named 'baeldung' and 'baeldung2'
- * 
- * 2.2- Security: users 'baeldung' and 'baeldung2'. Note: in newer versions an empty password is not allowed, then we have to change the passwords in the project)
- * 
- * 2.3- Spacial View: Add new spacial view (in Index tab) in document 'campus_spatial', view 'byLocation' with the following function:
+ * 1- Couchbase 5 instance Running and Configured.
+ * It's enough to execute the "dockerbuild.sh" script in the test/docker folder.
+ *
+ * 2.1- Spacial View: Add new spacial view (in Index tab) in document 'campus_spatial', view 'byLocation' with the following function:
  * {@code
  * function (doc) {
  *     if (doc.location &&
@@ -30,8 +24,9 @@ import org.springframework.test.context.support.DependencyInjectionTestExecution
  *   }
  * }}
  * 
- * 2.4- MapReduce Views: Add new views in document 'campus':
- * 2.4.1- view 'all' with function:
+ * 2.2- MapReduce Views: Add new views in document 'campus':
+ *
+ * 2.2.1- view 'all' with function:
  * {@code
  * function (doc, meta) {
  *     if(doc._class == "com.baeldung.spring.data.couchbase.model.Campus") {
@@ -39,7 +34,7 @@ import org.springframework.test.context.support.DependencyInjectionTestExecution
  *     }
  * }}
  *
- * 2.4.2- view 'byName' with function:
+ * 2.2.2- view 'byName' with function:
  * {@code
  * function (doc, meta) {
  *     if(doc._class == "com.baeldung.spring.data.couchbase.model.Campus" &&
diff --git a/persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase/CustomTypeKeyCouchbaseConfig.java b/persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase/CustomTypeKeyCouchbaseConfig.java
deleted file mode 100644
index eacecb4e1e..0000000000
--- a/persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase/CustomTypeKeyCouchbaseConfig.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.baeldung.spring.data.couchbase;
-
-import org.springframework.data.couchbase.core.convert.MappingCouchbaseConverter;
-
-public class CustomTypeKeyCouchbaseConfig extends MyCouchbaseConfig {
-
-    @Override
-    public String getConnectionString() {
-        return NODE_LIST;
-    }
-
-    @Override
-    public String getUserName() {
-        return BUCKET_USERNAME;
-    }
-
-    @Override
-    public String getPassword() {
-        return BUCKET_PASSWORD;
-    }
-
-    @Override
-    public String typeKey() {
-        return MappingCouchbaseConverter.TYPEKEY_SYNCGATEWAY_COMPATIBLE;
-    }
-}
diff --git a/persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase/ReadYourOwnWritesCouchbaseConfig.java b/persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase/ReadYourOwnWritesCouchbaseConfig.java
deleted file mode 100644
index 33a6c4f091..0000000000
--- a/persistence-modules/spring-data-couchbase-2/src/test/java/com/baeldung/spring/data/couchbase/ReadYourOwnWritesCouchbaseConfig.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.baeldung.spring.data.couchbase;
-
-import com.couchbase.client.java.query.QueryScanConsistency;
-
-public class ReadYourOwnWritesCouchbaseConfig extends MyCouchbaseConfig {
-
-    @Override
-    public QueryScanConsistency getDefaultConsistency() {
-        return QueryScanConsistency.REQUEST_PLUS;
-    }
-}
diff --git a/persistence-modules/spring-data-mongodb/pom.xml b/persistence-modules/spring-data-mongodb/pom.xml
index 87cf1acaf8..a59fcff3d9 100644
--- a/persistence-modules/spring-data-mongodb/pom.xml
+++ b/persistence-modules/spring-data-mongodb/pom.xml
@@ -8,31 +8,19 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-spring-5</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-spring-5</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-mongodb</artifactId>
-            <version>${org.springframework.data.version}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongodb-driver-sync</artifactId>
-            <version>${mongodb-driver.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongodb-driver-reactivestreams</artifactId>
-            <version>${mongodb-reactivestreams.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.projectreactor</groupId>
-            <artifactId>reactor-core</artifactId>
-            <version>${projectreactor.version}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb-reactive</artifactId>
         </dependency>
         <dependency>
             <groupId>io.projectreactor</groupId>
@@ -40,23 +28,6 @@
             <version>${projectreactor.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.querydsl</groupId>
             <artifactId>querydsl-mongodb</artifactId>
@@ -103,12 +74,9 @@
     </build>
 
     <properties>
-        <org.springframework.data.version>3.4.7</org.springframework.data.version>
         <querydsl.version>5.0.0</querydsl.version>
         <mysema.maven.version>1.1.3</mysema.maven.version>
-        <mongodb-reactivestreams.version>4.1.0</mongodb-reactivestreams.version>
         <projectreactor.version>3.5.4</projectreactor.version>
-        <mongodb-driver.version>4.6.1</mongodb-driver.version>
         <embed.mongo.version>4.6.3</embed.mongo.version>
     </properties>
 
diff --git a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionTemplateLiveTest.java b/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionTemplateLiveTest.java
index 53b2c7a0e7..a53dfc6663 100644
--- a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionTemplateLiveTest.java
+++ b/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionTemplateLiveTest.java
@@ -28,6 +28,7 @@ import com.baeldung.model.User;
  * 
  * This test requires:
  * * mongodb instance running on the environment
+ *   Run the src/live-test/resources/live-test-setup.sh
  *
  */
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionalLiveTest.java b/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionalLiveTest.java
index d92296beab..adc31ffea2 100644
--- a/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionalLiveTest.java
+++ b/persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionalLiveTest.java
@@ -26,6 +26,7 @@ import com.baeldung.repository.UserRepository;
  * 
  * This test requires:
  * * mongodb instance running on the environment
+ *   Run the src/live-test/resources/live-test-setup.sh
  *
  */
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/persistence-modules/spring-data-shardingsphere/src/test/java/com/baeldung/shardingsphere/OrderServiceManualTest.java b/persistence-modules/spring-data-shardingsphere/src/test/java/com/baeldung/shardingsphere/OrderServiceManualTest.java
new file mode 100644
index 0000000000..895dd52afb
--- /dev/null
+++ b/persistence-modules/spring-data-shardingsphere/src/test/java/com/baeldung/shardingsphere/OrderServiceManualTest.java
@@ -0,0 +1,90 @@
+package com.baeldung.shardingsphere;
+
+import org.assertj.core.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.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.testcontainers.containers.MySQLContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.time.LocalDate;
+import java.util.List;
+
+
+/**
+ * This Manual test requires: Docker service running.
+ */
+@Testcontainers
+@SpringBootTest
+class OrderServiceManualTest {
+
+    @Container
+    static MySQLContainer<?> mySQLContainer1 = new MySQLContainer<>("mysql:8.0.23")
+            .withDatabaseName("ds0")
+            .withUsername("test")
+            .withPassword("test");
+
+    @Container
+    static MySQLContainer<?> mySQLContainer2 = new MySQLContainer<>("mysql:8.0.23")
+            .withDatabaseName("ds1")
+            .withUsername("test")
+            .withPassword("test");
+
+    static {
+        mySQLContainer2.setPortBindings(List.of("13307:3306"));
+        mySQLContainer1.setPortBindings(List.of("13306:3306"));
+    }
+    @Autowired
+    private OrderService orderService;
+
+    @Autowired
+    private OrderRepository orderRepository;
+
+    @DynamicPropertySource
+    static void setProperties(DynamicPropertyRegistry registry) {
+        registry.add("spring.jpa.hibernate.ddl-auto", () -> "create-drop");
+    }
+
+    @Test
+    void shouldFindOrderInCorrectShard() {
+        // given
+        Order order1 = new Order(1L, 1L,  BigDecimal.TEN, Status.PROCESSING, LocalDate.now(), "123 Main St");
+        Order order2 = new Order(2L, 2L, BigDecimal.valueOf(12.5), Status.SHIPPED, LocalDate.now(), "456 Main St");
+
+        // when
+        Order savedOrder1 = orderService.createOrder(order1);
+        Order savedOrder2 = orderService.createOrder(order2);
+
+        // then
+        // Assuming the sharding strategy is based on the order id, data for order1 should be present only in ds0
+        // and data for order2 should be present only in ds1
+        Assertions.assertThat(orderService.getOrder(savedOrder1.getOrderId())).isEqualTo(savedOrder1);
+        Assertions.assertThat(orderService.getOrder(savedOrder2.getOrderId())).isEqualTo(savedOrder2);
+
+        // Verify that the orders are not present in the wrong shards.
+        // You would need to implement these methods in your OrderService.
+        // They should use a JdbcTemplate or EntityManager to execute SQL directly against each shard.
+        Assertions.assertThat(assertOrderInShard(savedOrder1, mySQLContainer2)).isTrue();
+        Assertions.assertThat(assertOrderInShard(savedOrder2, mySQLContainer1)).isTrue();
+    }
+
+    private boolean assertOrderInShard(Order order, MySQLContainer<?> container) {
+        try (Connection conn = DriverManager.getConnection(container.getJdbcUrl(), container.getUsername(), container.getPassword())) {
+            PreparedStatement stmt = conn.prepareStatement("SELECT * FROM `order` WHERE order_id = ?");
+            stmt.setLong(1, order.getOrderId());
+            ResultSet rs = stmt.executeQuery();
+            return rs.next();
+        } catch (SQLException ex) {
+            throw new RuntimeException("Error querying order in shard", ex);
+        }
+    }
+}
diff --git a/persistence-modules/spring-hibernate-5/README.md b/persistence-modules/spring-hibernate-5/README.md
index e2344fd585..ce78e5a0df 100644
--- a/persistence-modules/spring-hibernate-5/README.md
+++ b/persistence-modules/spring-hibernate-5/README.md
@@ -4,10 +4,7 @@ This module contains articles about Hibernate 5 with Spring.
 
 ### Relevant articles
 
-- [Programmatic Transactions in the Spring TestContext Framework](https://www.baeldung.com/spring-test-programmatic-transactions)
 - [Introduction to Hibernate Search](https://www.baeldung.com/hibernate-search)
-- [@DynamicUpdate with Spring Data JPA](https://www.baeldung.com/spring-data-jpa-dynamicupdate)
 - [Hibernate Second-Level Cache](http://www.baeldung.com/hibernate-second-level-cache)
 - [Deleting Objects with Hibernate](http://www.baeldung.com/delete-with-hibernate)
 - [Spring, Hibernate and a JNDI Datasource](http://www.baeldung.com/spring-persistence-jpa-jndi-datasource)
-- [Bootstrapping Hibernate 5 with Spring](https://www.baeldung.com/hibernate-5-spring)
diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/bootstrap/HibernateXMLConf.java b/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/bootstrap/HibernateXMLConf.java
deleted file mode 100644
index b3e979478f..0000000000
--- a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/bootstrap/HibernateXMLConf.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.baeldung.hibernate.bootstrap;
-
-import com.google.common.base.Preconditions;
-import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.env.Environment;
-import org.springframework.orm.hibernate5.HibernateTransactionManager;
-import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import javax.sql.DataSource;
-import java.util.Properties;
-
-@Configuration
-@EnableTransactionManagement
-@ImportResource({ "classpath:hibernate5Configuration.xml" })
-public class HibernateXMLConf {
-
-}
diff --git a/persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateIntegrationTest.java b/persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateIntegrationTest.java
deleted file mode 100644
index fc183d1f19..0000000000
--- a/persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateIntegrationTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.baeldung.hibernate.dynamicupdate;
-
-import javax.transaction.Transactional;
-
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.annotation.Commit;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
-
-import com.baeldung.hibernate.dynamicupdate.model.Account;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = DynamicUpdateConfig.class, loader = AnnotationConfigContextLoader.class)
-@Transactional
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class DynamicUpdateIntegrationTest {
-
-    private static final Integer ACCOUNT_ID = 1;
-
-    @Autowired
-    private AccountRepository accountRepository;
-
-    @Test
-    @Commit
-    public void testA_whenTestAccountIsSaved_thenSuccess() {
-        Account account = new Account(ACCOUNT_ID, "account1", "regional", true);
-        accountRepository.save(account);
-    }
-
-    @Test
-    @Commit
-    // Enable Hibernate's debug logging in logback.xml to see the generated SQL statement.
-    public void testB_whenAccountNameUpdated_thenSuccess() {
-        Account account = accountRepository.findOne(ACCOUNT_ID);
-        account.setName("Test Account");
-        accountRepository.save(account);
-    }
-
-}
diff --git a/persistence-modules/spring-hibernate-6/.gitignore b/persistence-modules/spring-hibernate-6/.gitignore
new file mode 100644
index 0000000000..83c05e60c8
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/.gitignore
@@ -0,0 +1,13 @@
+*.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/persistence-modules/spring-hibernate-6/README.md b/persistence-modules/spring-hibernate-6/README.md
new file mode 100644
index 0000000000..08fe6216fd
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/README.md
@@ -0,0 +1,9 @@
+## Hibernate 6 with Spring
+
+This module contains articles about Hibernate 6 with Spring.
+
+### Relevant articles
+
+- [Programmatic Transactions in the Spring TestContext Framework](https://www.baeldung.com/spring-test-programmatic-transactions)
+- [@DynamicUpdate with Spring Data JPA](https://www.baeldung.com/spring-data-jpa-dynamicupdate)
+- [Bootstrapping Hibernate 5 with Spring](https://www.baeldung.com/hibernate-5-spring)
diff --git a/persistence-modules/spring-hibernate-6/pom.xml b/persistence-modules/spring-hibernate-6/pom.xml
new file mode 100644
index 0000000000..a13117e68c
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/pom.xml
@@ -0,0 +1,109 @@
+<?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-hibernate-6</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>spring-hibernate-6</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>persistence-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <!-- Spring -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${org.springframework.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aspects</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+        <!-- persistence -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
+            <version>${org.springframework.data.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-dbcp</artifactId>
+            <version>${tomcat-dbcp.version}</version>
+        </dependency>
+        <!-- validation -->
+        <!-- utils -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${org.springframework.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <version>${org.springframework.security.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>${hsqldb.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql-connector-java.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <!-- Spring -->
+        <org.springframework.version>6.0.11</org.springframework.version>
+        <org.springframework.data.version>3.1.3</org.springframework.data.version>
+        <org.springframework.security.version>6.1.3</org.springframework.security.version>
+        <!-- persistence -->
+        <hibernate.version>6.2.8.Final</hibernate.version>
+        <mysql-connector-java.version>8.0.7-dmr</mysql-connector-java.version>
+        <tomcat-dbcp.version>9.0.80</tomcat-dbcp.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/bootstrap/BarHibernateDAO.java b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/hibernate/bootstrap/BarHibernateDAO.java
similarity index 100%
rename from persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/bootstrap/BarHibernateDAO.java
rename to persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/hibernate/bootstrap/BarHibernateDAO.java
diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/bootstrap/HibernateConf.java b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/hibernate/bootstrap/HibernateConf.java
similarity index 100%
rename from persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/bootstrap/HibernateConf.java
rename to persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/hibernate/bootstrap/HibernateConf.java
diff --git a/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/hibernate/bootstrap/HibernateXMLConf.java b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/hibernate/bootstrap/HibernateXMLConf.java
new file mode 100644
index 0000000000..220c18bccf
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/hibernate/bootstrap/HibernateXMLConf.java
@@ -0,0 +1,12 @@
+package com.baeldung.hibernate.bootstrap;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@Configuration
+@EnableTransactionManagement
+@ImportResource({ "classpath:hibernate6Configuration.xml" })
+public class HibernateXMLConf {
+
+}
diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/bootstrap/model/TestEntity.java b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/hibernate/bootstrap/model/TestEntity.java
similarity index 86%
rename from persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/bootstrap/model/TestEntity.java
rename to persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/hibernate/bootstrap/model/TestEntity.java
index cae41db831..d260fed7a1 100644
--- a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/bootstrap/model/TestEntity.java
+++ b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/hibernate/bootstrap/model/TestEntity.java
@@ -1,7 +1,7 @@
 package com.baeldung.hibernate.bootstrap.model;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 @Entity
 public class TestEntity {
diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/AccountRepository.java b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/hibernate/dynamicupdate/AccountRepository.java
similarity index 100%
rename from persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/AccountRepository.java
rename to persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/hibernate/dynamicupdate/AccountRepository.java
diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateConfig.java b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateConfig.java
similarity index 98%
rename from persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateConfig.java
rename to persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateConfig.java
index 23e28a9e3b..766295f67a 100644
--- a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateConfig.java
+++ b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateConfig.java
@@ -2,7 +2,7 @@ package com.baeldung.hibernate.dynamicupdate;
 
 import java.util.Properties;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
 import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
diff --git a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/model/Account.java b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/hibernate/dynamicupdate/model/Account.java
similarity index 94%
rename from persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/model/Account.java
rename to persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/hibernate/dynamicupdate/model/Account.java
index b3753112fe..808ffe99ee 100644
--- a/persistence-modules/spring-hibernate-5/src/main/java/com/baeldung/hibernate/dynamicupdate/model/Account.java
+++ b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/hibernate/dynamicupdate/model/Account.java
@@ -2,9 +2,9 @@ package com.baeldung.hibernate.dynamicupdate.model;
 
 import java.text.MessageFormat;
 
-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.DynamicUpdate;
 
diff --git a/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/persistence/dao/IFooDao.java b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/persistence/dao/IFooDao.java
new file mode 100644
index 0000000000..0935772dbd
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/persistence/dao/IFooDao.java
@@ -0,0 +1,8 @@
+package com.baeldung.persistence.dao;
+
+import com.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.dao.common.IOperations;
+
+public interface IFooDao extends IOperations<Foo> {
+    //
+}
diff --git a/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/persistence/dao/common/AbstractDao.java b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/persistence/dao/common/AbstractDao.java
new file mode 100644
index 0000000000..5a6c76a93a
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/persistence/dao/common/AbstractDao.java
@@ -0,0 +1,14 @@
+package com.baeldung.persistence.dao.common;
+
+import java.io.Serializable;
+
+import com.google.common.base.Preconditions;
+
+public abstract class AbstractDao<T extends Serializable> implements IOperations<T> {
+
+    protected Class<T> clazz;
+
+    protected final void setClazz(final Class<T> clazzToSet) {
+        clazz = Preconditions.checkNotNull(clazzToSet);
+    }
+}
diff --git a/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/persistence/dao/common/AbstractHibernateDao.java b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/persistence/dao/common/AbstractHibernateDao.java
new file mode 100644
index 0000000000..f34866d883
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/persistence/dao/common/AbstractHibernateDao.java
@@ -0,0 +1,59 @@
+package com.baeldung.persistence.dao.common;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.google.common.base.Preconditions;
+
+@SuppressWarnings("unchecked")
+public abstract class AbstractHibernateDao<T extends Serializable> extends AbstractDao<T> implements IOperations<T> {
+
+    @Autowired
+    protected SessionFactory sessionFactory;
+
+    // API
+
+    @Override
+    public T findOne(final long id) {
+        return (T) getCurrentSession().get(clazz, id);
+    }
+
+    @Override
+    public List<T> findAll() {
+        return getCurrentSession().createQuery("from " + clazz.getName()).getResultList();
+    }
+
+    @Override
+    public void create(final T entity) {
+        Preconditions.checkNotNull(entity);
+        getCurrentSession().saveOrUpdate(entity);
+    }
+
+    @Override
+    public T update(final T entity) {
+        Preconditions.checkNotNull(entity);
+        return (T) getCurrentSession().merge(entity);
+    }
+
+    @Override
+    public void delete(final T entity) {
+        Preconditions.checkNotNull(entity);
+        getCurrentSession().delete(entity);
+    }
+
+    @Override
+    public void deleteById(final long entityId) {
+        final T entity = findOne(entityId);
+        Preconditions.checkState(entity != null);
+        delete(entity);
+    }
+
+    protected Session getCurrentSession() {
+        return sessionFactory.getCurrentSession();
+    }
+
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/persistence/dao/common/IOperations.java b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/persistence/dao/common/IOperations.java
new file mode 100644
index 0000000000..4ef99221ab
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/persistence/dao/common/IOperations.java
@@ -0,0 +1,20 @@
+package com.baeldung.persistence.dao.common;
+
+import java.io.Serializable;
+import java.util.List;
+
+public interface IOperations<T extends Serializable> {
+
+    T findOne(final long id);
+
+    List<T> findAll();
+
+    void create(final T entity);
+
+    T update(final T entity);
+
+    void delete(final T entity);
+
+    void deleteById(final long entityId);
+
+}
diff --git a/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/persistence/dao/impl/FooHibernateDao.java b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/persistence/dao/impl/FooHibernateDao.java
new file mode 100644
index 0000000000..5411073360
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/persistence/dao/impl/FooHibernateDao.java
@@ -0,0 +1,19 @@
+package com.baeldung.persistence.dao.impl;
+
+import com.baeldung.persistence.dao.common.AbstractHibernateDao;
+import com.baeldung.persistence.dao.IFooDao;
+import com.baeldung.persistence.model.Foo;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class FooHibernateDao extends AbstractHibernateDao<Foo> implements IFooDao {
+
+    public FooHibernateDao() {
+        super();
+
+        setClazz(Foo.class);
+    }
+
+    // API
+
+}
diff --git a/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/persistence/model/Foo.java b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/persistence/model/Foo.java
new file mode 100644
index 0000000000..c9a541290d
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/persistence/model/Foo.java
@@ -0,0 +1,73 @@
+package com.baeldung.persistence.model;
+
+import jakarta.persistence.*;
+import java.io.Serializable;
+
+@Entity
+public class Foo implements Serializable{
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private long id;
+
+    @Column(name = "name")
+    private String name;
+
+    public Foo() {
+        super();
+    }
+
+    public Foo(final String name) {
+        super();
+        this.name = name;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(final long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        final Foo other = (Foo) obj;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+        builder.append("Foo [name=").append(name).append("]");
+        return builder.toString();
+    }
+}
diff --git a/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/spring/PersistenceConfig.java b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/spring/PersistenceConfig.java
new file mode 100644
index 0000000000..04961c3c49
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/spring/PersistenceConfig.java
@@ -0,0 +1,82 @@
+package com.baeldung.spring;
+
+import com.baeldung.persistence.dao.IFooDao;
+import com.baeldung.persistence.dao.impl.FooHibernateDao;
+import com.google.common.base.Preconditions;
+import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+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.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.sql.DataSource;
+import java.util.Properties;
+
+@Configuration
+@EnableTransactionManagement
+@PropertySource({ "classpath:persistence-h2.properties" })
+@ComponentScan({ "com.baeldung.persistence" })
+public class PersistenceConfig {
+
+    @Autowired
+    private Environment env;
+
+    @Bean
+    public LocalSessionFactoryBean sessionFactory() {
+        final LocalSessionFactoryBean sessionFactory = new LocalSessionFactoryBean();
+        sessionFactory.setDataSource(myDataSource());
+        sessionFactory.setPackagesToScan(new String[] { "com.baeldung.persistence.model" });
+        sessionFactory.setHibernateProperties(hibernateProperties());
+
+        return sessionFactory;
+    }
+
+    @Bean
+    public DataSource myDataSource() {
+        final BasicDataSource dataSource = new BasicDataSource();
+        dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName")));
+        dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url")));
+        dataSource.setUsername(Preconditions.checkNotNull(env.getProperty("jdbc.user")));
+        dataSource.setPassword(Preconditions.checkNotNull(env.getProperty("jdbc.pass")));
+
+        return dataSource;
+    }
+
+    @Bean
+    public PlatformTransactionManager hibernateTransactionManager() {
+        final HibernateTransactionManager transactionManager = new HibernateTransactionManager();
+        transactionManager.setSessionFactory(sessionFactory().getObject());
+        return transactionManager;
+    }
+
+    @Bean
+    public PersistenceExceptionTranslationPostProcessor exceptionTranslation() {
+        return new PersistenceExceptionTranslationPostProcessor();
+    }
+
+    @Bean
+    public IFooDao fooHibernateDao() {
+        return new FooHibernateDao();
+    }
+
+    private final Properties hibernateProperties() {
+        final Properties hibernateProperties = new Properties();
+        hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
+        hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
+
+        hibernateProperties.setProperty("hibernate.show_sql", "false");
+
+        // Envers properties
+        hibernateProperties.setProperty("org.hibernate.envers.audit_table_suffix", env.getProperty("envers.audit_table_suffix"));
+
+        return hibernateProperties;
+    }
+
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/spring/PersistenceXmlConfig.java b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/spring/PersistenceXmlConfig.java
new file mode 100644
index 0000000000..14caf5c88c
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/src/main/java/com/baeldung/spring/PersistenceXmlConfig.java
@@ -0,0 +1,14 @@
+package com.baeldung.spring;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@Configuration
+@EnableTransactionManagement
+@ComponentScan({ "com.baeldung.persistence.dao", "com.baeldung.persistence.service" })
+@ImportResource({ "classpath:hibernate6Config.xml" })
+public class PersistenceXmlConfig {
+
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-hibernate-6/src/main/resources/hibernate6Config.xml b/persistence-modules/spring-hibernate-6/src/main/resources/hibernate6Config.xml
new file mode 100644
index 0000000000..bbb61cb3e0
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/src/main/resources/hibernate6Config.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+    xsi:schemaLocation="
+      http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"
+>
+
+    <context:property-placeholder location="classpath:persistence-mysql.properties"/>
+
+    <bean id="sessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
+        <property name="dataSource" ref="dataSource"/>
+        <property name="packagesToScan" value="com.baeldung.persistence.model"/>
+        <property name="hibernateProperties">
+            <props>
+                <prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
+                <prop key="hibernate.dialect">${hibernate.dialect}</prop>
+            </props>
+        </property>
+    </bean>
+
+    <bean id="dataSource" class="org.apache.tomcat.dbcp.dbcp2.BasicDataSource">
+        <property name="driverClassName" value="${jdbc.driverClassName}"/>
+        <property name="url" value="${jdbc.url}"/>
+        <property name="username" value="${jdbc.eventGeneratedId}"/>
+        <property name="password" value="${jdbc.pass}"/>
+    </bean>
+
+    <bean id="txManager" class="org.springframework.orm.hibernate5.HibernateTransactionManager">
+        <property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
+
+    <bean id="persistenceExceptionTranslationPostProcessor" class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor"/>
+
+</beans>
\ No newline at end of file
diff --git a/persistence-modules/spring-hibernate-6/src/main/resources/hibernate6Configuration.xml b/persistence-modules/spring-hibernate-6/src/main/resources/hibernate6Configuration.xml
new file mode 100644
index 0000000000..cb6cf0aa5c
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/src/main/resources/hibernate6Configuration.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+    xsi:schemaLocation="
+      http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+    <context:property-placeholder location="classpath:persistence-h2.properties"/>
+
+    <bean id="sessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
+        <property name="dataSource" ref="dataSource"/>
+        <property name="packagesToScan" value="com.baeldung.hibernate.bootstrap.model"/>
+        <property name="hibernateProperties">
+            <props>
+                <prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
+                <prop key="hibernate.dialect">${hibernate.dialect}</prop>
+            </props>
+        </property>
+    </bean>
+
+    <bean id="dataSource" class="org.apache.tomcat.dbcp.dbcp2.BasicDataSource">
+        <property name="driverClassName" value="${jdbc.driverClassName}"/>
+        <property name="url" value="${jdbc.url}"/>
+        <property name="username" value="${jdbc.user}"/>
+        <property name="password" value="${jdbc.pass}"/>
+    </bean>
+
+    <bean id="txManager" class="org.springframework.orm.hibernate5.HibernateTransactionManager">
+        <property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
+</beans>
\ No newline at end of file
diff --git a/persistence-modules/spring-hibernate-6/src/main/resources/logback.xml b/persistence-modules/spring-hibernate-6/src/main/resources/logback.xml
new file mode 100644
index 0000000000..ec0dc2469a
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/src/main/resources/logback.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>web - %date [%thread] %-5level %logger{36} - %message%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.springframework" level="WARN" />
+    <logger name="org.springframework.transaction" level="WARN" />
+
+    <!-- in order to debug some marshalling issues, this needs to be TRACE -->
+    <logger name="org.springframework.web.servlet.mvc" level="WARN" />
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/persistence-modules/spring-hibernate-6/src/main/resources/persistence-h2.properties b/persistence-modules/spring-hibernate-6/src/main/resources/persistence-h2.properties
new file mode 100644
index 0000000000..2ed7022eab
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/src/main/resources/persistence-h2.properties
@@ -0,0 +1,22 @@
+# jdbc.X
+jdbc.driverClassName=org.h2.Driver
+jdbc.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
+jdbc.eventGeneratedId=sa
+jdbc.user=sa
+jdbc.pass=
+
+# hibernate.X
+hibernate.dialect=org.hibernate.dialect.H2Dialect
+hibernate.show_sql=false
+hibernate.hbm2ddl.auto=create-drop
+hibernate.cache.use_second_level_cache=true
+hibernate.cache.use_query_cache=true
+hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory
+
+
+# hibernate.search.X
+hibernate.search.default.directory_provider = filesystem
+hibernate.search.default.indexBase = /data/index/default
+
+# envers.X
+envers.audit_table_suffix=_audit_log
diff --git a/persistence-modules/spring-hibernate-6/src/main/resources/persistence-jndi.properties b/persistence-modules/spring-hibernate-6/src/main/resources/persistence-jndi.properties
new file mode 100644
index 0000000000..16d750d7f8
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/src/main/resources/persistence-jndi.properties
@@ -0,0 +1,8 @@
+# jdbc.X
+jdbc.url=java:comp/env/jdbc/BaeldungDatabase
+
+# hibernate.X
+hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+hibernate.show_sql=false
+#hibernate.hbm2ddl.auto=create
+hibernate.hbm2ddl.auto=update
\ No newline at end of file
diff --git a/persistence-modules/spring-hibernate-6/src/main/resources/persistence-mysql.properties b/persistence-modules/spring-hibernate-6/src/main/resources/persistence-mysql.properties
new file mode 100644
index 0000000000..b3cfd31f46
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/src/main/resources/persistence-mysql.properties
@@ -0,0 +1,13 @@
+# jdbc.X
+jdbc.driverClassName=com.mysql.cj.jdbc.Driver
+jdbc.url=jdbc:mysql://localhost:3306/spring_hibernate5_01?createDatabaseIfNotExist=true
+jdbc.eventGeneratedId=tutorialuser
+jdbc.pass=tutorialmy5ql
+
+# hibernate.X
+hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+hibernate.show_sql=false
+hibernate.hbm2ddl.auto=create-drop
+
+# envers.X
+envers.audit_table_suffix=_audit_log
diff --git a/persistence-modules/spring-hibernate-6/src/test/java/com/baeldung/SpringContextTest.java b/persistence-modules/spring-hibernate-6/src/test/java/com/baeldung/SpringContextTest.java
new file mode 100644
index 0000000000..4ec83cda3e
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/src/test/java/com/baeldung/SpringContextTest.java
@@ -0,0 +1,19 @@
+package com.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.spring.PersistenceConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+
+    }
+}
diff --git a/persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/bootstrap/HibernateBootstrapIntegrationTest.java b/persistence-modules/spring-hibernate-6/src/test/java/com/baeldung/hibernate/bootstrap/HibernateBootstrapIntegrationTest.java
similarity index 79%
rename from persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/bootstrap/HibernateBootstrapIntegrationTest.java
rename to persistence-modules/spring-hibernate-6/src/test/java/com/baeldung/hibernate/bootstrap/HibernateBootstrapIntegrationTest.java
index c41423643a..31522288b6 100644
--- a/persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/bootstrap/HibernateBootstrapIntegrationTest.java
+++ b/persistence-modules/spring-hibernate-6/src/test/java/com/baeldung/hibernate/bootstrap/HibernateBootstrapIntegrationTest.java
@@ -1,33 +1,36 @@
 package com.baeldung.hibernate.bootstrap;
 
+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 com.baeldung.hibernate.bootstrap.model.TestEntity;
+
+
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+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.Commit;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.transaction.TestTransaction;
 import org.springframework.transaction.annotation.Transactional;
 
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertTrue;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { HibernateConf.class })
 @Transactional
-public class HibernateBootstrapIntegrationTest {
+@ContextConfiguration(classes = { HibernateXMLConf.class })
+@ExtendWith(SpringExtension.class)
+class HibernateBootstrapIntegrationTest {
 
     @Autowired
     private SessionFactory sessionFactory;
 
     @Test
-    public void whenBootstrapHibernateSession_thenNoException() {
+    void whenBootstrapHibernateSession_thenNoException() {
 
         Session session = sessionFactory.getCurrentSession();
 
@@ -37,11 +40,11 @@ public class HibernateBootstrapIntegrationTest {
 
         TestEntity searchEntity = session.find(TestEntity.class, 1);
 
-        Assert.assertNotNull(searchEntity);
+        assertNotNull(searchEntity);
     }
 
     @Test
-    public void whenProgrammaticTransactionCommit_thenEntityIsInDatabase() {
+    void whenProgrammaticTransactionCommit_thenEntityIsInDatabase() {
         assertTrue(TestTransaction.isActive());
 
         //Save an entity and commit.
@@ -53,7 +56,7 @@ public class HibernateBootstrapIntegrationTest {
 
         TestEntity searchEntity = session.find(TestEntity.class, 1);
 
-        Assert.assertNotNull(searchEntity);
+
         assertTrue(TestTransaction.isFlaggedForRollback());
 
         TestTransaction.flagForCommit();
@@ -72,7 +75,7 @@ public class HibernateBootstrapIntegrationTest {
         session = sessionFactory.getCurrentSession();
         searchEntity = session.find(TestEntity.class, 1);
 
-        Assert.assertNotNull(searchEntity);
+        assertNotNull(searchEntity);
 
         session.delete(searchEntity);
         session.flush();
@@ -88,7 +91,7 @@ public class HibernateBootstrapIntegrationTest {
         session = sessionFactory.getCurrentSession();
         searchEntity = session.find(TestEntity.class, 1);
 
-        Assert.assertNotNull(searchEntity);
+        assertNotNull(searchEntity);
 
         session.delete(searchEntity);
         session.flush();
@@ -108,12 +111,12 @@ public class HibernateBootstrapIntegrationTest {
         session = sessionFactory.getCurrentSession();
         searchEntity = session.find(TestEntity.class, 1);
 
-        Assert.assertNull(searchEntity);
+        assertNull(searchEntity);
     }
 
     @Test
     @Commit
-    public void givenTransactionCommitDefault_whenProgrammaticTransactionCommit_thenEntityIsInDatabase() {
+    void givenTransactionCommitDefault_whenProgrammaticTransactionCommit_thenEntityIsInDatabase() {
         assertTrue(TestTransaction.isActive());
 
         //Save an entity and commit.
@@ -125,7 +128,7 @@ public class HibernateBootstrapIntegrationTest {
 
         TestEntity searchEntity = session.find(TestEntity.class, 1);
 
-        Assert.assertNotNull(searchEntity);
+        assertNotNull(searchEntity);
         assertFalse(TestTransaction.isFlaggedForRollback());
 
         TestTransaction.end();
@@ -143,7 +146,7 @@ public class HibernateBootstrapIntegrationTest {
         session = sessionFactory.getCurrentSession();
         searchEntity = session.find(TestEntity.class, 1);
 
-        Assert.assertNotNull(searchEntity);
+        assertNotNull(searchEntity);
 
         session.delete(searchEntity);
         session.flush();
@@ -160,7 +163,7 @@ public class HibernateBootstrapIntegrationTest {
         session = sessionFactory.getCurrentSession();
         searchEntity = session.find(TestEntity.class, 1);
 
-        Assert.assertNotNull(searchEntity);
+        assertNotNull(searchEntity);
 
         session.delete(searchEntity);
         session.flush();
@@ -179,7 +182,7 @@ public class HibernateBootstrapIntegrationTest {
         session = sessionFactory.getCurrentSession();
         searchEntity = session.find(TestEntity.class, 1);
 
-        Assert.assertNull(searchEntity);
+        assertNull(searchEntity);
     }
 
 }
diff --git a/persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/bootstrap/HibernateXMLBootstrapIntegrationTest.java b/persistence-modules/spring-hibernate-6/src/test/java/com/baeldung/hibernate/bootstrap/HibernateXMLBootstrapIntegrationTest.java
similarity index 65%
rename from persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/bootstrap/HibernateXMLBootstrapIntegrationTest.java
rename to persistence-modules/spring-hibernate-6/src/test/java/com/baeldung/hibernate/bootstrap/HibernateXMLBootstrapIntegrationTest.java
index 5b811ad576..153e6736f1 100644
--- a/persistence-modules/spring-hibernate-5/src/test/java/com/baeldung/hibernate/bootstrap/HibernateXMLBootstrapIntegrationTest.java
+++ b/persistence-modules/spring-hibernate-6/src/test/java/com/baeldung/hibernate/bootstrap/HibernateXMLBootstrapIntegrationTest.java
@@ -1,26 +1,27 @@
 package com.baeldung.hibernate.bootstrap;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import com.baeldung.hibernate.bootstrap.model.TestEntity;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 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.junit.jupiter.SpringExtension;
 import org.springframework.transaction.annotation.Transactional;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = { HibernateXMLConf.class })
 @Transactional
-public class HibernateXMLBootstrapIntegrationTest {
+class HibernateXMLBootstrapIntegrationTest {
 
     @Autowired
     private SessionFactory sessionFactory;
 
     @Test
-    public void whenBootstrapHibernateSession_thenNoException() {
+    void whenBootstrapHibernateSession_thenNoException() {
 
         Session session = sessionFactory.getCurrentSession();
 
@@ -30,7 +31,7 @@ public class HibernateXMLBootstrapIntegrationTest {
 
         TestEntity searchEntity = session.find(TestEntity.class, 1);
 
-        Assert.assertNotNull(searchEntity);
+        assertNotNull(searchEntity);
     }
 
 }
diff --git a/persistence-modules/spring-hibernate-6/src/test/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateIntegrationTest.java b/persistence-modules/spring-hibernate-6/src/test/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateIntegrationTest.java
new file mode 100644
index 0000000000..9a52599842
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/src/test/java/com/baeldung/hibernate/dynamicupdate/DynamicUpdateIntegrationTest.java
@@ -0,0 +1,52 @@
+package com.baeldung.hibernate.dynamicupdate;
+
+import java.util.Optional;
+
+import jakarta.transaction.Transactional;
+
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.Commit;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.hibernate.dynamicupdate.model.Account;
+
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(classes = { DynamicUpdateConfig.class }, loader = AnnotationConfigContextLoader.class)
+@Transactional
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+class DynamicUpdateIntegrationTest {
+
+    private static final Integer ACCOUNT_ID = 1;
+
+    @Autowired
+    private AccountRepository accountRepository;
+
+    @Test
+    @Commit
+    @Order(1)
+    void testA_whenTestAccountIsSaved_thenSuccess() {
+        Account account = new Account(ACCOUNT_ID, "account1", "regional", true);
+        accountRepository.save(account);
+    }
+
+    @Test
+    @Commit
+    @Order(2)
+    // Enable Hibernate's debug logging in logback.xml to see the generated SQL statement.
+    void testB_whenAccountNameUpdated_thenSuccess() {
+        Optional<Account> account = accountRepository.findById(ACCOUNT_ID);
+        if(account.isPresent()){
+            account.get().setName("Test Account");
+            accountRepository.save(account.get());
+        }
+    }
+
+}
diff --git a/persistence-modules/spring-hibernate-6/src/test/java/com/baeldung/persistence/dao/common/HibernateDaoIntegrationTest.java b/persistence-modules/spring-hibernate-6/src/test/java/com/baeldung/persistence/dao/common/HibernateDaoIntegrationTest.java
new file mode 100644
index 0000000000..d7069c62c9
--- /dev/null
+++ b/persistence-modules/spring-hibernate-6/src/test/java/com/baeldung/persistence/dao/common/HibernateDaoIntegrationTest.java
@@ -0,0 +1,46 @@
+package com.baeldung.persistence.dao.common;
+
+import com.baeldung.persistence.model.Foo;
+import com.baeldung.spring.PersistenceConfig;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.junit.jupiter.api.AfterEach;
+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.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+class HibernateDaoIntegrationTest {
+
+    @Autowired
+    private SessionFactory sessionFactory;
+
+    private Session session;
+
+    @BeforeEach
+    public final void before() {
+        session = sessionFactory.openSession();
+    }
+
+    @AfterEach
+    public final void after() {
+        session.close();
+    }
+
+    @Test
+    final void whenContextIsBootstrapped_thenNoExceptions() {
+        //
+    }
+
+    @Test
+    final void whenPersistEntity_thenSuccess() {
+        session.persist(new Foo(RandomStringUtils.randomAlphabetic(5).toUpperCase()));
+    }
+
+}
diff --git a/persistence-modules/spring-jdbc/README.md b/persistence-modules/spring-jdbc/README.md
index 21d25915de..19f8537a4e 100644
--- a/persistence-modules/spring-jdbc/README.md
+++ b/persistence-modules/spring-jdbc/README.md
@@ -7,3 +7,4 @@
 - [Obtaining Auto-generated Keys in Spring JDBC](https://www.baeldung.com/spring-jdbc-autogenerated-keys)
 - [Spring JDBC Batch Inserts](https://www.baeldung.com/spring-jdbc-batch-inserts)
 - [Fix EmptyResultDataAccessException When Using JdbcTemplate](https://www.baeldung.com/jdbctemplate-fix-emptyresultdataaccessexception)
+- [How to replace deprecated jdbcTemplate.queryForObject and jdbcTemplate.query in spring boot 2.4.X and above](https://www.baeldung.com/spring-boot-replace-deprecated-jdbctemplate-queryforobject-query)
diff --git a/pom.xml b/pom.xml
index c65f6ce62d..6853b10587 100644
--- a/pom.xml
+++ b/pom.xml
@@ -723,9 +723,12 @@
                 <module>spring-boot-rest</module>
                 <module>spring-drools</module>
                 <module>spring-cloud-modules/spring-cloud-azure</module>
+                <module>spring-cloud-modules/spring-cloud-circuit-breaker</module>
                 <module>spring-cloud-modules/spring-cloud-contract</module>
                 <module>spring-cloud-modules/spring-cloud-data-flow</module>
-                <module>spring-cloud-modules/spring-cloud-circuit-breaker</module>
+                <module>spring-cloud-modules/spring-cloud-netflix-feign</module>
+                <module>spring-cloud-modules/spring-cloud-stream-starters</module>
+                <module>spring-cloud-modules/spring-cloud-zuul-eureka-integration</module>
                 <module>spring-exceptions</module>
                 <module>spring-jenkins-pipeline</module>
                 <module>spring-core</module>
@@ -816,6 +819,7 @@
                 <module>apache-olingo</module>
 
                 <module>apache-poi-2</module>
+                <module>apache-poi-3</module>
                 <module>apache-thrift</module>
                 <module>apache-tika</module>
 
@@ -891,6 +895,7 @@
                 <module>spring-5</module>
                 <module>spring-5-webflux</module>
                 <module>spring-5-webflux-2</module>
+                <module>spring-6-rsocket</module>
                 <module>spring-activiti</module>
                 <module>spring-actuator</module>
                 <module>spring-core-2</module>
@@ -999,6 +1004,10 @@
                 <module>spring-drools</module>
                 <module>spring-cloud-modules/spring-cloud-azure</module>
                 <module>spring-cloud-modules/spring-cloud-circuit-breaker</module>
+                <module>spring-cloud-modules/spring-cloud-contract</module>
+                <module>spring-cloud-modules/spring-cloud-netflix-feign</module>
+                <module>spring-cloud-modules/spring-cloud-stream-starters</module>
+                <module>spring-cloud-modules/spring-cloud-zuul-eureka-integration</module>
                 <module>spring-exceptions</module>
                 <module>spring-jenkins-pipeline</module>
                 <module>spring-core</module>
@@ -1089,6 +1098,7 @@
                 <module>apache-olingo</module>
 
                 <module>apache-poi-2</module>
+                <module>apache-poi-3</module>
                 <module>apache-thrift</module>
                 <module>apache-tika</module>
 
@@ -1210,7 +1220,6 @@
                 <module>gradle-modules/gradle/maven-to-gradle</module>
                 <module>persistence-modules/spring-data-neo4j</module>
                 <module>spring-actuator</module>
-                <module>spring-cloud-modules/spring-cloud-contract</module>
             </modules>
 
             <properties>
diff --git a/quarkus-modules/quarkus/pom.xml b/quarkus-modules/quarkus/pom.xml
index 99d18579c3..fc3d294beb 100644
--- a/quarkus-modules/quarkus/pom.xml
+++ b/quarkus-modules/quarkus/pom.xml
@@ -152,11 +152,8 @@
                         <executions>
                             <execution>
                                 <goals>
-                                    <goal>native-image</goal>
+                                    <goal>image-build</goal>
                                 </goals>
-                                <configuration>
-                                    <enableHttpUrlHandler>true</enableHttpUrlHandler>
-                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
diff --git a/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/NativeHelloResourceIT.java b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/NativeHelloResourceIT.java
index e6c8a3b8fb..b8567a8609 100644
--- a/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/NativeHelloResourceIT.java
+++ b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/NativeHelloResourceIT.java
@@ -2,9 +2,9 @@ package com.baeldung.quarkus;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.h2.H2DatabaseTestResource;
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 @QuarkusTestResource(H2DatabaseTestResource.class)
 public class NativeHelloResourceIT extends HelloResourceUnitTest {
 
diff --git a/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/NativeLibraryResourceIT.java b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/NativeLibraryResourceIT.java
index 0c11fa6fb4..10539d78d7 100644
--- a/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/NativeLibraryResourceIT.java
+++ b/quarkus-modules/quarkus/src/test/java/com/baeldung/quarkus/NativeLibraryResourceIT.java
@@ -2,9 +2,9 @@ package com.baeldung.quarkus;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.h2.H2DatabaseTestResource;
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 @QuarkusTestResource(H2DatabaseTestResource.class)
 class NativeLibraryResourceIT extends LibraryHttpEndpointIntegrationTest {
 }
diff --git a/spring-6-rsocket/README.md b/spring-6-rsocket/README.md
new file mode 100644
index 0000000000..95c805b0bf
--- /dev/null
+++ b/spring-6-rsocket/README.md
@@ -0,0 +1,7 @@
+## RSocket
+
+This module contains articles about RSocket in Spring Framework 6.
+
+### Relevant articles
+- [RSocket Interface in Spring 6](https://www.baeldung.com/spring-rsocket)
+
diff --git a/spring-6-rsocket/pom.xml b/spring-6-rsocket/pom.xml
new file mode 100644
index 0000000000..5d15a605ae
--- /dev/null
+++ b/spring-6-rsocket/pom.xml
@@ -0,0 +1,74 @@
+<?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>com.bealdung</groupId>
+    <artifactId>rsocket</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>rsocket</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-spring-6</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-spring-6</relativePath>
+    </parent>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-rsocket</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit</groupId>
+            <artifactId>junit-bom</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+    </dependencies>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <properties>
+        <spring-boot.version>3.1.3</spring-boot.version>
+        <logback.version>1.4.11</logback.version>
+        <slf4j.version>2.0.9</slf4j.version>
+    </properties>
+</project>
diff --git a/spring-6-rsocket/src/main/java/com/bealdung/rsocket/requester/MessageClient.java b/spring-6-rsocket/src/main/java/com/bealdung/rsocket/requester/MessageClient.java
new file mode 100644
index 0000000000..8fed6bee9b
--- /dev/null
+++ b/spring-6-rsocket/src/main/java/com/bealdung/rsocket/requester/MessageClient.java
@@ -0,0 +1,21 @@
+package com.bealdung.rsocket.requester;
+
+import org.springframework.messaging.rsocket.service.RSocketExchange;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface MessageClient {
+
+    @RSocketExchange("MyDestination")
+    Mono<String> sendMessage(Mono<String> input);
+
+    @RSocketExchange("Counter")
+    Flux<String> Counter();
+
+    @RSocketExchange("Warning")
+    Mono<Void> Warning(Mono<String> warning);
+
+    @RSocketExchange("channel")
+    Flux<String> channel(Flux<String> input);
+}
diff --git a/spring-6-rsocket/src/main/java/com/bealdung/rsocket/responder/MessageController.java b/spring-6-rsocket/src/main/java/com/bealdung/rsocket/responder/MessageController.java
new file mode 100644
index 0000000000..a2cfcc69ca
--- /dev/null
+++ b/spring-6-rsocket/src/main/java/com/bealdung/rsocket/responder/MessageController.java
@@ -0,0 +1,45 @@
+package com.bealdung.rsocket.responder;
+
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.stereotype.Controller;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@Controller
+public class MessageController {
+
+    @MessageMapping("MyDestination")
+    public Mono<String> message(Mono<String> input) {
+        return input.doOnNext(msg -> System.out.println("Request is:" + msg + ",Request!"))
+            .map(msg -> msg + ",Response!");
+    }
+
+    @MessageMapping("Counter")
+    public Flux<String> Counter() {
+        return Flux.range(1, 10)
+            .map(i -> "Count is: " + i);
+    }
+
+    @MessageMapping("Warning")
+    public Mono<Void> Warning(Mono<String> error) {
+        error.doOnNext(e -> System.out.println("warning is :" + e))
+            .subscribe();
+        return Mono.empty();
+    }
+
+    @MessageMapping("channel")
+    public Flux<String> channel(Flux<String> input) {
+        return input.doOnNext(i -> {
+                System.out.println("Received message is : " + i);
+            })
+            .map(m -> m.toUpperCase())
+            .doOnNext(r -> {
+                System.out.println("RESPONSE IS :" + r);
+            });
+    }
+
+}
+
+
+
diff --git a/spring-6-rsocket/src/main/java/com/bealdung/rsocket/responder/RSocketApplication.java b/spring-6-rsocket/src/main/java/com/bealdung/rsocket/responder/RSocketApplication.java
new file mode 100644
index 0000000000..9e763007fe
--- /dev/null
+++ b/spring-6-rsocket/src/main/java/com/bealdung/rsocket/responder/RSocketApplication.java
@@ -0,0 +1,73 @@
+package com.bealdung.rsocket.responder;
+
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.messaging.rsocket.RSocketRequester;
+import org.springframework.messaging.rsocket.service.RSocketServiceProxyFactory;
+
+import com.bealdung.rsocket.requester.MessageClient;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@SpringBootApplication
+public class RSocketApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(RSocketApplication.class, args);
+    }
+
+    @Bean
+    public RSocketServiceProxyFactory getRSocketServiceProxyFactory(RSocketRequester.Builder requestBuilder) {
+        RSocketRequester requester = requestBuilder.tcp("localhost", 7000);
+        return RSocketServiceProxyFactory.builder(requester)
+            .build();
+    }
+
+    @Bean
+    public MessageClient getClient(RSocketServiceProxyFactory factory) {
+        return factory.createClient(MessageClient.class);
+    }
+
+    @Bean
+    public ApplicationRunner runRequestResponseModel(MessageClient client) {
+        return args -> {
+            client.sendMessage(Mono.just("Request-Response test "))
+                .doOnNext(message -> {
+                    System.out.println("Response is :" + message);
+                })
+                .subscribe();
+        };
+    }
+
+    @Bean
+    public ApplicationRunner runStreamModel(MessageClient client) {
+        return args -> {
+            client.Counter()
+                .doOnNext(t -> {
+                    System.out.println("message is :" + t);
+                })
+                .subscribe();
+        };
+    }
+
+    @Bean
+    public ApplicationRunner runFireAndForget(MessageClient client) {
+        return args -> {
+            client.Warning(Mono.just("Important Warning"))
+                .subscribe();
+        };
+    }
+
+    @Bean
+    public ApplicationRunner runChannel(MessageClient client) {
+        return args -> {
+            client.channel(Flux.just("a", "b", "c", "d", "e"))
+                .doOnNext(i -> {
+                    System.out.println(i);
+                })
+                .subscribe();
+        };
+    }
+}
\ No newline at end of file
diff --git a/spring-6-rsocket/src/main/resources/application.properties b/spring-6-rsocket/src/main/resources/application.properties
new file mode 100644
index 0000000000..cab786cd30
--- /dev/null
+++ b/spring-6-rsocket/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.rsocket.server.port=7000
\ No newline at end of file
diff --git a/spring-6-rsocket/src/test/java/com/bealdung/rsocket/RSocketRequestResponseIntegrationTest.java b/spring-6-rsocket/src/test/java/com/bealdung/rsocket/RSocketRequestResponseIntegrationTest.java
new file mode 100644
index 0000000000..4b85c4c6fc
--- /dev/null
+++ b/spring-6-rsocket/src/test/java/com/bealdung/rsocket/RSocketRequestResponseIntegrationTest.java
@@ -0,0 +1,35 @@
+package com.bealdung.rsocket;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.messaging.rsocket.RSocketRequester;
+import org.springframework.messaging.rsocket.service.RSocketServiceProxyFactory;
+
+import com.bealdung.rsocket.requester.MessageClient;
+import com.bealdung.rsocket.responder.RSocketApplication;
+
+import reactor.core.publisher.Mono;
+
+@SpringBootTest(classes = RSocketApplication.class)
+public class RSocketRequestResponseIntegrationTest {
+
+    MessageClient client;
+
+    public RSocketRequestResponseIntegrationTest() {
+        RSocketRequester.Builder requesterBuilder = RSocketRequester.builder();
+        RSocketRequester requester = requesterBuilder.tcp("localhost", 7000);
+        RSocketServiceProxyFactory factory = RSocketServiceProxyFactory.builder(requester)
+            .build();
+        client = factory.createClient(MessageClient.class);
+    }
+
+    @Test
+    public void whenSendingStream_thenReceiveTheSameStream() {
+        String message = "test message";
+        assertEquals(message, client.sendMessage(Mono.just(message))
+            .block());
+    }
+
+}
diff --git a/spring-aop-2/README.md b/spring-aop-2/README.md
index a9694ac236..0aa20d32f0 100644
--- a/spring-aop-2/README.md
+++ b/spring-aop-2/README.md
@@ -7,4 +7,5 @@ This module contains articles about Spring aspect oriented programming (AOP)
 - [Spring Performance Logging](https://www.baeldung.com/spring-performance-logging)
 - [When Does Java Throw UndeclaredThrowableException?](https://www.baeldung.com/java-undeclaredthrowableexception)
 - [Get Advised Method Info in Spring AOP](https://www.baeldung.com/spring-aop-get-advised-method-info)
-- More articles: [[<-- prev]](/spring-aop)
\ No newline at end of file
+- [Invoke Spring @Cacheable from Another Method of Same Bean](https://www.baeldung.com/spring-invoke-cacheable-other-method-same-bean)
+- More articles: [[<-- prev]](/spring-aop)
diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index 1c4b2bb38f..2b4a94a7a5 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -104,6 +104,7 @@
         <module>spring-boot-springdoc-2</module>
         <module>spring-boot-documentation</module>
         <module>spring-boot-3-url-matching</module>
+        <module>spring-boot-graalvm-docker</module>
     </modules>
 
     <dependencyManagement>
diff --git a/spring-boot-modules/spring-boot-3/pom.xml b/spring-boot-modules/spring-boot-3/pom.xml
index 7e61ca18af..bb8c5dd53c 100644
--- a/spring-boot-modules/spring-boot-3/pom.xml
+++ b/spring-boot-modules/spring-boot-3/pom.xml
@@ -41,6 +41,31 @@
             <artifactId>mockserver-netty</artifactId>
             <version>${mockserver.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${jupiter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${jupiter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${jupiter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${jupiter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+            <version>1.10.0</version>
+        </dependency>
         <dependency>
             <groupId>org.mock-server</groupId>
             <artifactId>mockserver-client-java</artifactId>
@@ -183,12 +208,50 @@
     <properties>
         <java.version>19</java.version>
         <mapstruct.version>1.5.2.Final</mapstruct.version>
-        <springdoc.version>2.0.0</springdoc.version>
+        <springdoc.version>2.2.0</springdoc.version>
         <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
         <start-class>com.baeldung.sample.TodoApplication</start-class>
         <mockserver.version>5.14.0</mockserver.version>
-        <spring-boot.version>3.1.0</spring-boot.version>
+        <spring-boot.version>3.2.0-SNAPSHOT</spring-boot.version>
         <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
+        <jupiter.version>5.10.0</jupiter.version>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </pluginRepository>
+    </pluginRepositories>
+
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/Article.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/Article.java
new file mode 100644
index 0000000000..892cf3b5ae
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/Article.java
@@ -0,0 +1,44 @@
+package com.baeldung.restclient;
+
+import java.util.Objects;
+
+public class Article {
+    Integer id;
+    String title;
+
+    public Article() {}
+
+    public Article(Integer id, String title) {
+        this.id = id;
+        this.title = title;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Article article = (Article) o;
+        return Objects.equals(id, article.id) && Objects.equals(title, article.title);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, title);
+    }
+}
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/ArticleController.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/ArticleController.java
new file mode 100644
index 0000000000..5e1dff6fd7
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/ArticleController.java
@@ -0,0 +1,54 @@
+package com.baeldung.restclient;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+@RestController
+@RequestMapping("/articles")
+public class ArticleController {
+    Map<Integer, Article> database = new HashMap<>();
+
+    @GetMapping
+    public ResponseEntity<Collection<Article>> getArticles() {
+        Collection<Article> values = database.values();
+        if (values.isEmpty()) {
+            return ResponseEntity.noContent().build();
+        }
+        return ResponseEntity.ok(values);
+    }
+
+    @GetMapping("/{id}")
+    public ResponseEntity<Article> getArticle(@PathVariable("id") Integer id) {
+        Article article = database.get(id);
+        if (article == null) {
+            return ResponseEntity.notFound().build();
+        }
+        return ResponseEntity.ok(article);
+    }
+
+    @PostMapping
+    public void createArticle(@RequestBody Article article) {
+        database.put(article.getId(), article);
+    }
+
+    @PutMapping("/{id}")
+    public void updateArticle(@PathVariable("id") Integer id, @RequestBody Article article) {
+        assert Objects.equals(id, article.getId());
+        database.remove(id);
+        database.put(id, article);
+    }
+
+    @DeleteMapping("/{id}")
+    public void deleteArticle(@PathVariable Integer id) {
+        database.remove(id);
+    }
+    @DeleteMapping()
+    public void deleteArticles() {
+        database.clear();
+    }
+}
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/ArticleNotFoundException.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/ArticleNotFoundException.java
new file mode 100644
index 0000000000..cdd13b8330
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/ArticleNotFoundException.java
@@ -0,0 +1,6 @@
+package com.baeldung.restclient;
+
+public class ArticleNotFoundException extends RuntimeException {
+    public ArticleNotFoundException() {
+    }
+}
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/InvalidArticleResponseException.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/InvalidArticleResponseException.java
new file mode 100644
index 0000000000..26ca75036e
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/InvalidArticleResponseException.java
@@ -0,0 +1,6 @@
+package com.baeldung.restclient;
+
+public class InvalidArticleResponseException extends RuntimeException {
+    public InvalidArticleResponseException() {
+    }
+}
diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/RestClientApplication.java b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/RestClientApplication.java
new file mode 100644
index 0000000000..c411a8f74a
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/RestClientApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.restclient;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class RestClientApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(RestClientApplication.class, args);
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/restclient/RestClientIntegrationTest.java b/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/restclient/RestClientIntegrationTest.java
new file mode 100644
index 0000000000..1a615faf4e
--- /dev/null
+++ b/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/restclient/RestClientIntegrationTest.java
@@ -0,0 +1,166 @@
+package com.baeldung.restclient;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+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 org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestClient;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class RestClientIntegrationTest {
+
+	@LocalServerPort
+	private int port;
+	private String uriBase;
+	RestClient restClient = RestClient.create();
+
+	@Autowired
+	ObjectMapper objectMapper;
+
+	@BeforeEach
+	public void setup() {
+		uriBase = "http://localhost:" + port;
+	}
+
+	@AfterEach
+	public void teardown() {
+		restClient.delete()
+				.uri(uriBase + "/articles")
+				.retrieve()
+				.toBodilessEntity();
+	}
+
+	@Test
+	void shouldGetArticlesAndReturnString() {
+		String articlesAsString = restClient.get()
+				.uri(uriBase + "/articles")
+				.retrieve()
+				.body(String.class);
+
+		assertThat(articlesAsString).isEqualTo("");
+	}
+
+	@Test
+	void shouldPostAndGetArticles() {
+		Article article = new Article(1, "How to use RestClient");
+		restClient.post()
+				.uri(uriBase + "/articles")
+				.contentType(MediaType.APPLICATION_JSON)
+				.body(article)
+				.retrieve()
+				.toBodilessEntity();
+
+		List<Article> articles = restClient.get()
+				.uri(uriBase + "/articles")
+				.retrieve()
+				.body(new ParameterizedTypeReference<>() {});
+
+		assertThat(articles).isEqualTo(List.of(article));
+	}
+
+	@Test
+	void shouldPostAndGetArticlesWithExchange() {
+		assertThatThrownBy(this::getArticlesWithExchange).isInstanceOf(ArticleNotFoundException.class);
+
+		Article article = new Article(1, "How to use RestClient");
+		restClient.post()
+				.uri(uriBase + "/articles")
+				.contentType(MediaType.APPLICATION_JSON)
+				.body(article)
+				.retrieve()
+				.toBodilessEntity();
+
+		List<Article> articles = getArticlesWithExchange();
+
+		assertThat(articles).isEqualTo(List.of(article));
+	}
+
+	private List<Article> getArticlesWithExchange() {
+        return restClient.get()
+				.uri(uriBase + "/articles")
+				.exchange((request, response) -> {
+					if (response.getStatusCode().isSameCodeAs(HttpStatusCode.valueOf(204))) {
+						throw new ArticleNotFoundException();
+					} else if (response.getStatusCode().isSameCodeAs(HttpStatusCode.valueOf(200))) {
+						return objectMapper.readValue(response.getBody(), new TypeReference<>() {});
+					} else {
+						throw new InvalidArticleResponseException();
+					}
+				});
+	}
+
+	@Test
+	void shouldPostAndGetArticlesWithErrorHandling() {
+		assertThatThrownBy(() -> {
+				restClient.get()
+						.uri(uriBase + "/articles/1234")
+						.retrieve()
+						.onStatus(status -> status.value() == 404, (request, response) -> { throw new ArticleNotFoundException(); })
+						.body(new ParameterizedTypeReference<>() {});
+		}).isInstanceOf(ArticleNotFoundException.class);
+	}
+
+	@Test
+	void shouldPostAndPutAndGetArticles() {
+		Article article = new Article(1, "How to use RestClient");
+		restClient.post()
+				.uri(uriBase + "/articles")
+				.contentType(MediaType.APPLICATION_JSON)
+				.body(article)
+				.retrieve()
+				.toBodilessEntity();
+
+		Article articleChanged = new Article(1, "How to use RestClient even better");
+		restClient.put()
+				.uri(uriBase + "/articles/1")
+				.contentType(MediaType.APPLICATION_JSON)
+				.body(articleChanged)
+				.retrieve()
+ 				.toBodilessEntity();
+
+		List<Article> articles = restClient.get()
+				.uri(uriBase + "/articles")
+				.retrieve()
+				.body(new ParameterizedTypeReference<>() {});
+
+		assertThat(articles).isEqualTo(List.of(articleChanged));
+	}
+
+	@Test
+	void shouldPostAndDeleteArticles() {
+		Article article = new Article(1, "How to use RestClient");
+		restClient.post()
+				.uri(uriBase + "/articles")
+				.contentType(MediaType.APPLICATION_JSON)
+				.body(article)
+				.retrieve()
+				.toBodilessEntity();
+
+		restClient.delete()
+				.uri(uriBase + "/articles")
+				.retrieve()
+				.toBodilessEntity();
+
+		ResponseEntity<Void> entity = restClient.get()
+				.uri(uriBase + "/articles")
+				.accept(MediaType.APPLICATION_JSON)
+				.retrieve()
+				.toBodilessEntity();
+
+		assertThat(entity.getStatusCode()).isEqualTo(HttpStatusCode.valueOf(204));
+	}
+}
diff --git a/spring-boot-modules/spring-boot-actuator/pom.xml b/spring-boot-modules/spring-boot-actuator/pom.xml
index 1ccf436bbf..7f630fa96e 100644
--- a/spring-boot-modules/spring-boot-actuator/pom.xml
+++ b/spring-boot-modules/spring-boot-actuator/pom.xml
@@ -9,9 +9,10 @@
     <description>This is simple boot application for Spring boot actuator test</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>
@@ -39,16 +40,6 @@
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/endpoints/enabling/SecurityConfiguration.java b/spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/endpoints/enabling/SecurityConfiguration.java
index 894c24693e..20ee834d52 100644
--- a/spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/endpoints/enabling/SecurityConfiguration.java
+++ b/spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/endpoints/enabling/SecurityConfiguration.java
@@ -1,36 +1,56 @@
 package com.baeldung.endpoints.enabling;
 
 import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.crypto.factory.PasswordEncoderFactories;
-import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.servlet.util.matcher.MvcRequestMatcher;
+import org.springframework.web.servlet.handler.HandlerMappingIntrospector;
 
-@Configuration
 @EnableWebSecurity
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+@Configuration
+public class SecurityConfiguration {
 
-    @Override
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        PasswordEncoder encoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
-        auth.inMemoryAuthentication()
-          .withUser("user")
-          .password(encoder.encode("password"))
-          .roles("USER")
-          .and()
-          .withUser("admin")
-          .password(encoder.encode("admin"))
-          .roles("USER", "ADMIN");
+    @Bean
+    MvcRequestMatcher.Builder mvc(HandlerMappingIntrospector introspector) {
+        return new MvcRequestMatcher.Builder(introspector);
     }
 
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http.requestMatcher(EndpointRequest.toAnyEndpoint())
-          .authorizeRequests((requests) -> requests.anyRequest()
-            .hasRole("ADMIN"));
-        http.httpBasic();
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http, MvcRequestMatcher.Builder mvc) throws Exception {
+        http.httpBasic(Customizer.withDefaults());
+        http.securityMatcher(EndpointRequest.toAnyEndpoint());
+        http.authorizeHttpRequests(authz -> {
+                authz.requestMatchers(mvc.pattern("/actuator/**"))
+                    .hasRole("ADMIN")
+                    .anyRequest()
+                    .authenticated();
+            });
+
+        return http.build();
+    }
+
+
+
+    @Bean
+    public InMemoryUserDetailsManager userDetailsService() {
+        UserDetails user =  User.withDefaultPasswordEncoder()
+            .username("user")
+            .password("password")
+            .roles("USER")
+            .build();
+        UserDetails admin =  User.withDefaultPasswordEncoder()
+            .username("admin")
+            .password("password")
+            .roles("USER", "ADMIN")
+            .build();
+        return new InMemoryUserDetailsManager(user, admin);
     }
 }
diff --git a/spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/endpoints/info/User.java b/spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/endpoints/info/User.java
index db4e69127a..88f39d8ccc 100644
--- a/spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/endpoints/info/User.java
+++ b/spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/endpoints/info/User.java
@@ -1,9 +1,9 @@
 package com.baeldung.endpoints.info;
 
-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 = "users")
diff --git a/spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/metrics/MetricsApplication.java b/spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/metrics/MetricsApplication.java
index 729b3c0b96..ee87412986 100644
--- a/spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/metrics/MetricsApplication.java
+++ b/spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/metrics/MetricsApplication.java
@@ -15,7 +15,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.context.request.RequestContextListener;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 @EnableScheduling
 @ComponentScan("com.baeldung.metrics")
diff --git a/spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/metrics/filter/MetricFilter.java b/spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/metrics/filter/MetricFilter.java
index 0f7579f060..a7aaddf0fb 100644
--- a/spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/metrics/filter/MetricFilter.java
+++ b/spring-boot-modules/spring-boot-actuator/src/main/java/com/baeldung/metrics/filter/MetricFilter.java
@@ -7,14 +7,14 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 @Component
 public class MetricFilter implements Filter {
diff --git a/spring-boot-modules/spring-boot-actuator/src/test/java/com/baeldung/endpoints/enabling/EndpointEnablingIntegrationTest.java b/spring-boot-modules/spring-boot-actuator/src/test/java/com/baeldung/endpoints/enabling/EndpointEnablingIntegrationTest.java
index 8274619517..079195714b 100644
--- a/spring-boot-modules/spring-boot-actuator/src/test/java/com/baeldung/endpoints/enabling/EndpointEnablingIntegrationTest.java
+++ b/spring-boot-modules/spring-boot-actuator/src/test/java/com/baeldung/endpoints/enabling/EndpointEnablingIntegrationTest.java
@@ -13,20 +13,20 @@ import org.springframework.test.web.servlet.MockMvc;
 
 @SpringBootTest
 @AutoConfigureMockMvc
-public class EndpointEnablingIntegrationTest {
+class EndpointEnablingIntegrationTest {
     @Autowired
     private MockMvc mockMvc;
     
     @Test
     @WithMockUser(username = "user", password = "password", roles = "USER")
-    public void givenWrongAuthentication_whenCallingActuator_thenReturns401() throws Exception {
+    void givenWrongAuthentication_whenCallingActuator_thenReturns401() throws Exception {
         mockMvc.perform(get("/actuator"))
           .andExpect(status().isForbidden());
     }
     
     @Test
     @WithMockUser(username = "admin", password = "admin", roles = "ADMIN")
-    public void givenProperAuthentication_whenCallingActuator_thenReturnsExpectedEndpoints() throws Exception {
+    void givenProperAuthentication_whenCallingActuator_thenReturnsExpectedEndpoints() throws Exception {
         mockMvc.perform(get("/actuator"))
           .andExpect(jsonPath("$._links").exists())
           .andExpect(jsonPath("$._links.beans").exists())
diff --git a/spring-boot-modules/spring-boot-autoconfiguration/pom.xml b/spring-boot-modules/spring-boot-autoconfiguration/pom.xml
index 7a3f9f01e8..7880a033f8 100644
--- a/spring-boot-modules/spring-boot-autoconfiguration/pom.xml
+++ b/spring-boot-modules/spring-boot-autoconfiguration/pom.xml
@@ -10,9 +10,10 @@
     <description>This is simple boot application demonstrating a custom auto-configuration</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>
@@ -66,6 +67,13 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.baeldung.autoconfiguration.example.AutoconfigurationApplication</mainClass>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/spring-boot-modules/spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/MySQLAutoconfiguration.java b/spring-boot-modules/spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/MySQLAutoconfiguration.java
index 295e0d74c9..c470656597 100644
--- a/spring-boot-modules/spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/MySQLAutoconfiguration.java
+++ b/spring-boot-modules/spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/MySQLAutoconfiguration.java
@@ -3,10 +3,10 @@ package com.baeldung.autoconfiguration;
 import java.util.Arrays;
 import java.util.Properties;
 
-import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.autoconfigure.condition.ConditionMessage;
 import org.springframework.boot.autoconfigure.condition.ConditionMessage.Style;
@@ -20,7 +20,6 @@ import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.Ordered;
 import org.springframework.core.env.Environment;
@@ -31,7 +30,9 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.util.ClassUtils;
 
-@Configuration
+import jakarta.persistence.EntityManagerFactory;
+
+@AutoConfiguration
 @ConditionalOnClass(DataSource.class)
 @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE)
 @PropertySource("classpath:mysql.properties")
diff --git a/spring-boot-modules/spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/annotationprocessor/DatabaseProperties.java b/spring-boot-modules/spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/annotationprocessor/DatabaseProperties.java
index 4fb5b408a2..47f07c808f 100644
--- a/spring-boot-modules/spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/annotationprocessor/DatabaseProperties.java
+++ b/spring-boot-modules/spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/annotationprocessor/DatabaseProperties.java
@@ -1,11 +1,13 @@
 package com.baeldung.autoconfiguration.annotationprocessor;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
+
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+
 @Configuration
 @ConfigurationProperties(prefix = "database")
 public class DatabaseProperties {
diff --git a/spring-boot-modules/spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/example/MyUser.java b/spring-boot-modules/spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/example/MyUser.java
index 31ce0fd969..26a2e04e2f 100644
--- a/spring-boot-modules/spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/example/MyUser.java
+++ b/spring-boot-modules/spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/example/MyUser.java
@@ -1,7 +1,7 @@
 package com.baeldung.autoconfiguration.example;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 @Entity
 public class MyUser {
diff --git a/spring-boot-modules/spring-boot-autoconfiguration/src/main/resources/META-INF/spring.factories b/spring-boot-modules/spring-boot-autoconfiguration/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 11c775fc6c..0000000000
--- a/spring-boot-modules/spring-boot-autoconfiguration/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.baeldung.autoconfiguration.MySQLAutoconfiguration
diff --git a/spring-boot-modules/spring-boot-autoconfiguration/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-modules/spring-boot-autoconfiguration/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000000..ab28361814
--- /dev/null
+++ b/spring-boot-modules/spring-boot-autoconfiguration/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.baeldung.autoconfiguration.MySQLAutoconfiguration
diff --git a/spring-boot-modules/spring-boot-autoconfiguration/src/main/resources/mysql.properties b/spring-boot-modules/spring-boot-autoconfiguration/src/main/resources/mysql.properties
index 74f1ee1373..27092f852f 100644
--- a/spring-boot-modules/spring-boot-autoconfiguration/src/main/resources/mysql.properties
+++ b/spring-boot-modules/spring-boot-autoconfiguration/src/main/resources/mysql.properties
@@ -1,5 +1,5 @@
 usemysql=local
 
-mysql-hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+mysql-hibernate.dialect=org.hibernate.dialect.MySQLDialect
 mysql-hibernate.show_sql=true
 mysql-hibernate.hbm2ddl.auto=create-drop
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-bootstrap/pom.xml b/spring-boot-modules/spring-boot-bootstrap/pom.xml
index 4ceae26f60..da16f79a2a 100644
--- a/spring-boot-modules/spring-boot-bootstrap/pom.xml
+++ b/spring-boot-modules/spring-boot-bootstrap/pom.xml
@@ -9,9 +9,10 @@
     <description>Demo project for Spring Boot</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>
@@ -47,13 +48,12 @@
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
-            <version>${rest-assured.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${servlet.version}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cloud-connectors</artifactId>
+            <version>${spring-boot-cloud-connectors.version}</version>
         </dependency>
     </dependencies>
 
@@ -332,6 +332,7 @@
         <servlet.version>4.0.0</servlet.version>
         <spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
         <spring-cloud-gcp.version>1.0.0.RELEASE</spring-cloud-gcp.version>
+        <spring-boot-cloud-connectors.version>2.2.13.RELEASE</spring-boot-cloud-connectors.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-bootstrap/src/main/java/com/baeldung/config/SecurityConfig.java b/spring-boot-modules/spring-boot-bootstrap/src/main/java/com/baeldung/config/SecurityConfig.java
index ecb21cdf4b..c876e1c3d4 100644
--- a/spring-boot-modules/spring-boot-bootstrap/src/main/java/com/baeldung/config/SecurityConfig.java
+++ b/spring-boot-modules/spring-boot-bootstrap/src/main/java/com/baeldung/config/SecurityConfig.java
@@ -4,6 +4,7 @@ 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.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.web.SecurityFilterChain;
 
 @Configuration
@@ -12,12 +13,11 @@ public class SecurityConfig {
 
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        http.authorizeRequests()
-            .anyRequest()
-            .permitAll()
-            .and()
-            .csrf()
-            .disable();
+        http.authorizeHttpRequests(expressionInterceptUrlRegistry ->
+                        expressionInterceptUrlRegistry
+                                .anyRequest()
+                                .permitAll())
+                .csrf(AbstractHttpConfigurer::disable);
         return http.build();
     }
 }
diff --git a/spring-boot-modules/spring-boot-bootstrap/src/main/java/com/baeldung/persistence/model/Book.java b/spring-boot-modules/spring-boot-bootstrap/src/main/java/com/baeldung/persistence/model/Book.java
index 6be27d4cf0..d599c64567 100644
--- a/spring-boot-modules/spring-boot-bootstrap/src/main/java/com/baeldung/persistence/model/Book.java
+++ b/spring-boot-modules/spring-boot-bootstrap/src/main/java/com/baeldung/persistence/model/Book.java
@@ -1,10 +1,10 @@
 package com.baeldung.persistence.model;
 
-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 Book {
diff --git a/spring-boot-modules/spring-boot-documentation/pom.xml b/spring-boot-modules/spring-boot-documentation/pom.xml
index f0806b3c75..3ac2799258 100644
--- a/spring-boot-modules/spring-boot-documentation/pom.xml
+++ b/spring-boot-modules/spring-boot-documentation/pom.xml
@@ -93,8 +93,8 @@
 
     <properties>
         <swagger-core-jakarta.version>2.2.11</swagger-core-jakarta.version>
-        <springwolf-kafka.version>0.12.1</springwolf-kafka.version>
-        <springwolf-ui.version>0.8.0</springwolf-ui.version>
+        <springwolf-kafka.version>0.14.0</springwolf-kafka.version>
+        <springwolf-ui.version>0.14.0</springwolf-ui.version>
         <testcontainers-kafka.version>1.18.3</testcontainers-kafka.version>
     </properties>
 
diff --git a/spring-boot-modules/spring-boot-documentation/src/test/resources/asyncapi.json b/spring-boot-modules/spring-boot-documentation/src/test/resources/asyncapi.json
index 0198733c1c..45be27f571 100644
--- a/spring-boot-modules/spring-boot-documentation/src/test/resources/asyncapi.json
+++ b/spring-boot-modules/spring-boot-documentation/src/test/resources/asyncapi.json
@@ -18,7 +18,9 @@
         "operationId": "incoming-topic_publish",
         "description": "More details for the incoming topic",
         "bindings": {
-          "kafka": { }
+          "kafka": {
+            "bindingVersion": "0.4.0"
+          }
         },
         "message": {
           "schemaFormat": "application/vnd.oai.openapi+json;version=3.0.0",
@@ -32,7 +34,9 @@
             "$ref": "#/components/schemas/SpringKafkaDefaultHeadersIncomingPayloadDto"
           },
           "bindings": {
-            "kafka": { }
+            "kafka": {
+              "bindingVersion": "0.4.0"
+            }
           }
         }
       }
@@ -42,7 +46,9 @@
         "operationId": "outgoing-topic_subscribe",
         "description": "More details for the outgoing topic",
         "bindings": {
-          "kafka": { }
+          "kafka": {
+            "bindingVersion": "0.4.0"
+          }
         },
         "message": {
           "schemaFormat": "application/vnd.oai.openapi+json;version=3.0.0",
@@ -56,7 +62,9 @@
             "$ref": "#/components/schemas/SpringKafkaDefaultHeadersOutgoingPayloadDto"
           },
           "bindings": {
-            "kafka": { }
+            "kafka": {
+              "bindingVersion": "0.4.0"
+            }
           }
         }
       }
diff --git a/spring-boot-modules/spring-boot-graalvm-docker/Dockerfile b/spring-boot-modules/spring-boot-graalvm-docker/Dockerfile
new file mode 100644
index 0000000000..91a63074c1
--- /dev/null
+++ b/spring-boot-modules/spring-boot-graalvm-docker/Dockerfile
@@ -0,0 +1,3 @@
+FROM ubuntu:jammy
+COPY target/springboot-graalvm-docker /springboot-graalvm-docker
+CMD ["/springboot-graalvm-docker"]
diff --git a/spring-boot-modules/spring-boot-graalvm-docker/README.md b/spring-boot-modules/spring-boot-graalvm-docker/README.md
new file mode 100644
index 0000000000..10a764053e
--- /dev/null
+++ b/spring-boot-modules/spring-boot-graalvm-docker/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Create a GraalVM Docker Image](https://www.baeldung.com/java-graalvm-docker-image)
diff --git a/spring-boot-modules/spring-boot-graalvm-docker/pom.xml b/spring-boot-modules/spring-boot-graalvm-docker/pom.xml
new file mode 100644
index 0000000000..a3a1b148c2
--- /dev/null
+++ b/spring-boot-modules/spring-boot-graalvm-docker/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 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>
+
+    <groupId>com.baeldung</groupId>
+    <artifactId>spring-boot-graalvm-docker</artifactId>
+    <version>1.0.0</version>
+    <name>spring-boot-graalvm-docker</name>
+    <description>Spring Boot GrralVM with Docker</description>
+    <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>
+              <scope>test</scope>
+         </dependency>
+    </dependencies>
+    <build>
+         <plugins>
+              <plugin>
+                   <groupId>org.graalvm.buildtools</groupId>
+                   <artifactId>native-maven-plugin</artifactId>
+              </plugin>
+              <plugin>
+                   <groupId>org.springframework.boot</groupId>
+                   <artifactId>spring-boot-maven-plugin</artifactId>
+              </plugin>
+         </plugins>
+    </build>
+</project>
diff --git a/spring-boot-modules/spring-boot-graalvm-docker/src/main/java/com/baeldung/graalvmdockerimage/GraalvmDockerImageApplication.java b/spring-boot-modules/spring-boot-graalvm-docker/src/main/java/com/baeldung/graalvmdockerimage/GraalvmDockerImageApplication.java
new file mode 100644
index 0000000000..53e11aa749
--- /dev/null
+++ b/spring-boot-modules/spring-boot-graalvm-docker/src/main/java/com/baeldung/graalvmdockerimage/GraalvmDockerImageApplication.java
@@ -0,0 +1,24 @@
+package com.baeldung.graalvmdockerimage;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@SpringBootApplication
+public class GraalvmDockerImageApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(GraalvmDockerImageApplication.class, args);
+    }
+
+}
+
+@RestController
+class HelloController {
+    
+    @GetMapping
+    public String hello() {
+        return "Hello GraalVM";
+    }
+}
diff --git a/spring-boot-modules/spring-boot-graalvm-docker/src/main/resources/application.properties b/spring-boot-modules/spring-boot-graalvm-docker/src/main/resources/application.properties
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/spring-boot-modules/spring-boot-graalvm-docker/src/main/resources/application.properties
@@ -0,0 +1 @@
+
diff --git a/spring-boot-modules/spring-boot-jasypt/pom.xml b/spring-boot-modules/spring-boot-jasypt/pom.xml
index f48cd78595..70bbe35319 100644
--- a/spring-boot-modules/spring-boot-jasypt/pom.xml
+++ b/spring-boot-modules/spring-boot-jasypt/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.ulisesbocchio</groupId>
-            <artifactId>jasypt-spring-boot-starter</artifactId>
+                <artifactId>jasypt-spring-boot-starter</artifactId>
             <version>${jasypt.version}</version>
         </dependency>
         <dependency>
@@ -46,15 +46,7 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>spring-milestone</id>
-            <name>Spring Milestone</name>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-
     <properties>
-        <jasypt.version>2.0.0</jasypt.version>
+        <jasypt.version>3.0.5</jasypt.version>
     </properties>
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-keycloak-2/pom.xml b/spring-boot-modules/spring-boot-keycloak-2/pom.xml
index 39a7283328..7909e2e153 100644
--- a/spring-boot-modules/spring-boot-keycloak-2/pom.xml
+++ b/spring-boot-modules/spring-boot-keycloak-2/pom.xml
@@ -11,10 +11,9 @@
     <description>This is a simple application demonstrating integration between Keycloak and Spring Boot.</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</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-boot-modules/spring-boot-keycloak-adapters/pom.xml b/spring-boot-modules/spring-boot-keycloak-adapters/pom.xml
index 035c226b6d..34c0653fbd 100644
--- a/spring-boot-modules/spring-boot-keycloak-adapters/pom.xml
+++ b/spring-boot-modules/spring-boot-keycloak-adapters/pom.xml
@@ -11,10 +11,9 @@
     <description>This is a simple application demonstrating integration between Keycloak and Spring Boot.</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</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-boot-modules/spring-boot-keycloak/pom.xml b/spring-boot-modules/spring-boot-keycloak/pom.xml
index 64fb39d085..bada9ab52d 100644
--- a/spring-boot-modules/spring-boot-keycloak/pom.xml
+++ b/spring-boot-modules/spring-boot-keycloak/pom.xml
@@ -11,10 +11,9 @@
     <description>This is a simple application demonstrating integration between Keycloak and Spring Boot.</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</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-boot-modules/spring-boot-logging-log4j2/pom.xml b/spring-boot-modules/spring-boot-logging-log4j2/pom.xml
index b429339417..31c0f4bd02 100644
--- a/spring-boot-modules/spring-boot-logging-log4j2/pom.xml
+++ b/spring-boot-modules/spring-boot-logging-log4j2/pom.xml
@@ -9,10 +9,9 @@
     <description>Demo project for Spring Boot Logging with Log4J2</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</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-boot-modules/spring-boot-mvc-4/pom.xml b/spring-boot-modules/spring-boot-mvc-4/pom.xml
index dbbb03ad0e..0ae05a764b 100644
--- a/spring-boot-modules/spring-boot-mvc-4/pom.xml
+++ b/spring-boot-modules/spring-boot-mvc-4/pom.xml
@@ -9,9 +9,10 @@
     <description>Module For Spring Boot MVC Web</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>
diff --git a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/boot/controller/servlet/HelloWorldServlet.java b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/boot/controller/servlet/HelloWorldServlet.java
index 80c75aa8b5..cedc60bd92 100644
--- a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/boot/controller/servlet/HelloWorldServlet.java
+++ b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/boot/controller/servlet/HelloWorldServlet.java
@@ -4,10 +4,10 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Objects;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 public class HelloWorldServlet extends HttpServlet {
     private static final long serialVersionUID = 1L;
diff --git a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/boot/controller/servlet/SpringHelloWorldServlet.java b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/boot/controller/servlet/SpringHelloWorldServlet.java
index f276f94b7c..dbb8ea1b32 100644
--- a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/boot/controller/servlet/SpringHelloWorldServlet.java
+++ b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/boot/controller/servlet/SpringHelloWorldServlet.java
@@ -4,10 +4,10 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Objects;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 public class SpringHelloWorldServlet extends HttpServlet {
     private static final long serialVersionUID = 1L;
diff --git a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/common/error/SpringHelloServletRegistrationBean.java b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/common/error/SpringHelloServletRegistrationBean.java
index 3f51a4ab69..b2d6f249a5 100644
--- a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/common/error/SpringHelloServletRegistrationBean.java
+++ b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/common/error/SpringHelloServletRegistrationBean.java
@@ -2,7 +2,7 @@ package com.baeldung.common.error;
 
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 
-import javax.servlet.Servlet;
+import jakarta.servlet.Servlet;
 
 public class SpringHelloServletRegistrationBean extends ServletRegistrationBean {
 
diff --git a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/servlets/configuration/WebAppInitializer.java b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/servlets/configuration/WebAppInitializer.java
index eadd40355a..7fd83fd59a 100644
--- a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/servlets/configuration/WebAppInitializer.java
+++ b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/servlets/configuration/WebAppInitializer.java
@@ -4,9 +4,9 @@ import org.springframework.web.WebApplicationInitializer;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 import org.springframework.web.context.support.XmlWebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
 
 public class WebAppInitializer implements WebApplicationInitializer {
 
diff --git a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/servlets/servlets/GenericCustomServlet.java b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/servlets/servlets/GenericCustomServlet.java
index 49dd9404b7..ee70a142be 100644
--- a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/servlets/servlets/GenericCustomServlet.java
+++ b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/servlets/servlets/GenericCustomServlet.java
@@ -1,9 +1,9 @@
 package com.baeldung.servlets.servlets;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 
diff --git a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/servlets/servlets/javaee/AnnotationServlet.java b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/servlets/servlets/javaee/AnnotationServlet.java
index 992976ca0e..62706be348 100644
--- a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/servlets/servlets/javaee/AnnotationServlet.java
+++ b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/servlets/servlets/javaee/AnnotationServlet.java
@@ -1,10 +1,10 @@
 package com.baeldung.servlets.servlets.javaee;
 
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 @WebServlet(name = "AnnotationServlet", description = "Example Servlet Using Annotations", urlPatterns = { "/annotationservlet" })
diff --git a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/servlets/servlets/javaee/EEWebXmlServlet.java b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/servlets/servlets/javaee/EEWebXmlServlet.java
index c7b373064f..299a1b5d95 100644
--- a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/servlets/servlets/javaee/EEWebXmlServlet.java
+++ b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/servlets/servlets/javaee/EEWebXmlServlet.java
@@ -1,9 +1,9 @@
 package com.baeldung.servlets.servlets.javaee;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 
diff --git a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/utils/UtilsApplication.java b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/utils/UtilsApplication.java
index ce3eae7ce0..eab5869cd5 100644
--- a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/utils/UtilsApplication.java
+++ b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/utils/UtilsApplication.java
@@ -1,6 +1,6 @@
 package com.baeldung.utils;
 
-import javax.annotation.security.RolesAllowed;
+import jakarta.annotation.security.RolesAllowed;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/utils/controller/UtilsController.java b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/utils/controller/UtilsController.java
index 8c7f2f932a..40acc1801f 100644
--- a/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/utils/controller/UtilsController.java
+++ b/spring-boot-modules/spring-boot-mvc-4/src/main/java/com/baeldung/utils/controller/UtilsController.java
@@ -1,6 +1,6 @@
 package com.baeldung.utils.controller;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
diff --git a/spring-boot-modules/spring-boot-mvc-4/src/test/java/com/baeldung/utils/UtilsControllerIntegrationTest.java b/spring-boot-modules/spring-boot-mvc-4/src/test/java/com/baeldung/utils/UtilsControllerIntegrationTest.java
index 080f660c40..f59d00f871 100644
--- a/spring-boot-modules/spring-boot-mvc-4/src/test/java/com/baeldung/utils/UtilsControllerIntegrationTest.java
+++ b/spring-boot-modules/spring-boot-mvc-4/src/test/java/com/baeldung/utils/UtilsControllerIntegrationTest.java
@@ -1,32 +1,34 @@
 package com.baeldung.utils;
 
 import com.baeldung.utils.controller.UtilsController;
-import org.junit.Before;
-import org.junit.Test;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
-import org.mockito.MockitoAnnotations;
+
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
+import static org.mockito.MockitoAnnotations.openMocks;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-public class UtilsControllerIntegrationTest {
+class UtilsControllerIntegrationTest {
 
     @InjectMocks
     private UtilsController utilsController;
 
     private MockMvc mockMvc;
 
-    @Before
+    @BeforeEach
     public void setup() {
-        MockitoAnnotations.initMocks(this);
+        openMocks(this);
         this.mockMvc = MockMvcBuilders.standaloneSetup(utilsController).build();
 
     }
 
     @Test
-    public void givenParameter_setRequestParam_andSetSessionAttribute() throws Exception {
+    void givenParameter_setRequestParam_andSetSessionAttribute() throws Exception {
         String param = "testparam";
         this.mockMvc.perform(post("/setParam").param("param", param).sessionAttr("parameter", param)).andExpect(status().isOk());
     }
diff --git a/spring-boot-modules/spring-boot-mvc-birt/pom.xml b/spring-boot-modules/spring-boot-mvc-birt/pom.xml
index 274932f06c..cc4b7f8283 100644
--- a/spring-boot-modules/spring-boot-mvc-birt/pom.xml
+++ b/spring-boot-modules/spring-boot-mvc-birt/pom.xml
@@ -10,10 +10,9 @@
     <description>Module For Spring Boot Integration with BIRT</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</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-boot-modules/spring-boot-security/README.md b/spring-boot-modules/spring-boot-security/README.md
index d848f798ba..2fd9e77c92 100644
--- a/spring-boot-modules/spring-boot-security/README.md
+++ b/spring-boot-modules/spring-boot-security/README.md
@@ -11,7 +11,7 @@ This module contains articles about Spring Boot Security
 - [Disable Security for a Profile in Spring Boot](https://www.baeldung.com/spring-security-disable-profile)
 - [Spring @EnableWebSecurity vs. @EnableGlobalMethodSecurity](https://www.baeldung.com/spring-enablewebsecurity-vs-enableglobalmethodsecurity)
 - [Spring Security – Configuring Different URLs](https://www.baeldung.com/spring-security-configuring-urls)
-
+- [Difference Between permitAll() and anonymous() in Spring Security](https://www.baeldung.com/spring-security-permitall-vs-anonymous)
 
 ### Spring Boot Security Auto-Configuration
 
diff --git a/spring-boot-modules/spring-boot-ssl-bundles/README.md b/spring-boot-modules/spring-boot-ssl-bundles/README.md
new file mode 100644
index 0000000000..840cc21583
--- /dev/null
+++ b/spring-boot-modules/spring-boot-ssl-bundles/README.md
@@ -0,0 +1,2 @@
+## Relevant Articles
+- [Securing Spring Boot 3 Applications With SSL Bundles](https://www.baeldung.com/spring-boot-security-ssl-bundles)
diff --git a/spring-boot-modules/spring-boot-ssl-bundles/pom.xml b/spring-boot-modules/spring-boot-ssl-bundles/pom.xml
new file mode 100644
index 0000000000..4802e9ec58
--- /dev/null
+++ b/spring-boot-modules/spring-boot-ssl-bundles/pom.xml
@@ -0,0 +1,56 @@
+<?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>parent-boot-3</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-3</relativePath>
+    </parent>
+    <artifactId>springbootsslbundles</artifactId>
+    <name>spring-boot-ssl-bundles</name>
+    <packaging>jar</packaging>
+    <description>Module for showing usage of SSL Bundles</description>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</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.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5-fluent</artifactId>
+            <version>${apache.client5.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <apache.client5.version>5.0.3</apache.client5.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SSLBundlesApp.java b/spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SSLBundlesApp.java
new file mode 100644
index 0000000000..f6cfb35d1e
--- /dev/null
+++ b/spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SSLBundlesApp.java
@@ -0,0 +1,19 @@
+package com.baeldung.springbootsslbundles;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.boot.ssl.SslBundles;
+
+@SpringBootApplication
+public class SSLBundlesApp {
+    public static void main(String[] args) {
+        SpringApplication.run(SSLBundlesApp.class, args);
+    }
+    @Bean
+    public RestTemplate restTemplate(RestTemplateBuilder restTemplateBuilder, SslBundles sslBundles) {
+        return restTemplateBuilder.setSslBundle(sslBundles.getBundle("secure-service")).build();
+    }
+}
diff --git a/spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SecureRestTemplateConfig.java b/spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SecureRestTemplateConfig.java
new file mode 100644
index 0000000000..48eda219dd
--- /dev/null
+++ b/spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SecureRestTemplateConfig.java
@@ -0,0 +1,38 @@
+package com.baeldung.springbootsslbundles;
+
+import org.apache.hc.client5.http.classic.HttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ssl.NoSuchSslBundleException;
+import org.springframework.boot.ssl.SslBundle;
+import org.springframework.boot.ssl.SslBundles;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import javax.net.ssl.SSLContext;
+
+@Component
+public class SecureRestTemplateConfig {
+    private final SSLContext sslContext;
+
+    @Autowired
+    public SecureRestTemplateConfig(SslBundles sslBundles) throws NoSuchSslBundleException {
+        SslBundle sslBundle = sslBundles.getBundle("secure-service");
+        this.sslContext = sslBundle.createSslContext();
+    }
+
+    @Bean
+    public RestTemplate secureRestTemplate() {
+        final SSLConnectionSocketFactory sslSocketFactory = SSLConnectionSocketFactoryBuilder.create().setSslContext(this.sslContext).build();
+        final HttpClientConnectionManager cm = PoolingHttpClientConnectionManagerBuilder.create().setSSLSocketFactory(sslSocketFactory).build();
+        HttpClient httpClient = HttpClients.custom().setConnectionManager(cm).evictExpiredConnections().build();
+        HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory(httpClient);
+        return new RestTemplate(factory);
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SecureServiceRestApi.java b/spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SecureServiceRestApi.java
new file mode 100644
index 0000000000..3ed919b957
--- /dev/null
+++ b/spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SecureServiceRestApi.java
@@ -0,0 +1,28 @@
+package com.baeldung.springbootsslbundles;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+@Service
+public class SecureServiceRestApi {
+    private final RestTemplate restTemplate;
+
+    @Autowired
+    public SecureServiceRestApi(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
+
+    public String fetchData(String dataId) {
+        ResponseEntity<String> response = restTemplate.exchange(
+                "https://secure-service.com/api/data/{id}",
+                HttpMethod.GET,
+                null,
+                String.class,
+                dataId
+        );
+        return response.getBody();
+    }
+}
diff --git a/spring-boot-modules/spring-boot-ssl-bundles/src/main/resources/application.yml b/spring-boot-modules/spring-boot-ssl-bundles/src/main/resources/application.yml
new file mode 100644
index 0000000000..1598645805
--- /dev/null
+++ b/spring-boot-modules/spring-boot-ssl-bundles/src/main/resources/application.yml
@@ -0,0 +1,11 @@
+spring:
+  ssl:
+    bundle:
+      jks:
+        secure-service:
+          key:
+            alias: "secure-service"
+          keystore:
+            location: "classpath:keystore.p12"
+            password: "FooBar"
+            type: "PKCS12"
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-ssl-bundles/src/main/resources/cert.pem b/spring-boot-modules/spring-boot-ssl-bundles/src/main/resources/cert.pem
new file mode 100644
index 0000000000..82ed122a80
--- /dev/null
+++ b/spring-boot-modules/spring-boot-ssl-bundles/src/main/resources/cert.pem
@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIUCJcVMwyhLy/ln+ENMXbSWcsO0aswDQYJKoZIhvcNAQEL
+BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMzA5MDUxNjAyMzdaFw0yNDA5
+MDQxNjAyMzdaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQDMNn+ZmPfR4FUyG6PVGBB2rOAnIHqFqYMVyDUOtZja
+9CxpgbQjHRwwWaUWcYzLPOsvN/tMC8BazAFHSI2KIeNKgjAesv9JTumqgFXdOmw8
+KT7a9C1IQXnCMhlbp9J7c7CLvjAvZvZBghxFLc7xBZo9rWA67QMZoOhXvdMoKv4G
+5v9qD1ZqIKlCxJQrdErVUKyZPztlIWNqzPy9BJzFlBea2ArfrASulqJuWGyO09+o
+6ABNgUAicp/zfCOeKIe9cni0oZj6Buwk4eVdYESzVohBO52h95KtN17Y/Tw+U8W5
+Szq9tit6Vkupbe8tih7Bkdnj22WeCLVwWdXCp1kJw2kFDJTiC3wQRa6P0OrVpPGx
+Z5SmG9eSCz22alA+I521ZG85hmPDt3BleYRYlCtcW7GFT/7zLBEwlN93lY5Os1jj
+PRS8o5eIg8UhTbU4QEaZRYcLzaFy0asfKfa4ZF3mH5whh/w07SEEBAKDfQPpiz3T
+migd+r9qUnPWeoE8Hi7lA1KzUd4YeM2yNHqXoQiARjHkM4yrX6vVlfT+itVbrpqF
+a5J7PjL26w+DsxvRt9Ad5gpOdDzuy5m2V6lphMDjeZoG4OXgBzQQ1YxK1r6wkI4U
+ZwRNrb+BxmQebQHnXKEXI7jgS45uoFENwolIHm9Dou5VYGLI0z+/pDReugCcw2lO
+/QIDAQABo1MwUTAdBgNVHQ4EFgQUlSkON/OM9HCXeaQ7VWQuiEwY2iAwHwYDVR0j
+BBgwFoAUlSkON/OM9HCXeaQ7VWQuiEwY2iAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAgEAD+8sPSQR3+A4F9z704OOy1Mo6bvbnIuK9UdN7d4/zh+e
+AoloyTFPLPZIldg9hXwCvrKjrfqS5YUKmXIp9tetX7ns13CeDFcqVwZfPnqjzdNN
+ad255LEwMjIUm9hSNEV6AQBKW8E+a590SrUamEdkFm4fcUB1LaINwyJjls7C0VB2
+JL50OloaUlv0IMnAPRVp0Adlt9xs69R2B8Q4i297FvHB1PI7VMLYqNnX2+tnvszO
+HvWtIqm6foyReDLfC0n87cuEBV7/9304V5vgEj20TR19isd0LffJDD1ujDXvN8dS
+uGOB1VLRxAPonr9Iqk358EJ1T22uEcMdKE+sMnCBjw2fYIYRfjhGN+m6U6sb4MrF
+zFUI6qB7W7T/5iukiRb4pLQ0OGgKOwYxpZoxcB3Ldjo5x58uKNOTNJ5zEJ8HUofA
+BNfty10D3m3DlSyYbf7m1UUM0jj2l83LBGQzhGGUZgCnCsMczLrj64Gvf2iLGmCF
+gu5zrxL01dptBkvTsYJwYBA67BBS4FcgYNMGx3m1uPsVUUIguJxufXWYfbub74QV
+a1SH1NjO8HR3DLDU+S92tyTKWOUzJ5qOegEsR2cutVRzDuVTsFy7kayuNv/uLRrG
+3P2HnUo8PG/nmysReBk6CGycUiDTt55DoPYGoQ5l19xTlkIt7ulNg7yX5pwFMeE=
+-----END CERTIFICATE-----
diff --git a/spring-boot-modules/spring-boot-ssl-bundles/src/main/resources/key.pem b/spring-boot-modules/spring-boot-ssl-bundles/src/main/resources/key.pem
new file mode 100644
index 0000000000..b4202e9a8e
--- /dev/null
+++ b/spring-boot-modules/spring-boot-ssl-bundles/src/main/resources/key.pem
@@ -0,0 +1,54 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIJpDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIblni8xi+83QCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJSRFMcxzIKiBIIJUEqyZcVQEBL1
+6jkeo5TGxVwolLnCNpEuj8UwLoK5Z2N5oVwSPzD5rMYuPg6OXXWk6zReaaKBkRR2
+vlpkckA4o+aSXfzvEXYGd+rZ3EeIK43zquIBjymlcN++FbEYOtAY1SoQm7FtyvdN
+4QW7MOONUJcnN3EgRSRic2CCa0k6NSREfrBWaa+OcYB4C/JEuA2xgkCUw8bCcos6
+mksoF6mZDQearirNankMDR7gLQt9pdK7S55T4sCrFpL072s3k7lV0WtvTE/CQ8Wu
+pdBKVPvpvkR1S9n3ajGMWVYBjkRuD0MMn1eGMW6t3mRI8+C15zTp9DjzySJTMzUm
+C3l/m9VQBFewuHLziJFylqy7kgxrUUe39FShHYkJZDprZSYE33Lz67o8oHpLkkIh
+YccDm2bgqIbKfslbAIXD4BKq0QOUbi681XGRslZ7ZGduwNm3Xly0yuKmstzhnqQu
+TLkBWcNeauYA7eeTTwAQq5My/xt+Ls72AwjOjP3kGSNCvmrLBP+4zpJayr+l+OYl
+r5G6YNGE3p3QVY/Wn05OWeRE6eVqp1BXvgeLdqNyQXNpPITas0LDeVncexTNilNc
+R788Le77m6grpxaX4xKbMKf1dtsRtPf+LvVNAdfVj9lQcEvi3ub0yjKGUhtRuxKi
+STvVyJkJM7mV3FsUsYwsJZ2rBXbB2ifz6RCa8BDDwLGqZ54AZcK7OyvS6yRXf2ip
+jZ2N09OIoN3WaTXytueqEPmiZ+M8Sirt9YLzNa74BrWsqyazUYMtib1exhp6EVPH
+EVh+SlTdwQ//tPZNBx8TCB1s+bOHyzplXZ8JVg+AiuvZtyP20jS6oil2qvOcLR94
+e1hQaIPy6QXFFOTcDnmcTmUnaJKBvPFfqSVg58OeMb3RyQkZWvTkoxiE6PZwh3d1
+hqVzb+l91GDiLbYndGE1QrqBmxbGzM7PKqUr91cWBU8723CqGciWK+bjk4CxWx/F
+yHX6nDwDgfuhPe90r7Xrjj9/61/xoaWhg25BZVOgn/e1akDK+8qjHxDhc/anE7xS
+DIefhiukPuj/7oaxRIe/pKndztVub3W9EbyvHJArU+H6Ixy4qaulCXymp7Hqo/07
+4dUCVz2AGAIWqC0X6jUO8j2iHuOgbQg/oZFYOl8zn4q1ic1pFp/MJWaaWG9rAXPt
+miT34Rv8lvJW9nqKAGuW8uRJ6xqyw8DcpmOMjFamPOZ8H66aOOsVJwTFmg3YlUAh
+Cy3ITprdDbLPuX8MLJB7hJxKrqpXpnaY68x1MXAfp3tPkQ41u3Eif8riVY33+XEJ
+9OZN8Xwnv+spej8CGmjiNP7WhvyjLJnzsTycXR3BE1TL9IzrKoebdiE1pVUv5tcL
+lFCl5eatcxuU03JFQt+DjhcMBuM2AT2dfZ4WyHm2kKbOVTQA5snSFwpLt1ZS2G64
+7XCvx+zLbloqzRZkcKCr7hXgmpWLOECp2Wk98E2iHOHVkMINE5kB+iIXsg2Ii8pN
+8UwIDF4VHF/c3hTESFrY3tVIYGauB9hqcBU4NDcZNRuRd6MSx9NZe55xzJ7uR4oV
+Et0yNkmluk/EySpMrwLhe6t5I8vQEP9Ug00yobUuRob6rSp2pjkmRm2aPu4q042B
+JFqGGwZWTXoa7+THIua9xWQh4Bmz7UZ6oO9rBll5pmoNO8SzaJwF1ZzE9RL2iFQW
+px9u+85ee9+a6aQhvZjX0C/XYt0oHeoWpeoLTb97nGlZEv1GouHkjgNKLmcgz0Kd
+WugrakcxJolplqfQmPaoPWGMT3ukXauyvSOFrG7eJKrzQSrv2GSqKsvHLgqvtqeL
+cDjwESbSHRdGBvEz/L/XJfIba6jOI76GtbWFi9Co872V7SkNWHqOdwcEbb06phxH
+1u+ZUy0caU8rLe9exLg1/VLkEDHPy4aSOkkcCkptWG/UwjGOa5HOMPzWDsayDeDT
+7bFZlgl11ZZGoRAW+GZkHUCRglLqxKA1lSyK7Pv7cVXe6wniPbfMnyjZQZnRIk+q
+UFr7hc2Buw1nISmRF6vx1jdwfA5A/ECNCCCHZ+XQhOO3xcKZeG6FGjr11oHK0H1g
+aJve3tkrSYC4nXZfE7Lij5Cx+S1wTfZ8G+fGlSQa2jdsJUfRBy/TXkIorApbzFc1
+P1x05HXzSnMhLUWFYRqLWSVdBQua0w/CYyKEOPZUaFCRa67u1NLH0plA/j7h39ZA
+1uTceFbjYQHTAObsNu5z/zaHd+xTc3WN9NFuXQKGxFdgs+duEZk1XZnD3V3DIlbJ
+YobwhOiVLelUzBQZBYKEo2LJ71E0oOjIiq0TiCy5YsB9UGl9Un3jn50cKrq7IldF
+MQLBl+ixbOLQ0KbVs7K1P7AegQwfgdmvG4jdjFx5Myq77GHgCgmtvngCYJjrF1Vo
+OLxrKjk7dZ+Hmy60zPjgYkHyvOdZRUKfIhZrpCM5Al/xKUqhR6rPtr2U7lkHw9zT
+gsK6rxXfvmJjIzSFBQzBah8K9rYzk/DScXMQ+3XY7fu6r2LTnfWxCKYhX/2eEoXW
+/+t0HsRNoGCLB9g8sDAt2tDbjOsGRIdtfQ28Q56Pi91+IlGE5/n4iJ/bws5F1MXB
+amG44iYYNPHUnkr3YsQeCiyh/1GgiLbIi3P6ZVJ5vG1a5oPGNolsABMZ5HZzd/aD
+LgZDFjIMDzL5WaP2xhfnTjQsaowpulLE0/7mrc5KnfKxwdlDmLGjLIRsa5fXbL6W
+rqezhAkgRrGRhnljMnCgZGpkHMtZN3S0u78/u17FvtlbyDFOev1y9cpvMmp/RAP3
+OXp7Wo3JELz/7aMkmVt6a++j9hxuX0vas6PPCoM0PGlTdWxPo2y96fFuW41j59vh
+XY54kI5sBFibuvxLJOr9lXw8EuXJTNiyKuoEoXu2QKNHYSOZi1OPzrJRsKxEwNBh
+8TP1G99H/gdlYEI/CPYOGbhWMq1qZyukDHjQaOMdzRIRYawx4GbQE1HeGla5bFSy
+n0Gki5ApqQk8b6muUxDXBgPdQKFL6o7KYhAg+8JsGvnByh7qVZl2kmwxjx2bJIcj
+o7BBRSYLSWdW3cguXojtgoN2NcFZZON4IEDSBuu/1ESgi2a2W5T9NClK/3ZagPmJ
+hX2T2qTTkVjWQ+xM15SD46s4s+5nZX2kGE1DHwtYSKgdHYR9n81po7CuEqVP1n/G
+7NNrMLXj3PGrZ2vzKDGSAU1LzLOUrJ4m
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/spring-boot-modules/spring-boot-ssl-bundles/src/main/resources/keystore.p12 b/spring-boot-modules/spring-boot-ssl-bundles/src/main/resources/keystore.p12
new file mode 100644
index 0000000000..f58b355467
Binary files /dev/null and b/spring-boot-modules/spring-boot-ssl-bundles/src/main/resources/keystore.p12 differ
diff --git a/spring-boot-modules/spring-boot-ssl-bundles/src/main/resources/static/index.html b/spring-boot-modules/spring-boot-ssl-bundles/src/main/resources/static/index.html
new file mode 100644
index 0000000000..117910cc89
--- /dev/null
+++ b/spring-boot-modules/spring-boot-ssl-bundles/src/main/resources/static/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Spring SSL Bundler Demo Application</title>
+</head>
+<body>
+<h1>Spring SSL Bundler Demo Application</h1>
+<p>
+    This is a sample application that can be built as native executable.
+</p>
+</body>
+</html>
diff --git a/spring-boot-modules/spring-boot-ssl-bundles/src/test/java/com/baeldung/springbootsslbundles/SpringContextTest.java b/spring-boot-modules/spring-boot-ssl-bundles/src/test/java/com/baeldung/springbootsslbundles/SpringContextTest.java
new file mode 100644
index 0000000000..6c9a2fb3f0
--- /dev/null
+++ b/spring-boot-modules/spring-boot-ssl-bundles/src/test/java/com/baeldung/springbootsslbundles/SpringContextTest.java
@@ -0,0 +1,12 @@
+package com.baeldung.springbootsslbundles;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class SpringContextTest {
+    @Test
+    void contextLoads() {
+
+    }
+}
diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/spytest/ExternalAlertService.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/spytest/ExternalAlertService.java
new file mode 100644
index 0000000000..fd321a0e68
--- /dev/null
+++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/spytest/ExternalAlertService.java
@@ -0,0 +1,6 @@
+package com.baeldung.spytest;
+
+public interface ExternalAlertService {
+    public boolean alert(Order order);
+
+}
diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/spytest/NotificationService.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/spytest/NotificationService.java
new file mode 100644
index 0000000000..f0b2f92bee
--- /dev/null
+++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/spytest/NotificationService.java
@@ -0,0 +1,18 @@
+package com.baeldung.spytest;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class NotificationService {
+
+    private ExternalAlertService externalAlertService;
+
+    public void notify(Order order) {
+        System.out.println(order);
+    }
+
+    public boolean raiseAlert(Order order) {
+        return externalAlertService.alert(order);
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/spytest/Order.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/spytest/Order.java
new file mode 100644
index 0000000000..23f5a05e9d
--- /dev/null
+++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/spytest/Order.java
@@ -0,0 +1,49 @@
+package com.baeldung.spytest;
+
+import java.util.UUID;
+
+public class Order {
+
+    private UUID id;
+
+    private String name;
+
+    private OrderType orderType;
+
+    private double orderQuantity;
+
+    private String address;
+
+    public Order(UUID id, String name, double orderQuantity, String address) {
+        this.id = id;
+        this.name = name;
+        this.orderQuantity = orderQuantity;
+        this.address = address;
+    }
+
+    public enum OrderType {
+        INDIVIDUAL, BULK;
+    }
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public double getOrderQuantity() {
+        return orderQuantity;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+}
+
+
diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/spytest/OrderRepository.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/spytest/OrderRepository.java
new file mode 100644
index 0000000000..90fe5ba2b8
--- /dev/null
+++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/spytest/OrderRepository.java
@@ -0,0 +1,19 @@
+package com.baeldung.spytest;
+
+import java.util.HashMap;
+import java.util.UUID;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class OrderRepository {
+
+    public static final HashMap<UUID, Order> orders = new HashMap<>();
+
+    public Order save(Order order) {
+        UUID orderId = UUID.randomUUID();
+        order.setId(orderId);
+        orders.put(UUID.randomUUID(), order);
+        return order;
+    }
+}
diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/spytest/OrderService.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/spytest/OrderService.java
new file mode 100644
index 0000000000..47647b8721
--- /dev/null
+++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/spytest/OrderService.java
@@ -0,0 +1,25 @@
+package com.baeldung.spytest;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class OrderService {
+
+    public final OrderRepository orderRepository;
+
+    public final NotificationService notificationService;
+
+    public OrderService(OrderRepository orderRepository, NotificationService notificationService) {
+        this.orderRepository = orderRepository;
+        this.notificationService = notificationService;
+    }
+
+    public Order save(Order order) {
+        order = orderRepository.save(order);
+        notificationService.notify(order);
+        if (!notificationService.raiseAlert(order)) {
+            throw new RuntimeException("Alert not raised");
+        }
+        return order;
+    }
+}
diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/spytest/SpyTestApplication.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/spytest/SpyTestApplication.java
new file mode 100644
index 0000000000..d8d81378df
--- /dev/null
+++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/spytest/SpyTestApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.spytest;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpyTestApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpyTestApplication.class, args);
+    }
+
+}
diff --git a/spring-boot-modules/spring-boot-testing-2/src/test/java/com/baeldung/spytest/OrderServiceIntegrationTest.java b/spring-boot-modules/spring-boot-testing-2/src/test/java/com/baeldung/spytest/OrderServiceIntegrationTest.java
new file mode 100644
index 0000000000..96c7b09dfc
--- /dev/null
+++ b/spring-boot-modules/spring-boot-testing-2/src/test/java/com/baeldung/spytest/OrderServiceIntegrationTest.java
@@ -0,0 +1,35 @@
+package com.baeldung.spytest;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
+
+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.boot.test.mock.mockito.SpyBean;
+
+@SpringBootTest
+class OrderServiceIntegrationTest {
+
+    @Autowired
+    OrderRepository orderRepository;
+    @SpyBean
+    NotificationService notificationService;
+    @SpyBean
+    OrderService orderService;
+
+    @Test
+    void givenNotificationServiceIsUsingSpyBean_whenOrderServiceIsCalled_thenNotificationServiceSpyBeanShouldBeInvoked() {
+
+        Order orderInput = new Order(null, "Test", 1.0, "17 St Andrews Croft, Leeds ,LS17 7TP");
+        doReturn(true).when(notificationService)
+            .raiseAlert(any(Order.class));
+        Order order = orderService.save(orderInput);
+        Assertions.assertNotNull(order);
+        Assertions.assertNotNull(order.getId());
+        verify(notificationService).notify(any(Order.class));
+    }
+
+}
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-testing-2/src/test/java/com/baeldung/spytest/OrderServiceUnitTest.java b/spring-boot-modules/spring-boot-testing-2/src/test/java/com/baeldung/spytest/OrderServiceUnitTest.java
new file mode 100644
index 0000000000..21ae849bcf
--- /dev/null
+++ b/spring-boot-modules/spring-boot-testing-2/src/test/java/com/baeldung/spytest/OrderServiceUnitTest.java
@@ -0,0 +1,41 @@
+package com.baeldung.spytest;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
+
+import java.util.UUID;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Spy;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+@ExtendWith(SpringExtension.class)
+class OrderServiceUnitTest {
+
+    @Spy
+    OrderRepository orderRepository;
+    @Spy
+    NotificationService notificationService;
+    @InjectMocks
+    OrderService orderService;
+
+    @Test
+    void givenNotificationServiceIsUsingSpy_whenOrderServiceIsCalled_thenNotificationServiceSpyShouldBeInvoked() {
+
+        UUID orderId = UUID.randomUUID();
+        Order orderInput = new Order(orderId, "Test", 1.0, "17 St Andrews Croft, Leeds ,LS17 7TP");
+        doReturn(orderInput).when(orderRepository)
+            .save(any());
+        doReturn(true).when(notificationService)
+            .raiseAlert(any(Order.class));
+        Order order = orderService.save(orderInput);
+        Assertions.assertNotNull(order);
+        Assertions.assertEquals(orderId, order.getId());
+        verify(notificationService).notify(any(Order.class));
+    }
+
+}
\ No newline at end of file
diff --git a/spring-cloud-modules/pom.xml b/spring-cloud-modules/pom.xml
index 9c926bbe61..b21b208414 100644
--- a/spring-cloud-modules/pom.xml
+++ b/spring-cloud-modules/pom.xml
@@ -27,11 +27,11 @@
         <module>spring-cloud-gateway</module>
         <module>spring-cloud-gateway-2</module>
         <module>spring-cloud-stream</module>
-        <module>spring-cloud-stream-starters</module>
+        <!--        <module>spring-cloud-stream-starters</module>-->
         <module>spring-cloud-connectors-heroku</module>
         <module>spring-cloud-aws</module>
         <module>spring-cloud-consul</module>
-        <module>spring-cloud-zuul-eureka-integration</module>
+        <!--        <module>spring-cloud-zuul-eureka-integration</module>-->
         <!--        <module>spring-cloud-contract</module>-->
         <module>spring-cloud-kubernetes</module>
         <module>spring-cloud-open-service-broker</module>
@@ -46,7 +46,7 @@
         <!--        <module>spring-cloud-circuit-breaker</module>-->
         <module>spring-cloud-eureka-self-preservation</module>
         <module>spring-cloud-openfeign</module>
-        <module>spring-cloud-netflix-feign</module>
+        <!--        <module>spring-cloud-netflix-feign</module>-->
         <module>spring-cloud-netflix-sidecar</module>
         <module>spring-cloud-sentinel</module>
         <module>spring-cloud-dapr</module>
diff --git a/spring-cloud-modules/spring-cloud-archaius/pom.xml b/spring-cloud-modules/spring-cloud-archaius/pom.xml
index 4d7ca3943d..3e90c7390c 100644
--- a/spring-cloud-modules/spring-cloud-archaius/pom.xml
+++ b/spring-cloud-modules/spring-cloud-archaius/pom.xml
@@ -40,6 +40,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-archaius</artifactId>
+            <version>${spring-cloud-starter-netflix-archaius.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -54,7 +55,8 @@
     </dependencies>
 
     <properties>
-        <spring-cloud-dependencies.version>2.0.3.RELEASE</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2.2.10.RELEASE</spring-cloud-dependencies.version>
+        <spring-cloud-starter-netflix-archaius.version>2.2.10.RELEASE</spring-cloud-starter-netflix-archaius.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-dynamodb-config/pom.xml b/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-dynamodb-config/pom.xml
index 6e25ace6a8..600fedc774 100644
--- a/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-dynamodb-config/pom.xml
+++ b/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-dynamodb-config/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <scope>provided</scope>
+            <version>${lombok.version}</version>
         </dependency>
     </dependencies>
 
@@ -44,6 +44,7 @@
         <aws.sdk.dynamo.version>1.11.407</aws.sdk.dynamo.version>
         <spring.dynamo.version>5.0.3</spring.dynamo.version>
         <archaius.version>0.7.6</archaius.version>
+        <lombok.version>1.18.26</lombok.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-extra-configs/pom.xml b/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-extra-configs/pom.xml
index f90570abc2..383ad6a780 100644
--- a/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-extra-configs/pom.xml
+++ b/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-extra-configs/pom.xml
@@ -37,6 +37,22 @@
         </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
+                        --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <spring-cloud-dependencies.version>2.0.1.RELEASE</spring-cloud-dependencies.version>
     </properties>
diff --git a/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-jdbc-config/pom.xml b/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-jdbc-config/pom.xml
index 7fb5747739..2871f129b5 100644
--- a/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-jdbc-config/pom.xml
+++ b/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-jdbc-config/pom.xml
@@ -27,6 +27,15 @@
             <artifactId>h2</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+        </dependency>
     </dependencies>
 
+    <properties>
+        <lombok.version>1.18.26</lombok.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/README.md b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/README.md
new file mode 100644
index 0000000000..b76ae19f26
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/README.md
@@ -0,0 +1,7 @@
+## Spring Cloud Gateway
+
+This module contains articles about Spring Cloud Gateway
+
+### Relevant Articles:
+
+- [Exploring the New Spring Cloud Gateway](http://www.baeldung.com/spring-cloud-gateway)
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/pom.xml
new file mode 100644
index 0000000000..3d64edc338
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/pom.xml
@@ -0,0 +1,54 @@
+<?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>
+    <artifactId>gateway-2</artifactId>
+    <name>gateway-2</name>
+    <packaging>jar</packaging>
+
+    <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.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit-jupiter.version}</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>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-gateway</artifactId>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <spring-cloud-dependencies.version>2021.0.3</spring-cloud-dependencies.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplication.java
new file mode 100644
index 0000000000..e209b6cdf0
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplication.java
@@ -0,0 +1,15 @@
+package com.baeldung.springcloudgateway.custompredicates;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+
+@SpringBootApplication
+public class CustomPredicatesApplication {
+
+    public static void main(String[] args) {
+        new SpringApplicationBuilder(CustomPredicatesApplication.class)
+          .profiles("customroutes")
+          .run(args);
+    }
+
+}
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/config/CustomPredicatesConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/config/CustomPredicatesConfig.java
new file mode 100644
index 0000000000..ea58eb7e46
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/config/CustomPredicatesConfig.java
@@ -0,0 +1,43 @@
+package com.baeldung.springcloudgateway.custompredicates.config;
+
+import org.springframework.cloud.gateway.route.RouteLocator;
+import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.baeldung.springcloudgateway.custompredicates.factories.GoldenCustomerRoutePredicateFactory;
+import com.baeldung.springcloudgateway.custompredicates.factories.GoldenCustomerRoutePredicateFactory.Config;
+import com.baeldung.springcloudgateway.custompredicates.service.GoldenCustomerService;
+
+@Configuration
+public class CustomPredicatesConfig {
+    
+    
+    @Bean
+    public GoldenCustomerRoutePredicateFactory goldenCustomer(GoldenCustomerService goldenCustomerService) {
+        return new GoldenCustomerRoutePredicateFactory(goldenCustomerService);
+    }
+    
+
+    //@Bean
+    public RouteLocator routes(RouteLocatorBuilder builder, GoldenCustomerRoutePredicateFactory gf ) {
+
+        return builder.routes()
+          .route("dsl_golden_route", r -> 
+            r.predicate(gf.apply(new Config(true, "customerId")))
+             .and()
+             .path("/dsl_api/**")
+             .filters(f -> f.stripPrefix(1))
+             .uri("https://httpbin.org")
+          )
+          .route("dsl_common_route", r -> 
+             r.predicate(gf.apply(new Config(false, "customerId")))
+              .and()
+              .path("/dsl_api/**")
+              .filters(f -> f.stripPrefix(1))
+              .uri("https://httpbin.org")
+              )             
+          .build();
+    }
+    
+}
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java
new file mode 100644
index 0000000000..cb5c3a0b50
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java
@@ -0,0 +1,102 @@
+/**
+ * 
+ */
+package com.baeldung.springcloudgateway.custompredicates.factories;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Predicate;
+
+import javax.validation.constraints.NotEmpty;
+
+import org.springframework.cloud.gateway.handler.predicate.AbstractRoutePredicateFactory;
+import org.springframework.http.HttpCookie;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.server.ServerWebExchange;
+
+import com.baeldung.springcloudgateway.custompredicates.service.GoldenCustomerService;
+
+/**
+ * @author Philippe
+ *
+ */
+public class GoldenCustomerRoutePredicateFactory extends AbstractRoutePredicateFactory<GoldenCustomerRoutePredicateFactory.Config> {
+
+    private final GoldenCustomerService goldenCustomerService;
+    
+    public GoldenCustomerRoutePredicateFactory(GoldenCustomerService goldenCustomerService ) {
+        super(Config.class);
+        this.goldenCustomerService = goldenCustomerService;
+    }
+
+
+    @Override
+    public List<String> shortcutFieldOrder() {
+        return Arrays.asList("isGolden","customerIdCookie");
+    }
+
+
+    @Override
+    public Predicate<ServerWebExchange> apply(Config config) {
+        
+        return (ServerWebExchange t) -> {
+            List<HttpCookie> cookies = t.getRequest()
+              .getCookies()
+              .get(config.getCustomerIdCookie());
+              
+            boolean isGolden; 
+            if ( cookies == null || cookies.isEmpty()) {
+                isGolden = false;
+            }
+            else {                
+                String customerId = cookies.get(0).getValue();                
+                isGolden = goldenCustomerService.isGoldenCustomer(customerId);
+            }
+              
+            return config.isGolden()?isGolden:!isGolden;           
+        };
+    }
+    
+    
+    @Validated
+    public static class Config {        
+        boolean isGolden = true;
+        
+        @NotEmpty
+        String customerIdCookie = "customerId";
+        
+        
+        public Config() {}
+        
+        public Config( boolean isGolden, String customerIdCookie) {
+            this.isGolden = isGolden;
+            this.customerIdCookie = customerIdCookie;
+        }
+        
+        public boolean isGolden() {
+            return isGolden;
+        }
+        
+        public void setGolden(boolean value) {
+            this.isGolden = value;
+        }
+
+        /**
+         * @return the customerIdCookie
+         */
+        public String getCustomerIdCookie() {
+            return customerIdCookie;
+        }
+
+        /**
+         * @param customerIdCookie the customerIdCookie to set
+         */
+        public void setCustomerIdCookie(String customerIdCookie) {
+            this.customerIdCookie = customerIdCookie;
+        }
+        
+        
+        
+    }
+    
+}
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/service/GoldenCustomerService.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/service/GoldenCustomerService.java
new file mode 100644
index 0000000000..82bf2e6ae9
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/service/GoldenCustomerService.java
@@ -0,0 +1,26 @@
+/**
+ * 
+ */
+package com.baeldung.springcloudgateway.custompredicates.service;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Philippe
+ *
+ */
+@Component
+public class GoldenCustomerService {
+    
+    public boolean isGoldenCustomer(String customerId) {
+        
+        // TODO: Add some AI logic to check is this customer deserves a "golden" status ;^)
+        if ( "baeldung".equalsIgnoreCase(customerId)) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+
+}
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/introduction/IntroductionGatewayApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/introduction/IntroductionGatewayApplication.java
new file mode 100644
index 0000000000..d276597a6b
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/introduction/IntroductionGatewayApplication.java
@@ -0,0 +1,15 @@
+package com.baeldung.springcloudgateway.introduction;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.PropertySource;
+
+@SpringBootApplication
+@PropertySource("classpath:introduction-application.properties")
+public class IntroductionGatewayApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(IntroductionGatewayApplication.class, args);
+    }
+
+}
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/application-customroutes.yml b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/application-customroutes.yml
new file mode 100644
index 0000000000..859aa60bda
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/application-customroutes.yml
@@ -0,0 +1,26 @@
+spring:
+  cloud:
+    gateway:
+      routes:
+      - id: golden_route
+        uri: https://httpbin.org
+        predicates:
+        - Path=/api/**
+        - GoldenCustomer=true
+        filters:
+        - StripPrefix=1
+        - AddRequestHeader=GoldenCustomer,true
+      - id: common_route
+        uri: https://httpbin.org
+        predicates:
+        - Path=/api/**
+        - name: GoldenCustomer
+          args:
+            golden: false
+            customerIdCookie: customerId
+        filters:
+        - StripPrefix=1
+        - AddRequestHeader=GoldenCustomer,false
+        
+              
+        
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/application.yml
new file mode 100644
index 0000000000..a33bca2055
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/application.yml
@@ -0,0 +1,4 @@
+logging:
+  level:
+    org.springframework.cloud.gateway: DEBUG
+    reactor.netty.http.client: DEBUG
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/introduction-application.properties b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/introduction-application.properties
new file mode 100644
index 0000000000..d7a6c4e072
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/introduction-application.properties
@@ -0,0 +1,7 @@
+spring.cloud.gateway.routes[0].id=baeldung_route
+spring.cloud.gateway.routes[0].uri=http://www.baeldung.com
+spring.cloud.gateway.routes[0].predicates[0]=Path=/baeldung
+        
+management.endpoints.web.exposure.include=*
+
+server.port=80
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/logback.xml
similarity index 100%
rename from spring-reactive-modules/spring-5-data-reactive/src/main/resources/logback.xml
rename to spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/resources/logback.xml
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java
new file mode 100644
index 0000000000..d9988ceb5e
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java
@@ -0,0 +1,67 @@
+package com.baeldung.springcloudgateway.custompredicates;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.net.URI;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.junit.Before;
+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.web.server.LocalServerPort;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.RequestEntity;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.ActiveProfiles;
+
+/**
+ * This test requires
+ */
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
+@ActiveProfiles("customroutes")
+public class CustomPredicatesApplicationLiveTest {
+
+    @LocalServerPort
+    String serverPort;
+    
+    @Autowired
+    private TestRestTemplate restTemplate;
+
+    @Test
+    void givenNormalCustomer_whenCallHeadersApi_thenResponseForNormalCustomer() throws JSONException {
+
+        String url = "http://localhost:" + serverPort + "/api/headers";        
+        ResponseEntity<String> response = restTemplate.getForEntity(url, String.class);
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+        
+        JSONObject json = new JSONObject(response.getBody());
+        JSONObject headers = json.getJSONObject("headers");
+        assertThat(headers.getString("Goldencustomer")).isEqualTo("false");
+        
+    }
+
+    @Test
+    void givenGoldenCustomer_whenCallHeadersApi_thenResponseForGoldenCustomer() throws JSONException {
+
+        String url = "http://localhost:" + serverPort + "/api/headers";   
+        RequestEntity<Void> request = RequestEntity
+            .get(URI.create(url))
+            .header("Cookie", "customerId=baeldung")
+            .build();
+            
+        ResponseEntity<String> response = restTemplate.exchange(request, String.class);
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+        
+        JSONObject json = new JSONObject(response.getBody());
+        JSONObject headers = json.getJSONObject("headers");
+        assertThat(headers.getString("Goldencustomer")).isEqualTo("true");
+        
+    }
+    
+}
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/introduction/LoggerListAppender.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/introduction/LoggerListAppender.java
new file mode 100644
index 0000000000..33855cd15d
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/introduction/LoggerListAppender.java
@@ -0,0 +1,25 @@
+package com.baeldung.springcloudgateway.introduction;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
+
+public class LoggerListAppender extends AppenderBase<ILoggingEvent> {
+
+    static private List<ILoggingEvent> events = new ArrayList<>();
+
+    @Override
+    protected void append(ILoggingEvent eventObject) {
+        events.add(eventObject);
+    }
+
+    public static List<ILoggingEvent> getEvents() {
+        return events;
+    }
+
+    public static void clearEventList() {
+        events.clear();
+    }
+}
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java
new file mode 100644
index 0000000000..1550265f22
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java
@@ -0,0 +1,15 @@
+package com.baeldung.springcloudgateway.introduction;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import com.baeldung.springcloudgateway.introduction.IntroductionGatewayApplication;
+
+
+@SpringBootTest(classes = IntroductionGatewayApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..90c8f570aa
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/resources/logback-test.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="LISTAPPENDER"
+        class="com.baeldung.springcloudgateway.introduction.LoggerListAppender">
+    </appender>
+    <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="LISTAPPENDER" />
+    </root>
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration> 
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-bootstrap/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/pom.xml
index e7fe7e7485..f4d4073ef1 100644
--- a/spring-cloud-modules/spring-cloud-bootstrap/pom.xml
+++ b/spring-cloud-modules/spring-cloud-bootstrap/pom.xml
@@ -18,6 +18,7 @@
         <module>config</module>
         <module>discovery</module>
         <module>gateway</module>
+        <module>gateway-2</module>
         <module>svc-book</module>
         <module>svc-rating</module>
         <module>customer-service</module>
diff --git a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/mongo-deployment.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/mongo-deployment.yaml
index 3d40581578..77a5efa13c 100644
--- a/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/mongo-deployment.yaml
+++ b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/mongo-deployment.yaml
@@ -14,22 +14,24 @@ spec:
   selector:
     service: mongo
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mongo
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      name: mongodb-service
   template:
     metadata:
       labels:
         service: mongo
-      name: mongodb-service
+        name: mongodb-service
     spec:
       containers:
       - args:
         - mongod
-        - --smallfiles
         image: mongo:latest
         name: mongo
         env:
diff --git a/spring-cloud-modules/spring-cloud-netflix-feign/pom.xml b/spring-cloud-modules/spring-cloud-netflix-feign/pom.xml
index f519b6316b..92d66c03df 100644
--- a/spring-cloud-modules/spring-cloud-netflix-feign/pom.xml
+++ b/spring-cloud-modules/spring-cloud-netflix-feign/pom.xml
@@ -58,6 +58,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>
         <spring-cloud.version>Camden.SR7</spring-cloud.version>
         <feign-ok.version>8.18.0</feign-ok.version>
diff --git a/spring-cloud-modules/spring-cloud-stream-starters/pom.xml b/spring-cloud-modules/spring-cloud-stream-starters/pom.xml
index eee5b27396..95176d1e5c 100644
--- a/spring-cloud-modules/spring-cloud-stream-starters/pom.xml
+++ b/spring-cloud-modules/spring-cloud-stream-starters/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.spring.cloud</groupId>
     <artifactId>spring-cloud-stream-starters</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <name>spring-cloud-stream-starters</name>
@@ -32,7 +31,7 @@
     </dependencyManagement>
 
     <properties>
-        <spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2022.0.4</spring-cloud-dependencies.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/pom.xml b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/pom.xml
index 51e8703e6e..1a19415a3f 100644
--- a/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/pom.xml
+++ b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/pom.xml
@@ -61,16 +61,21 @@
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+            <version>${groovy.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
+        <finalName>twitterhdfs</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
         </plugins>
-        <finalName>twitterhdfs</finalName>
     </build>
 
     <properties>
@@ -83,6 +88,7 @@
         <junit.version>4.13.2</junit.version>
         <junit-jupiter.version>5.8.1</junit-jupiter.version>
         <log4j2.version>2.17.1</log4j2.version>
+        <groovy.version>3.0.8</groovy.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/resources/application.yml
index 71275793ec..b7cd3e7726 100644
--- a/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/resources/application.yml
+++ b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/resources/application.yml
@@ -19,8 +19,4 @@ spring:
       hibernate:
         dialect: org.hibernate.dialect.MySQL5Dialect
   batch:
-    initialize-schema: always
-maven:
-  remoteRepositories:
-    springRepo:
-      url: https://repo.spring.io/libs-snapshot
\ No newline at end of file
+    initialize-schema: always
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/main/resources/application.properties
index 1660dc8516..e69de29bb2 100644
--- a/spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/main/resources/application.properties
+++ b/spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/main/resources/application.properties
@@ -1 +0,0 @@
-maven.remoteRepositories.springRepo.url=https://repo.spring.io/libs-snapshot
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml
index 3960cfde5d..46b3e7047f 100644
--- a/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml
+++ b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml
@@ -53,6 +53,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
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                        --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+                        --add-opens java.base/java.text=ALL-UNNAMED
+                        --add-opens java.desktop/java.awt.font=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <log4j2.version>2.17.1</log4j2.version>
     </properties>
diff --git a/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml
index c9bc120e4d..796b908bca 100644
--- a/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml
+++ b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml
@@ -53,6 +53,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
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                        --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+                        --add-opens java.base/java.text=ALL-UNNAMED
+                        --add-opens java.desktop/java.awt.font=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <log4j2.version>2.17.1</log4j2.version>
     </properties>
diff --git a/spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml
index 76d899447f..11cc992523 100644
--- a/spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml
+++ b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml
@@ -61,6 +61,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
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                        --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+                        --add-opens java.base/java.text=ALL-UNNAMED
+                        --add-opens java.desktop/java.awt.font=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <log4j2.version>2.17.1</log4j2.version>
     </properties>
diff --git a/spring-core/src/main/java/com/baeldung/config/scope/AppConfigFunctionBean.java b/spring-core/src/main/java/com/baeldung/config/scope/AppConfigFunctionBean.java
index a3c5445698..aa526b5403 100644
--- a/spring-core/src/main/java/com/baeldung/config/scope/AppConfigFunctionBean.java
+++ b/spring-core/src/main/java/com/baeldung/config/scope/AppConfigFunctionBean.java
@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 
 import com.baeldung.scope.prototype.PrototypeBean;
-import com.baeldung.scope.singletone.SingletonFunctionBean;
+import com.baeldung.scope.singleton.SingletonFunctionBean;
 
 @Configuration
 public class AppConfigFunctionBean {
diff --git a/spring-core/src/main/java/com/baeldung/scope/AppConfig.java b/spring-core/src/main/java/com/baeldung/scope/AppConfig.java
index 33a9c5c21e..2ef775ee4f 100644
--- a/spring-core/src/main/java/com/baeldung/scope/AppConfig.java
+++ b/spring-core/src/main/java/com/baeldung/scope/AppConfig.java
@@ -1,10 +1,10 @@
 package com.baeldung.scope;
 
 import com.baeldung.scope.prototype.PrototypeBean;
-import com.baeldung.scope.singletone.SingletonAppContextBean;
-import com.baeldung.scope.singletone.SingletonBean;
-import com.baeldung.scope.singletone.SingletonObjectFactoryBean;
-import com.baeldung.scope.singletone.SingletonProviderBean;
+import com.baeldung.scope.singleton.SingletonAppContextBean;
+import com.baeldung.scope.singleton.SingletonBean;
+import com.baeldung.scope.singleton.SingletonObjectFactoryBean;
+import com.baeldung.scope.singleton.SingletonProviderBean;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
diff --git a/spring-core/src/main/java/com/baeldung/scope/AppProxyScopeConfig.java b/spring-core/src/main/java/com/baeldung/scope/AppProxyScopeConfig.java
index 9f1874375e..0564dfb3c0 100644
--- a/spring-core/src/main/java/com/baeldung/scope/AppProxyScopeConfig.java
+++ b/spring-core/src/main/java/com/baeldung/scope/AppProxyScopeConfig.java
@@ -1,7 +1,7 @@
 package com.baeldung.scope;
 
 import com.baeldung.scope.prototype.PrototypeBean;
-import com.baeldung.scope.singletone.SingletonBean;
+import com.baeldung.scope.singleton.SingletonBean;
 
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.*;
diff --git a/spring-core/src/main/java/com/baeldung/scope/BeanInjectionStarter.java b/spring-core/src/main/java/com/baeldung/scope/BeanInjectionStarter.java
index 5cf0c9170c..47014aa2d1 100644
--- a/spring-core/src/main/java/com/baeldung/scope/BeanInjectionStarter.java
+++ b/spring-core/src/main/java/com/baeldung/scope/BeanInjectionStarter.java
@@ -1,7 +1,7 @@
 package com.baeldung.scope;
 
 import com.baeldung.scope.prototype.PrototypeBean;
-import com.baeldung.scope.singletone.SingletonBean;
+import com.baeldung.scope.singleton.SingletonBean;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.util.Assert;
 
diff --git a/spring-core/src/main/java/com/baeldung/scope/singletone/SingletonAppContextBean.java b/spring-core/src/main/java/com/baeldung/scope/singleton/SingletonAppContextBean.java
similarity index 94%
rename from spring-core/src/main/java/com/baeldung/scope/singletone/SingletonAppContextBean.java
rename to spring-core/src/main/java/com/baeldung/scope/singleton/SingletonAppContextBean.java
index f4d57a0f63..4f5b3274c8 100644
--- a/spring-core/src/main/java/com/baeldung/scope/singletone/SingletonAppContextBean.java
+++ b/spring-core/src/main/java/com/baeldung/scope/singleton/SingletonAppContextBean.java
@@ -1,4 +1,4 @@
-package com.baeldung.scope.singletone;
+package com.baeldung.scope.singleton;
 
 import com.baeldung.scope.prototype.PrototypeBean;
 import org.springframework.beans.BeansException;
diff --git a/spring-core/src/main/java/com/baeldung/scope/singletone/SingletonBean.java b/spring-core/src/main/java/com/baeldung/scope/singleton/SingletonBean.java
similarity index 93%
rename from spring-core/src/main/java/com/baeldung/scope/singletone/SingletonBean.java
rename to spring-core/src/main/java/com/baeldung/scope/singleton/SingletonBean.java
index 8d3a09b8fd..9c4cea4439 100644
--- a/spring-core/src/main/java/com/baeldung/scope/singletone/SingletonBean.java
+++ b/spring-core/src/main/java/com/baeldung/scope/singleton/SingletonBean.java
@@ -1,4 +1,4 @@
-package com.baeldung.scope.singletone;
+package com.baeldung.scope.singleton;
 
 import com.baeldung.scope.prototype.PrototypeBean;
 import org.apache.log4j.Logger;
diff --git a/spring-core/src/main/java/com/baeldung/scope/singletone/SingletonFunctionBean.java b/spring-core/src/main/java/com/baeldung/scope/singleton/SingletonFunctionBean.java
similarity index 91%
rename from spring-core/src/main/java/com/baeldung/scope/singletone/SingletonFunctionBean.java
rename to spring-core/src/main/java/com/baeldung/scope/singleton/SingletonFunctionBean.java
index 8cdc56a6fa..2788af1701 100644
--- a/spring-core/src/main/java/com/baeldung/scope/singletone/SingletonFunctionBean.java
+++ b/spring-core/src/main/java/com/baeldung/scope/singleton/SingletonFunctionBean.java
@@ -1,4 +1,4 @@
-package com.baeldung.scope.singletone;
+package com.baeldung.scope.singleton;
 
 import java.util.function.Function;
 
diff --git a/spring-core/src/main/java/com/baeldung/scope/singletone/SingletonLookupBean.java b/spring-core/src/main/java/com/baeldung/scope/singleton/SingletonLookupBean.java
similarity index 88%
rename from spring-core/src/main/java/com/baeldung/scope/singletone/SingletonLookupBean.java
rename to spring-core/src/main/java/com/baeldung/scope/singleton/SingletonLookupBean.java
index 4c3c9b69da..e5461826ef 100644
--- a/spring-core/src/main/java/com/baeldung/scope/singletone/SingletonLookupBean.java
+++ b/spring-core/src/main/java/com/baeldung/scope/singleton/SingletonLookupBean.java
@@ -1,4 +1,4 @@
-package com.baeldung.scope.singletone;
+package com.baeldung.scope.singleton;
 
 import com.baeldung.scope.prototype.PrototypeBean;
 import org.springframework.beans.factory.annotation.Lookup;
diff --git a/spring-core/src/main/java/com/baeldung/scope/singletone/SingletonObjectFactoryBean.java b/spring-core/src/main/java/com/baeldung/scope/singleton/SingletonObjectFactoryBean.java
similarity index 91%
rename from spring-core/src/main/java/com/baeldung/scope/singletone/SingletonObjectFactoryBean.java
rename to spring-core/src/main/java/com/baeldung/scope/singleton/SingletonObjectFactoryBean.java
index 55a91f8202..0e70d12e6e 100644
--- a/spring-core/src/main/java/com/baeldung/scope/singletone/SingletonObjectFactoryBean.java
+++ b/spring-core/src/main/java/com/baeldung/scope/singleton/SingletonObjectFactoryBean.java
@@ -1,4 +1,4 @@
-package com.baeldung.scope.singletone;
+package com.baeldung.scope.singleton;
 
 import com.baeldung.scope.prototype.PrototypeBean;
 import org.springframework.beans.factory.ObjectFactory;
diff --git a/spring-core/src/main/java/com/baeldung/scope/singletone/SingletonProviderBean.java b/spring-core/src/main/java/com/baeldung/scope/singleton/SingletonProviderBean.java
similarity index 90%
rename from spring-core/src/main/java/com/baeldung/scope/singletone/SingletonProviderBean.java
rename to spring-core/src/main/java/com/baeldung/scope/singleton/SingletonProviderBean.java
index 37d0ad9404..01a4a0ff11 100644
--- a/spring-core/src/main/java/com/baeldung/scope/singletone/SingletonProviderBean.java
+++ b/spring-core/src/main/java/com/baeldung/scope/singleton/SingletonProviderBean.java
@@ -1,4 +1,4 @@
-package com.baeldung.scope.singletone;
+package com.baeldung.scope.singleton;
 
 import com.baeldung.scope.prototype.PrototypeBean;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-core/src/test/java/com/baeldung/scope/PrototypeBeanInjectionIntegrationTest.java b/spring-core/src/test/java/com/baeldung/scope/PrototypeBeanInjectionIntegrationTest.java
index d0c2733765..df04957992 100644
--- a/spring-core/src/test/java/com/baeldung/scope/PrototypeBeanInjectionIntegrationTest.java
+++ b/spring-core/src/test/java/com/baeldung/scope/PrototypeBeanInjectionIntegrationTest.java
@@ -1,10 +1,9 @@
 package com.baeldung.scope;
 
 import com.baeldung.scope.prototype.PrototypeBean;
-import com.baeldung.scope.singletone.SingletonFunctionBean;
-import com.baeldung.scope.singletone.SingletonLookupBean;
-import com.baeldung.scope.singletone.SingletonObjectFactoryBean;
-import com.baeldung.scope.singletone.SingletonProviderBean;
+import com.baeldung.scope.singleton.SingletonLookupBean;
+import com.baeldung.scope.singleton.SingletonObjectFactoryBean;
+import com.baeldung.scope.singleton.SingletonProviderBean;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-core/src/test/java/com/baeldung/scope/PrototypeFunctionBeanIntegrationTest.java b/spring-core/src/test/java/com/baeldung/scope/PrototypeFunctionBeanIntegrationTest.java
index 1e3c652599..dac3461ceb 100644
--- a/spring-core/src/test/java/com/baeldung/scope/PrototypeFunctionBeanIntegrationTest.java
+++ b/spring-core/src/test/java/com/baeldung/scope/PrototypeFunctionBeanIntegrationTest.java
@@ -11,7 +11,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 import com.baeldung.config.scope.AppConfigFunctionBean;
 import com.baeldung.scope.prototype.PrototypeBean;
-import com.baeldung.scope.singletone.SingletonFunctionBean;
+import com.baeldung.scope.singleton.SingletonFunctionBean;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(loader = AnnotationConfigContextLoader.class, classes = AppConfigFunctionBean.class)
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multipletopics/KafkaConsumerConfig.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multipletopics/KafkaConsumerConfig.java
new file mode 100644
index 0000000000..741fb6bba4
--- /dev/null
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multipletopics/KafkaConsumerConfig.java
@@ -0,0 +1,36 @@
+package com.baeldung.spring.kafka.multipletopics;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
+import org.springframework.kafka.core.ConsumerFactory;
+import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
+import org.springframework.kafka.support.serializer.JsonDeserializer;
+
+@Configuration
+public class KafkaConsumerConfig {
+
+    @Value(value = "${spring.kafka.bootstrap-servers}")
+    private String bootstrapServers;
+
+    @Bean
+    public ConsumerFactory<String, PaymentData> consumerFactory() {
+        Map<String, Object> config = new HashMap<>();
+        config.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
+
+        return new DefaultKafkaConsumerFactory<>(config, new StringDeserializer(), new JsonDeserializer<>(PaymentData.class));
+    }
+
+    @Bean
+    public ConcurrentKafkaListenerContainerFactory<String, PaymentData> kafkaListenerContainerFactory() {
+        ConcurrentKafkaListenerContainerFactory<String, PaymentData> factory = new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(consumerFactory());
+        return factory;
+    }
+}
\ No newline at end of file
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multipletopics/KafkaMultipleTopicsApplication.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multipletopics/KafkaMultipleTopicsApplication.java
new file mode 100644
index 0000000000..2135a27f39
--- /dev/null
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multipletopics/KafkaMultipleTopicsApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.spring.kafka.multipletopics;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.kafka.annotation.EnableKafka;
+
+@EnableKafka
+@SpringBootApplication
+public class KafkaMultipleTopicsApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(KafkaMultipleTopicsApplication.class, args);
+    }
+}
\ No newline at end of file
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multipletopics/KafkaProducerConfig.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multipletopics/KafkaProducerConfig.java
new file mode 100644
index 0000000000..2cb0117bf1
--- /dev/null
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multipletopics/KafkaProducerConfig.java
@@ -0,0 +1,34 @@
+package com.baeldung.spring.kafka.multipletopics;
+
+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 bootstrapServers;
+
+    @Bean
+    public ProducerFactory<String, PaymentData> producerFactory() {
+        Map<String, Object> config = new HashMap<>();
+        config.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
+
+        return new DefaultKafkaProducerFactory<>(config, new StringSerializer(), new JsonSerializer<>());
+    }
+
+    @Bean
+    public KafkaTemplate<String, PaymentData> kafkaProducer() {
+        return new KafkaTemplate<>(producerFactory());
+    }
+}
\ No newline at end of file
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multipletopics/PaymentData.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multipletopics/PaymentData.java
new file mode 100644
index 0000000000..e81138c089
--- /dev/null
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multipletopics/PaymentData.java
@@ -0,0 +1,54 @@
+package com.baeldung.spring.kafka.multipletopics;
+
+import java.math.BigDecimal;
+import java.util.Currency;
+import java.util.StringJoiner;
+
+public class PaymentData {
+    private String paymentReference;
+    private String type;
+    private BigDecimal amount;
+    private Currency currency;
+
+    public String getPaymentReference() {
+        return paymentReference;
+    }
+
+    public void setPaymentReference(String paymentReference) {
+        this.paymentReference = paymentReference;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public Currency getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(Currency currency) {
+        this.currency = currency;
+    }
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", PaymentData.class.getSimpleName() + "[", "]")
+          .add("paymentReference='" + paymentReference + "'")
+          .add("type='" + type + "'")
+          .add("amount=" + amount)
+          .add("currency=" + currency)
+          .toString();
+    }
+}
\ No newline at end of file
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multipletopics/PaymentDataListener.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multipletopics/PaymentDataListener.java
new file mode 100644
index 0000000000..fb640cca25
--- /dev/null
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/multipletopics/PaymentDataListener.java
@@ -0,0 +1,18 @@
+package com.baeldung.spring.kafka.multipletopics;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.kafka.support.KafkaHeaders;
+import org.springframework.messaging.handler.annotation.Header;
+import org.springframework.stereotype.Service;
+
+@Service
+public class PaymentDataListener {
+    private final Logger log = LoggerFactory.getLogger(PaymentDataListener.class);
+
+    @KafkaListener(topics = { "card-payments", "bank-transfers" }, groupId = "payments")
+    public void handlePaymentEvents(PaymentData paymentData, @Header(KafkaHeaders.RECEIVED_TOPIC) String topic) {
+        log.info("Event on topic={}, payload={}", topic, paymentData);
+    }
+}
\ No newline at end of file
diff --git a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/topicsandpartitions/TemperatureConsumer.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/topicsandpartitions/TemperatureConsumer.java
index 7cfbdd5fb0..2919ae1d7b 100644
--- a/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/topicsandpartitions/TemperatureConsumer.java
+++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/topicsandpartitions/TemperatureConsumer.java
@@ -8,29 +8,22 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CountDownLatch;
 
 @Service
 public class TemperatureConsumer {
 
-    private CountDownLatch latch = new CountDownLatch(1);
-
     Map<String, Set<String>> consumedRecords = new ConcurrentHashMap<>();
 
     @KafkaListener(topics = "celcius-scale-topic", groupId = "group-1")
     public void consumer1(ConsumerRecord<?, ?> consumerRecord) {
-        computeConsumedRecord("consumer-1", consumerRecord.partition());
+        trackConsumedPartitions("consumer-1", consumerRecord.partition());
     }
 
-    private void computeConsumedRecord(String key, int consumerRecord) {
-        consumedRecords.computeIfAbsent(key, k -> new HashSet<>());
-        consumedRecords.computeIfPresent(key, (k, v) -> {
-            v.add(String.valueOf(consumerRecord));
+    private void trackConsumedPartitions(String consumerName, int partitionNumber) {
+        consumedRecords.computeIfAbsent(consumerName, k -> new HashSet<>());
+        consumedRecords.computeIfPresent(consumerName, (k, v) -> {
+            v.add(String.valueOf(partitionNumber));
             return v;
         });
     }
-
-    public CountDownLatch getLatch() {
-        return latch;
-    }
 }
diff --git a/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/multipletopics/KafkaMultipleTopicsIntegrationTest.java b/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/multipletopics/KafkaMultipleTopicsIntegrationTest.java
new file mode 100644
index 0000000000..345e84b65b
--- /dev/null
+++ b/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/multipletopics/KafkaMultipleTopicsIntegrationTest.java
@@ -0,0 +1,78 @@
+package com.baeldung.spring.kafka.multipletopics;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+
+import java.math.BigDecimal;
+import java.util.Currency;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+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.boot.test.mock.mockito.SpyBean;
+import org.springframework.kafka.config.KafkaListenerEndpointRegistry;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.kafka.listener.MessageListenerContainer;
+import org.springframework.kafka.test.context.EmbeddedKafka;
+import org.springframework.kafka.test.utils.ContainerTestUtils;
+
+@SpringBootTest(classes = KafkaMultipleTopicsApplication.class)
+@EmbeddedKafka(partitions = 1, brokerProperties = { "listeners=PLAINTEXT://localhost:9092", "port=9092" })
+public class KafkaMultipleTopicsIntegrationTest {
+    private static final String CARD_PAYMENTS_TOPIC = "card-payments";
+    private static final String BANK_TRANSFERS_TOPIC = "bank-transfers";
+
+    @Autowired
+    private KafkaListenerEndpointRegistry kafkaListenerEndpointRegistry;
+
+    @Autowired
+    private KafkaTemplate<String, PaymentData> kafkaProducer;
+
+    @SpyBean
+    private PaymentDataListener paymentsConsumer;
+
+    @BeforeEach
+    void setUp() {
+        // wait for embedded Kafka
+        for (MessageListenerContainer messageListenerContainer : kafkaListenerEndpointRegistry.getListenerContainers()) {
+            ContainerTestUtils.waitForAssignment(messageListenerContainer, 2);
+        }
+    }
+
+    @Test
+    public void whenSendingMessagesOnTwoTopics_thenConsumerReceivesMessages() throws Exception {
+        CountDownLatch countDownLatch = new CountDownLatch(2);
+        doAnswer(invocation -> {
+            countDownLatch.countDown();
+            return null;
+        }).when(paymentsConsumer)
+          .handlePaymentEvents(any(), any());
+
+        kafkaProducer.send(CARD_PAYMENTS_TOPIC, createCardPayment());
+        kafkaProducer.send(BANK_TRANSFERS_TOPIC, createBankTransfer());
+
+        assertThat(countDownLatch.await(5, TimeUnit.SECONDS)).isTrue();
+    }
+
+    private PaymentData createCardPayment() {
+        PaymentData cardPayment = new PaymentData();
+        cardPayment.setAmount(BigDecimal.valueOf(275));
+        cardPayment.setPaymentReference("A184028KM0013790");
+        cardPayment.setCurrency(Currency.getInstance("GBP"));
+        cardPayment.setType("card");
+        return cardPayment;
+    }
+
+    private PaymentData createBankTransfer() {
+        PaymentData bankTransfer = new PaymentData();
+        bankTransfer.setAmount(BigDecimal.valueOf(150));
+        bankTransfer.setPaymentReference("19ae2-18mk73-009");
+        bankTransfer.setCurrency(Currency.getInstance("EUR"));
+        bankTransfer.setType("bank");
+        return bankTransfer;
+    }
+}
\ No newline at end of file
diff --git a/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/topicsandpartitions/KafkaTopicsAndPartitionsIntegrationTest.java b/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/topicsandpartitions/KafkaTopicsAndPartitionsIntegrationTest.java
index 309c87125a..de720ef955 100644
--- a/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/topicsandpartitions/KafkaTopicsAndPartitionsIntegrationTest.java
+++ b/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/topicsandpartitions/KafkaTopicsAndPartitionsIntegrationTest.java
@@ -7,8 +7,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.kafka.test.EmbeddedKafkaBroker;
 import org.springframework.kafka.test.context.EmbeddedKafka;
 
-import java.util.concurrent.TimeUnit;
-
 @SpringBootTest(classes = ThermostatApplicationKafkaApp.class)
 @EmbeddedKafka(partitions = 2, brokerProperties = {"listeners=PLAINTEXT://localhost:9092", "port=9092"})
 public class KafkaTopicsAndPartitionsIntegrationTest {
@@ -24,7 +22,7 @@ public class KafkaTopicsAndPartitionsIntegrationTest {
     @Test
     public void givenTopic_andConsumerGroup_whenConsumersListenToEvents_thenConsumeItCorrectly() throws Exception {
         service.measureCelsiusAndPublish(10000);
-        consumer.getLatch().await(1, TimeUnit.SECONDS);
+        Thread.sleep(1000);
         System.out.println(consumer.consumedRecords);
     }
 }
diff --git a/spring-reactive-modules/pom.xml b/spring-reactive-modules/pom.xml
index e75682da78..06519d723a 100644
--- a/spring-reactive-modules/pom.xml
+++ b/spring-reactive-modules/pom.xml
@@ -17,16 +17,17 @@
     </parent>
 
     <modules>
-        <module>spring-5-data-reactive</module>
-        <module>spring-5-data-reactive-2</module>
+        <module>spring-reactive-data</module>
+        <module>spring-reactive-data-2</module>
         <module>spring-5-reactive</module>
-        <module>spring-5-reactive-2</module>
-        <module>spring-5-reactive-3</module>
-        <module>spring-5-reactive-client</module>
-        <module>spring-5-reactive-client-2</module>
-        <module>spring-5-reactive-filters</module>
-        <module>spring-5-reactive-oauth</module>
-        <module>spring-5-reactive-security</module>
+        <module>spring-reactive-2</module>
+        <module>spring-reactive-3</module>
+        <module>spring-reactive-client</module>
+        <module>spring-reactive-client-2</module>
+        <module>spring-reactive-filters</module>
+        <module>spring-reactive-oauth</module>
+        <module>spring-reactive-security</module>
+        <module>spring-data-couchbase</module>
         <module>spring-reactive</module>
         <module>spring-reactive-exceptions</module>
         <module>spring-reactor</module>
diff --git a/spring-reactive-modules/spring-5-reactive/README.md b/spring-reactive-modules/spring-5-reactive/README.md
index f3148fe696..3f44267234 100644
--- a/spring-reactive-modules/spring-5-reactive/README.md
+++ b/spring-reactive-modules/spring-5-reactive/README.md
@@ -1,6 +1,6 @@
 ## Spring 5 Reactive Project
 
-This module contains articles about reactive Spring 5
+This module contains articles about reactive Spring Boot
 
 ### The Course
 The "REST With Spring" Classes: https://bit.ly/restwithspring
@@ -11,4 +11,4 @@ The "REST With Spring" Classes: https://bit.ly/restwithspring
 - [Reactive WebSockets with Spring 5](https://www.baeldung.com/spring-5-reactive-websockets)
 - [How to Set a Header on a Response with Spring 5](https://www.baeldung.com/spring-response-header)
 - [A Guide to Spring Session Reactive Support: WebSession](https://www.baeldung.com/spring-session-reactive)
-- More articles: [[next -->]](../spring-5-reactive-2)
+- More articles: [[next -->]](../spring-5-reactive-2)
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-5-reactive/pom.xml b/spring-reactive-modules/spring-5-reactive/pom.xml
index 212281b6f9..fd47c70a07 100644
--- a/spring-reactive-modules/spring-5-reactive/pom.xml
+++ b/spring-reactive-modules/spring-5-reactive/pom.xml
@@ -1,7 +1,6 @@
-<?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-5-reactive</artifactId>
     <version>0.0.1-SNAPSHOT</version>
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/webapp/WEB-INF/web.xml b/spring-reactive-modules/spring-5-reactive/src/main/WEB-INF/web.xml
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/webapp/WEB-INF/web.xml
rename to spring-reactive-modules/spring-5-reactive/src/main/WEB-INF/web.xml
diff --git a/spring-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websocket/WebSocketController.java b/spring-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websocket/WebSocketController.java
index bf4a463ae6..0c8f9debc9 100644
--- a/spring-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websocket/WebSocketController.java
+++ b/spring-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/websocket/WebSocketController.java
@@ -6,8 +6,6 @@ import org.slf4j.LoggerFactory;
 import javax.websocket.*;
 import javax.websocket.server.ServerEndpoint;
 import java.io.IOException;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 
 @ServerEndpoint("/event-emitter")
 public class WebSocketController {
diff --git a/spring-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/reactive/urlmatch/ExploreSpring5URLPatternUsingRouterFunctionsIntegrationTest.java b/spring-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/reactive/urlmatch/ExploreSpring5URLPatternUsingRouterFunctionsIntegrationTest.java
index a77a67c6ba..113376318e 100644
--- a/spring-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/reactive/urlmatch/ExploreSpring5URLPatternUsingRouterFunctionsIntegrationTest.java
+++ b/spring-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/reactive/urlmatch/ExploreSpring5URLPatternUsingRouterFunctionsIntegrationTest.java
@@ -108,7 +108,7 @@ public class ExploreSpring5URLPatternUsingRouterFunctionsIntegrationTest {
     }
 
     @Test
-    public void givenRouter_whenAccess_thenGot() throws Exception {
+    public void givenRouter_whenAccess_thenGot() {
         client.get()
             .uri("/resources/test/test.txt")
             .exchange()
diff --git a/spring-reactive-modules/spring-5-data-reactive/README.md b/spring-reactive-modules/spring-data-couchbase/README.md
similarity index 62%
rename from spring-reactive-modules/spring-5-data-reactive/README.md
rename to spring-reactive-modules/spring-data-couchbase/README.md
index ecb6d01267..e38ef10562 100644
--- a/spring-reactive-modules/spring-5-data-reactive/README.md
+++ b/spring-reactive-modules/spring-data-couchbase/README.md
@@ -1,10 +1,9 @@
 ## Spring Data Reactive Project
 
-This module contains articles about reactive Spring 5 Data
+This module contains articles about reactive Spring Data Couchbase
 
 ### The Course
 The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles
-- [A Quick Look at R2DBC with Spring Data](https://www.baeldung.com/spring-data-r2dbc)
 - [Spring Data Reactive Repositories with Couchbase](https://www.baeldung.com/spring-data-reactive-couchbase)
diff --git a/spring-reactive-modules/spring-5-data-reactive/pom.xml b/spring-reactive-modules/spring-data-couchbase/pom.xml
similarity index 83%
rename from spring-reactive-modules/spring-5-data-reactive/pom.xml
rename to spring-reactive-modules/spring-data-couchbase/pom.xml
index e4d3aeeddd..d7b36f97fa 100644
--- a/spring-reactive-modules/spring-5-data-reactive/pom.xml
+++ b/spring-reactive-modules/spring-data-couchbase/pom.xml
@@ -1,10 +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">
+         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>
+    <artifactId>spring-data-couchbase</artifactId>
+    <name>spring-data-couchbase</name>
     <packaging>jar</packaging>
 
     <parent>
@@ -62,29 +62,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-tx</artifactId>
             <version>${spring-tx.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-r2dbc</artifactId>
-            <version>${spring-data-r2dbc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.r2dbc</groupId>
-            <artifactId>r2dbc-h2</artifactId>
-            <version>${r2dbc-h2.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -152,8 +134,6 @@
 
     <properties>
         <spring-tx.version>5.2.2.RELEASE</spring-tx.version>
-        <spring-data-r2dbc.version>1.0.0.RELEASE</spring-data-r2dbc.version>
-        <r2dbc-h2.version>0.8.1.RELEASE</r2dbc-h2.version>
         <httpclient.version>4.5.2</httpclient.version>
         <couchbaseMock.version>1.5.23</couchbaseMock.version>
         <reactor-core.version>3.3.1.RELEASE</reactor-core.version>
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/ReactiveCouchbaseApplication.java b/spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/ReactiveCouchbaseApplication.java
similarity index 99%
rename from spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/ReactiveCouchbaseApplication.java
rename to spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/ReactiveCouchbaseApplication.java
index 4e5bf9d5dc..0ca7c9a8d1 100644
--- a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/ReactiveCouchbaseApplication.java
+++ b/spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/ReactiveCouchbaseApplication.java
@@ -10,4 +10,4 @@ public class ReactiveCouchbaseApplication {
     public static void main(String[] args) {
         SpringApplication.run(ReactiveCouchbaseApplication.class, args);
     }
-}
+}
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/CouchbaseProperties.java b/spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/configuration/CouchbaseProperties.java
similarity index 99%
rename from spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/CouchbaseProperties.java
rename to spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/configuration/CouchbaseProperties.java
index 81f19eebd6..cc9540eecb 100644
--- a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/CouchbaseProperties.java
+++ b/spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/configuration/CouchbaseProperties.java
@@ -40,4 +40,4 @@ public class CouchbaseProperties {
     public int getPort() {
         return port;
     }
-}
+}
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/N1QLReactiveCouchbaseConfiguration.java b/spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/configuration/N1QLReactiveCouchbaseConfiguration.java
similarity index 99%
rename from spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/N1QLReactiveCouchbaseConfiguration.java
rename to spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/configuration/N1QLReactiveCouchbaseConfiguration.java
index 059bd36cae..7ba12db2c6 100644
--- a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/N1QLReactiveCouchbaseConfiguration.java
+++ b/spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/configuration/N1QLReactiveCouchbaseConfiguration.java
@@ -12,4 +12,4 @@ public class N1QLReactiveCouchbaseConfiguration extends ReactiveCouchbaseConfigu
     public N1QLReactiveCouchbaseConfiguration(CouchbaseProperties couchbaseProperties) {
         super(couchbaseProperties);
     }
-}
+}
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/ReactiveCouchbaseConfiguration.java b/spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/configuration/ReactiveCouchbaseConfiguration.java
similarity index 99%
rename from spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/ReactiveCouchbaseConfiguration.java
rename to spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/configuration/ReactiveCouchbaseConfiguration.java
index a51b19ee22..1816082f7c 100644
--- a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/ReactiveCouchbaseConfiguration.java
+++ b/spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/configuration/ReactiveCouchbaseConfiguration.java
@@ -45,4 +45,4 @@ public abstract class ReactiveCouchbaseConfiguration extends AbstractReactiveCou
     public IndexManager couchbaseIndexManager() {
         return new IndexManager(true, true, false);
     }
-}
+}
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/ViewReactiveCouchbaseConfiguration.java b/spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/configuration/ViewReactiveCouchbaseConfiguration.java
similarity index 99%
rename from spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/ViewReactiveCouchbaseConfiguration.java
rename to spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/configuration/ViewReactiveCouchbaseConfiguration.java
index 9b4d9b0319..578a03ae19 100644
--- a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/configuration/ViewReactiveCouchbaseConfiguration.java
+++ b/spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/configuration/ViewReactiveCouchbaseConfiguration.java
@@ -10,4 +10,4 @@ public class ViewReactiveCouchbaseConfiguration extends ReactiveCouchbaseConfigu
     public ViewReactiveCouchbaseConfiguration(CouchbaseProperties couchbaseProperties) {
         super(couchbaseProperties);
     }
-}
+}
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/Person.java b/spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/domain/Person.java
similarity index 99%
rename from spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/Person.java
rename to spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/domain/Person.java
index 285de34df8..5a1b1eec18 100644
--- a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/Person.java
+++ b/spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/domain/Person.java
@@ -40,4 +40,4 @@ public class Person {
     public int hashCode() {
         return Objects.hash(id, firstName);
     }
-}
+}
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepository.java b/spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepository.java
similarity index 99%
rename from spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepository.java
rename to spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepository.java
index 6f73a77ceb..e78316e218 100644
--- a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepository.java
+++ b/spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepository.java
@@ -13,4 +13,4 @@ import java.util.UUID;
 public interface N1QLPersonRepository extends ReactiveCrudRepository<Person, UUID> {
 
     Flux<Person> findAllByFirstName(final String firstName);
-}
+}
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepository.java b/spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepository.java
similarity index 99%
rename from spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepository.java
rename to spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepository.java
index 57dd149425..1225ed914a 100644
--- a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepository.java
+++ b/spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepository.java
@@ -10,4 +10,4 @@ import java.util.UUID;
 @Repository
 @N1qlPrimaryIndexed
 public interface N1QLSortingPersonRepository extends ReactiveSortingRepository<Person, UUID> {
-}
+}
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepository.java b/spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepository.java
similarity index 99%
rename from spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepository.java
rename to spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepository.java
index 06c47c2393..4b3f0a7f1c 100644
--- a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepository.java
+++ b/spring-reactive-modules/spring-data-couchbase/src/main/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepository.java
@@ -17,4 +17,4 @@ public interface ViewPersonRepository extends ReactiveCrudRepository<Person, UUI
 
     @View(designDocument = ViewPersonRepository.DESIGN_DOCUMENT)
     Flux<Person> findByFirstName(String firstName);
-}
+}
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/main/resources/couchbase.properties b/spring-reactive-modules/spring-data-couchbase/src/main/resources/couchbase.properties
similarity index 100%
rename from spring-reactive-modules/spring-5-data-reactive/src/main/resources/couchbase.properties
rename to spring-reactive-modules/spring-data-couchbase/src/main/resources/couchbase.properties
diff --git a/spring-reactive-modules/spring-5-reactive-filters/src/main/resources/logback.xml b/spring-reactive-modules/spring-data-couchbase/src/main/resources/logback.xml
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-filters/src/main/resources/logback.xml
rename to spring-reactive-modules/spring-data-couchbase/src/main/resources/logback.xml
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/CouchbaseMockConfiguration.java b/spring-reactive-modules/spring-data-couchbase/src/test/java/com/baeldung/couchbase/domain/repository/CouchbaseMockConfiguration.java
similarity index 99%
rename from spring-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/CouchbaseMockConfiguration.java
rename to spring-reactive-modules/spring-data-couchbase/src/test/java/com/baeldung/couchbase/domain/repository/CouchbaseMockConfiguration.java
index 2a09fce4b0..082ad5061b 100644
--- a/spring-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/CouchbaseMockConfiguration.java
+++ b/spring-reactive-modules/spring-data-couchbase/src/test/java/com/baeldung/couchbase/domain/repository/CouchbaseMockConfiguration.java
@@ -1,16 +1,18 @@
 package com.baeldung.couchbase.domain.repository;
 
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.util.Collections;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+
+import org.springframework.boot.test.context.TestConfiguration;
+
 import com.baeldung.couchbase.configuration.CouchbaseProperties;
 import com.couchbase.mock.Bucket;
 import com.couchbase.mock.BucketConfiguration;
 import com.couchbase.mock.CouchbaseMock;
-import org.springframework.boot.test.context.TestConfiguration;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.util.Collections;
 
 @TestConfiguration
 public class CouchbaseMockConfiguration {
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepositoryLiveTest.java b/spring-reactive-modules/spring-data-couchbase/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepositoryLiveTest.java
similarity index 96%
rename from spring-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepositoryLiveTest.java
rename to spring-reactive-modules/spring-data-couchbase/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepositoryLiveTest.java
index c8dbbf429e..51bca948c0 100644
--- a/spring-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepositoryLiveTest.java
+++ b/spring-reactive-modules/spring-data-couchbase/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLPersonRepositoryLiveTest.java
@@ -1,16 +1,19 @@
 package com.baeldung.couchbase.domain.repository.n1ql;
 
-import com.baeldung.couchbase.domain.Person;
+import java.util.UUID;
+
 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.couchbase.domain.Person;
+import com.baeldung.couchbase.domain.repository.n1ql.N1QLPersonRepository;
+
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 
-import java.util.UUID;
-
 @RunWith(SpringRunner.class)
 @SpringBootTest(properties = {"spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration"})
 public class N1QLPersonRepositoryLiveTest {
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepositoryLiveTest.java b/spring-reactive-modules/spring-data-couchbase/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepositoryLiveTest.java
similarity index 96%
rename from spring-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepositoryLiveTest.java
rename to spring-reactive-modules/spring-data-couchbase/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepositoryLiveTest.java
index 8c6ce137f1..dbc353a94b 100644
--- a/spring-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepositoryLiveTest.java
+++ b/spring-reactive-modules/spring-data-couchbase/src/test/java/com/baeldung/couchbase/domain/repository/n1ql/N1QLSortingPersonRepositoryLiveTest.java
@@ -1,17 +1,20 @@
 package com.baeldung.couchbase.domain.repository.n1ql;
 
-import com.baeldung.couchbase.domain.Person;
+import java.util.UUID;
+
 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.data.domain.Sort;
 import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.couchbase.domain.Person;
+import com.baeldung.couchbase.domain.repository.n1ql.N1QLSortingPersonRepository;
+
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 
-import java.util.UUID;
-
 @RunWith(SpringRunner.class)
 @SpringBootTest(properties = {"spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration"})
 public class N1QLSortingPersonRepositoryLiveTest {
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepositoryIntegrationTest.java b/spring-reactive-modules/spring-data-couchbase/src/test/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepositoryIntegrationTest.java
similarity index 97%
rename from spring-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepositoryIntegrationTest.java
rename to spring-reactive-modules/spring-data-couchbase/src/test/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepositoryIntegrationTest.java
index 15688e1b80..038d4dec31 100644
--- a/spring-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepositoryIntegrationTest.java
+++ b/spring-reactive-modules/spring-data-couchbase/src/test/java/com/baeldung/couchbase/domain/repository/view/ViewPersonRepositoryIntegrationTest.java
@@ -1,21 +1,22 @@
 package com.baeldung.couchbase.domain.repository.view;
 
+import java.util.UUID;
+
+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.couchbase.configuration.CouchbaseProperties;
 import com.baeldung.couchbase.configuration.ViewReactiveCouchbaseConfiguration;
 import com.baeldung.couchbase.domain.Person;
 import com.baeldung.couchbase.domain.repository.CouchbaseMockConfiguration;
-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.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import java.util.UUID;
-
 @RunWith(SpringRunner.class)
 @SpringBootTest(properties = { "spring.couchbase.port=10010", "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration,org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration" },
                 classes = { CouchbaseMockConfiguration.class, ViewReactiveCouchbaseConfiguration.class, CouchbaseProperties.class })
diff --git a/spring-reactive-modules/spring-5-reactive-2/.gitignore b/spring-reactive-modules/spring-reactive-2/.gitignore
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/.gitignore
rename to spring-reactive-modules/spring-reactive-2/.gitignore
diff --git a/spring-reactive-modules/spring-5-reactive-2/README.md b/spring-reactive-modules/spring-reactive-2/README.md
similarity index 91%
rename from spring-reactive-modules/spring-5-reactive-2/README.md
rename to spring-reactive-modules/spring-reactive-2/README.md
index 1cd3bf46c6..a5df5187bf 100644
--- a/spring-reactive-modules/spring-5-reactive-2/README.md
+++ b/spring-reactive-modules/spring-reactive-2/README.md
@@ -1,6 +1,6 @@
 ## Spring 5 Reactive Project
 
-This module contains articles about reactive Spring 5.
+This module contains articles about reactive Spring Boot.
 
 - [Validation for Functional Endpoints in Spring 5](https://www.baeldung.com/spring-functional-endpoints-validation)
 - [Testing Reactive Streams Using StepVerifier and TestPublisher](https://www.baeldung.com/reactive-streams-step-verifier-test-publisher)
diff --git a/spring-reactive-modules/spring-5-reactive-2/pom.xml b/spring-reactive-modules/spring-reactive-2/pom.xml
similarity index 98%
rename from spring-reactive-modules/spring-5-reactive-2/pom.xml
rename to spring-reactive-modules/spring-reactive-2/pom.xml
index 41c434fb92..ba40f3b48a 100644
--- a/spring-reactive-modules/spring-5-reactive-2/pom.xml
+++ b/spring-reactive-modules/spring-reactive-2/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>spring-5-reactive-2</artifactId>
+    <artifactId>spring-reactive-2</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>spring-5-reactive-2</name>
     <packaging>jar</packaging>
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/consumer/ConsumerSSEApplication.java b/spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/consumer/ConsumerSSEApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/consumer/ConsumerSSEApplication.java
rename to spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/consumer/ConsumerSSEApplication.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/consumer/controller/ClientController.java b/spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/consumer/controller/ClientController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/consumer/controller/ClientController.java
rename to spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/consumer/controller/ClientController.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/server/ServerSSEApplication.java b/spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/server/ServerSSEApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/server/ServerSSEApplication.java
rename to spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/server/ServerSSEApplication.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/server/controllers/ServerController.java b/spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/server/controllers/ServerController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/server/controllers/ServerController.java
rename to spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/reactive/serversentevents/server/controllers/ServerController.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/staticcontent/StaticContentApplication.java b/spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/staticcontent/StaticContentApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/staticcontent/StaticContentApplication.java
rename to spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/staticcontent/StaticContentApplication.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/staticcontent/StaticContentConfig.java b/spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/staticcontent/StaticContentConfig.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/staticcontent/StaticContentConfig.java
rename to spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/staticcontent/StaticContentConfig.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/FunctionalValidationsApplication.java b/spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/FunctionalValidationsApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/FunctionalValidationsApplication.java
rename to spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/FunctionalValidationsApplication.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/AbstractValidationHandler.java b/spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/AbstractValidationHandler.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/AbstractValidationHandler.java
rename to spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/AbstractValidationHandler.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/FunctionalHandler.java b/spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/FunctionalHandler.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/FunctionalHandler.java
rename to spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/FunctionalHandler.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/AnnotatedRequestEntityValidationHandler.java b/spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/AnnotatedRequestEntityValidationHandler.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/AnnotatedRequestEntityValidationHandler.java
rename to spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/AnnotatedRequestEntityValidationHandler.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/CustomRequestEntityValidationHandler.java b/spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/CustomRequestEntityValidationHandler.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/CustomRequestEntityValidationHandler.java
rename to spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/CustomRequestEntityValidationHandler.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/OtherEntityValidationHandler.java b/spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/OtherEntityValidationHandler.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/OtherEntityValidationHandler.java
rename to spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/handlers/impl/OtherEntityValidationHandler.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/model/AnnotatedRequestEntity.java b/spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/model/AnnotatedRequestEntity.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/model/AnnotatedRequestEntity.java
rename to spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/model/AnnotatedRequestEntity.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/model/CustomRequestEntity.java b/spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/model/CustomRequestEntity.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/model/CustomRequestEntity.java
rename to spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/model/CustomRequestEntity.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/model/OtherEntity.java b/spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/model/OtherEntity.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/model/OtherEntity.java
rename to spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/model/OtherEntity.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/routers/ValidationsRouters.java b/spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/routers/ValidationsRouters.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/routers/ValidationsRouters.java
rename to spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/routers/ValidationsRouters.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/validators/CustomRequestEntityValidator.java b/spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/validators/CustomRequestEntityValidator.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/validators/CustomRequestEntityValidator.java
rename to spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/validators/CustomRequestEntityValidator.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/validators/OtherEntityValidator.java b/spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/validators/OtherEntityValidator.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/java/com/baeldung/validations/functional/validators/OtherEntityValidator.java
rename to spring-reactive-modules/spring-reactive-2/src/main/java/com/baeldung/validations/functional/validators/OtherEntityValidator.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/main/resources/application-assets-custom-location.properties b/spring-reactive-modules/spring-reactive-2/src/main/resources/application-assets-custom-location.properties
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/main/resources/application-assets-custom-location.properties
rename to spring-reactive-modules/spring-reactive-2/src/main/resources/application-assets-custom-location.properties
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/backpressure/BackpressureUnitTest.java b/spring-reactive-modules/spring-reactive-2/src/test/java/com/baeldung/backpressure/BackpressureUnitTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/backpressure/BackpressureUnitTest.java
rename to spring-reactive-modules/spring-reactive-2/src/test/java/com/baeldung/backpressure/BackpressureUnitTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/reactive/serversentsevents/ServiceSentEventLiveTest.java b/spring-reactive-modules/spring-reactive-2/src/test/java/com/baeldung/reactive/serversentsevents/ServiceSentEventLiveTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/reactive/serversentsevents/ServiceSentEventLiveTest.java
rename to spring-reactive-modules/spring-reactive-2/src/test/java/com/baeldung/reactive/serversentsevents/ServiceSentEventLiveTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/staticcontent/StaticContentCustomLocationIntegrationTest.java b/spring-reactive-modules/spring-reactive-2/src/test/java/com/baeldung/staticcontent/StaticContentCustomLocationIntegrationTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/staticcontent/StaticContentCustomLocationIntegrationTest.java
rename to spring-reactive-modules/spring-reactive-2/src/test/java/com/baeldung/staticcontent/StaticContentCustomLocationIntegrationTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/staticcontent/StaticContentDefaultLocationIntegrationTest.java b/spring-reactive-modules/spring-reactive-2/src/test/java/com/baeldung/staticcontent/StaticContentDefaultLocationIntegrationTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/staticcontent/StaticContentDefaultLocationIntegrationTest.java
rename to spring-reactive-modules/spring-reactive-2/src/test/java/com/baeldung/staticcontent/StaticContentDefaultLocationIntegrationTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/PostExecutionUnitTest.java b/spring-reactive-modules/spring-reactive-2/src/test/java/com/baeldung/stepverifier/PostExecutionUnitTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/PostExecutionUnitTest.java
rename to spring-reactive-modules/spring-reactive-2/src/test/java/com/baeldung/stepverifier/PostExecutionUnitTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/StepByStepUnitTest.java b/spring-reactive-modules/spring-reactive-2/src/test/java/com/baeldung/stepverifier/StepByStepUnitTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/StepByStepUnitTest.java
rename to spring-reactive-modules/spring-reactive-2/src/test/java/com/baeldung/stepverifier/StepByStepUnitTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/TestingTestPublisherUnitTest.java b/spring-reactive-modules/spring-reactive-2/src/test/java/com/baeldung/stepverifier/TestingTestPublisherUnitTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/TestingTestPublisherUnitTest.java
rename to spring-reactive-modules/spring-reactive-2/src/test/java/com/baeldung/stepverifier/TestingTestPublisherUnitTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/TimeBasedUnitTest.java b/spring-reactive-modules/spring-reactive-2/src/test/java/com/baeldung/stepverifier/TimeBasedUnitTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/stepverifier/TimeBasedUnitTest.java
rename to spring-reactive-modules/spring-reactive-2/src/test/java/com/baeldung/stepverifier/TimeBasedUnitTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/validations/functional/FunctionalEndpointValidationsLiveTest.java b/spring-reactive-modules/spring-reactive-2/src/test/java/com/baeldung/validations/functional/FunctionalEndpointValidationsLiveTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/test/java/com/baeldung/validations/functional/FunctionalEndpointValidationsLiveTest.java
rename to spring-reactive-modules/spring-reactive-2/src/test/java/com/baeldung/validations/functional/FunctionalEndpointValidationsLiveTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/test/resources/assets/index.html b/spring-reactive-modules/spring-reactive-2/src/test/resources/assets/index.html
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/test/resources/assets/index.html
rename to spring-reactive-modules/spring-reactive-2/src/test/resources/assets/index.html
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/test/resources/img/example-image.png b/spring-reactive-modules/spring-reactive-2/src/test/resources/img/example-image.png
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/test/resources/img/example-image.png
rename to spring-reactive-modules/spring-reactive-2/src/test/resources/img/example-image.png
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/test/resources/logback-test.xml b/spring-reactive-modules/spring-reactive-2/src/test/resources/logback-test.xml
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/test/resources/logback-test.xml
rename to spring-reactive-modules/spring-reactive-2/src/test/resources/logback-test.xml
diff --git a/spring-reactive-modules/spring-5-reactive-2/src/test/resources/public/index.html b/spring-reactive-modules/spring-reactive-2/src/test/resources/public/index.html
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-2/src/test/resources/public/index.html
rename to spring-reactive-modules/spring-reactive-2/src/test/resources/public/index.html
diff --git a/spring-reactive-modules/spring-5-reactive-3/.gitignore b/spring-reactive-modules/spring-reactive-3/.gitignore
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-3/.gitignore
rename to spring-reactive-modules/spring-reactive-3/.gitignore
diff --git a/spring-reactive-modules/spring-5-reactive-3/README.md b/spring-reactive-modules/spring-reactive-3/README.md
similarity index 72%
rename from spring-reactive-modules/spring-5-reactive-3/README.md
rename to spring-reactive-modules/spring-reactive-3/README.md
index 38036f929b..640a60d63d 100644
--- a/spring-reactive-modules/spring-5-reactive-3/README.md
+++ b/spring-reactive-modules/spring-reactive-3/README.md
@@ -1,9 +1,8 @@
 ## Spring 5 Reactive Project
 
-This module contains articles about reactive Spring 5.
+This module contains articles about reactive Spring Boot.
 
 - [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/pom.xml b/spring-reactive-modules/spring-reactive-3/pom.xml
similarity index 98%
rename from spring-reactive-modules/spring-5-reactive-3/pom.xml
rename to spring-reactive-modules/spring-reactive-3/pom.xml
index d33b63e921..7672fa29f3 100644
--- a/spring-reactive-modules/spring-5-reactive-3/pom.xml
+++ b/spring-reactive-modules/spring-reactive-3/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>spring-5-reactive-3</artifactId>
+    <artifactId>spring-reactive-3</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>spring-5-reactive-3</name>
     <packaging>jar</packaging>
diff --git a/spring-reactive-modules/spring-5-reactive-3/src/main/java/com/baeldung/databuffer/DataBufferToInputStream.java b/spring-reactive-modules/spring-reactive-3/src/main/java/com/baeldung/databuffer/DataBufferToInputStream.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-3/src/main/java/com/baeldung/databuffer/DataBufferToInputStream.java
rename to spring-reactive-modules/spring-reactive-3/src/main/java/com/baeldung/databuffer/DataBufferToInputStream.java
diff --git a/spring-reactive-modules/spring-5-reactive-3/src/main/java/com/baeldung/webflux/logging/WebFluxLoggingExample.java b/spring-reactive-modules/spring-reactive-3/src/main/java/com/baeldung/webflux/logging/WebFluxLoggingExample.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-3/src/main/java/com/baeldung/webflux/logging/WebFluxLoggingExample.java
rename to spring-reactive-modules/spring-reactive-3/src/main/java/com/baeldung/webflux/logging/WebFluxLoggingExample.java
diff --git a/spring-reactive-modules/spring-5-reactive-3/src/main/resources/application.properties b/spring-reactive-modules/spring-reactive-3/src/main/resources/application.properties
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-3/src/main/resources/application.properties
rename to spring-reactive-modules/spring-reactive-3/src/main/resources/application.properties
diff --git a/spring-reactive-modules/spring-5-reactive-3/src/test/java/com/baeldung/cancelflux/CancelFluxUnitTest.java b/spring-reactive-modules/spring-reactive-3/src/test/java/com/baeldung/cancelflux/CancelFluxUnitTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-3/src/test/java/com/baeldung/cancelflux/CancelFluxUnitTest.java
rename to spring-reactive-modules/spring-reactive-3/src/test/java/com/baeldung/cancelflux/CancelFluxUnitTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-3/src/test/java/com/baeldung/databuffer/DataBufferToInputStreamUnitTest.java b/spring-reactive-modules/spring-reactive-3/src/test/java/com/baeldung/databuffer/DataBufferToInputStreamUnitTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-3/src/test/java/com/baeldung/databuffer/DataBufferToInputStreamUnitTest.java
rename to spring-reactive-modules/spring-reactive-3/src/test/java/com/baeldung/databuffer/DataBufferToInputStreamUnitTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-3/src/test/resources/logback-test.xml b/spring-reactive-modules/spring-reactive-3/src/test/resources/logback-test.xml
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-3/src/test/resources/logback-test.xml
rename to spring-reactive-modules/spring-reactive-3/src/test/resources/logback-test.xml
diff --git a/spring-reactive-modules/spring-5-reactive-3/src/test/resources/user-response.json b/spring-reactive-modules/spring-reactive-3/src/test/resources/user-response.json
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-3/src/test/resources/user-response.json
rename to spring-reactive-modules/spring-reactive-3/src/test/resources/user-response.json
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/README.md b/spring-reactive-modules/spring-reactive-client-2/README.md
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/README.md
rename to spring-reactive-modules/spring-reactive-client-2/README.md
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/pom.xml b/spring-reactive-modules/spring-reactive-client-2/pom.xml
similarity index 94%
rename from spring-reactive-modules/spring-5-reactive-client-2/pom.xml
rename to spring-reactive-modules/spring-reactive-client-2/pom.xml
index e86134badc..5d5f3ebc2e 100644
--- a/spring-reactive-modules/spring-5-reactive-client-2/pom.xml
+++ b/spring-reactive-modules/spring-reactive-client-2/pom.xml
@@ -3,10 +3,10 @@
     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-5-reactive-client-2</artifactId>
-    <name>spring-5-reactive-client-2</name>
+    <artifactId>spring-reactive-client-2</artifactId>
+    <name>spring-reactive-client-2</name>
     <packaging>jar</packaging>
-    <description>spring 5 sample project about new features</description>
+    <description>spring boot sample project about new features</description>
 
     <parent>
         <groupId>com.baeldung.spring.reactive</groupId>
@@ -93,10 +93,6 @@
             <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>
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/LimitRequestsApp.java b/spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/LimitRequestsApp.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/LimitRequestsApp.java
rename to spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/LimitRequestsApp.java
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/DelayElements.java b/spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/DelayElements.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/DelayElements.java
rename to spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/DelayElements.java
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/GuavaRateLimit.java b/spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/GuavaRateLimit.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/GuavaRateLimit.java
rename to spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/GuavaRateLimit.java
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/LimitConcurrency.java b/spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/LimitConcurrency.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/LimitConcurrency.java
rename to spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/LimitConcurrency.java
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/Resilience4jRateLimit.java b/spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/Resilience4jRateLimit.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/Resilience4jRateLimit.java
rename to spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/Resilience4jRateLimit.java
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/ZipWithInterval.java b/spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/ZipWithInterval.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/ZipWithInterval.java
rename to spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/ZipWithInterval.java
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/utils/Client.java b/spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/utils/Client.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/utils/Client.java
rename to spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/utils/Client.java
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/utils/RandomConsumer.java b/spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/utils/RandomConsumer.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/utils/RandomConsumer.java
rename to spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/client/utils/RandomConsumer.java
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/server/Concurrency.java b/spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/server/Concurrency.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/server/Concurrency.java
rename to spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/server/Concurrency.java
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/server/RandomController.java b/spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/server/RandomController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/limitrequests/server/RandomController.java
rename to spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/limitrequests/server/RandomController.java
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/streamlargefile/StreamLargeFileApp.java b/spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/streamlargefile/StreamLargeFileApp.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/streamlargefile/StreamLargeFileApp.java
rename to spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/streamlargefile/StreamLargeFileApp.java
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/streamlargefile/client/LargeFileDownloadWebClient.java b/spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/streamlargefile/client/LargeFileDownloadWebClient.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/streamlargefile/client/LargeFileDownloadWebClient.java
rename to spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/streamlargefile/client/LargeFileDownloadWebClient.java
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/streamlargefile/client/LimitedFileDownloadWebClient.java b/spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/streamlargefile/client/LimitedFileDownloadWebClient.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/streamlargefile/client/LimitedFileDownloadWebClient.java
rename to spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/streamlargefile/client/LimitedFileDownloadWebClient.java
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/streamlargefile/server/LargeFileController.java b/spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/streamlargefile/server/LargeFileController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/main/java/com/baeldung/streamlargefile/server/LargeFileController.java
rename to spring-reactive-modules/spring-reactive-client-2/src/main/java/com/baeldung/streamlargefile/server/LargeFileController.java
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/main/resources/application.properties b/spring-reactive-modules/spring-reactive-client-2/src/main/resources/application.properties
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/main/resources/application.properties
rename to spring-reactive-modules/spring-reactive-client-2/src/main/resources/application.properties
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/main/resources/logback.xml b/spring-reactive-modules/spring-reactive-client-2/src/main/resources/logback.xml
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/main/resources/logback.xml
rename to spring-reactive-modules/spring-reactive-client-2/src/main/resources/logback.xml
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/main/resources/streamlargefile/generate-sample-files.sh b/spring-reactive-modules/spring-reactive-client-2/src/main/resources/streamlargefile/generate-sample-files.sh
old mode 100755
new mode 100644
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/main/resources/streamlargefile/generate-sample-files.sh
rename to spring-reactive-modules/spring-reactive-client-2/src/main/resources/streamlargefile/generate-sample-files.sh
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/main/resources/streamlargefile/run.sh b/spring-reactive-modules/spring-reactive-client-2/src/main/resources/streamlargefile/run.sh
old mode 100755
new mode 100644
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/main/resources/streamlargefile/run.sh
rename to spring-reactive-modules/spring-reactive-client-2/src/main/resources/streamlargefile/run.sh
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/test/java/com/baeldung/limitrequests/RandomControllerLiveTest.java b/spring-reactive-modules/spring-reactive-client-2/src/test/java/com/baeldung/limitrequests/RandomControllerLiveTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/test/java/com/baeldung/limitrequests/RandomControllerLiveTest.java
rename to spring-reactive-modules/spring-reactive-client-2/src/test/java/com/baeldung/limitrequests/RandomControllerLiveTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/test/java/com/baeldung/streamlargefile/LargeFileControllerLiveTest.java b/spring-reactive-modules/spring-reactive-client-2/src/test/java/com/baeldung/streamlargefile/LargeFileControllerLiveTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/test/java/com/baeldung/streamlargefile/LargeFileControllerLiveTest.java
rename to spring-reactive-modules/spring-reactive-client-2/src/test/java/com/baeldung/streamlargefile/LargeFileControllerLiveTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-client-2/src/test/resources/logback-test.xml b/spring-reactive-modules/spring-reactive-client-2/src/test/resources/logback-test.xml
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client-2/src/test/resources/logback-test.xml
rename to spring-reactive-modules/spring-reactive-client-2/src/test/resources/logback-test.xml
diff --git a/spring-reactive-modules/spring-5-reactive-client/.gitignore b/spring-reactive-modules/spring-reactive-client/.gitignore
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/.gitignore
rename to spring-reactive-modules/spring-reactive-client/.gitignore
diff --git a/spring-reactive-modules/spring-5-reactive-client/README.md b/spring-reactive-modules/spring-reactive-client/README.md
similarity index 89%
rename from spring-reactive-modules/spring-5-reactive-client/README.md
rename to spring-reactive-modules/spring-reactive-client/README.md
index f1793070b3..fc67a4f16e 100644
--- a/spring-reactive-modules/spring-5-reactive-client/README.md
+++ b/spring-reactive-modules/spring-reactive-client/README.md
@@ -9,8 +9,8 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Logging Spring WebClient Calls](https://www.baeldung.com/spring-log-webclient-calls)
 - [Simultaneous Spring WebClient Calls](https://www.baeldung.com/spring-webclient-simultaneous-calls)
 - [Mocking a WebClient in Spring](https://www.baeldung.com/spring-mocking-webclient)
-- [Spring WebClient Filters](https://www.baeldung.com/spring-webclient-filters)
 - [Get List of JSON Objects with WebClient](https://www.baeldung.com/spring-webclient-json-list)
 - [Upload a File with WebClient](https://www.baeldung.com/spring-webclient-upload-file)
 - [How to Get Response Body When Testing the Status Code in WebFlux WebClient](https://www.baeldung.com/spring-webclient-get-response-body)
+- [Spring Boot FeignClient vs. WebClient](https://www.baeldung.com/spring-boot-feignclient-vs-webclient)
 - More articles: [[next -->]](../spring-5-reactive-client-2)
diff --git a/spring-reactive-modules/spring-5-reactive-client/pom.xml b/spring-reactive-modules/spring-reactive-client/pom.xml
similarity index 93%
rename from spring-reactive-modules/spring-5-reactive-client/pom.xml
rename to spring-reactive-modules/spring-reactive-client/pom.xml
index a0e5f7794e..94134e5271 100644
--- a/spring-reactive-modules/spring-5-reactive-client/pom.xml
+++ b/spring-reactive-modules/spring-reactive-client/pom.xml
@@ -3,10 +3,10 @@
     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-5-reactive-client</artifactId>
-    <name>spring-5-reactive-client</name>
+    <artifactId>spring-reactive-client</artifactId>
+    <name>spring-reactive-client</name>
     <packaging>jar</packaging>
-    <description>spring 5 sample project about new features</description>
+    <description>spring boot sample project about new features</description>
 
     <parent>
         <groupId>com.baeldung.spring.reactive</groupId>
@@ -32,8 +32,9 @@
             <artifactId>spring-boot-starter-webflux</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <version>${spring-cloud-starter-openfeign.version}</version>
         </dependency>
         <dependency>
             <groupId>org.projectreactor</groupId>
@@ -176,13 +177,12 @@
 
     <properties>
         <reactor-spring.version>1.0.1.RELEASE</reactor-spring.version>
-        <johnzon.version>1.1.3</johnzon.version>
-        <jsonb-api.version>1.0</jsonb-api.version>
         <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.5.3</reactor-test.version>
         <wiremock-standalone.version>2.26.0</wiremock-standalone.version>
+        <spring-cloud-starter-openfeign.version>3.1.4</spring-cloud-starter-openfeign.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/controller/UploadController.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/controller/UploadController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/controller/UploadController.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/controller/UploadController.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/enums/Role.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/enums/Role.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/enums/Role.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/enums/Role.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/exception/ServiceException.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/exception/ServiceException.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/exception/ServiceException.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/exception/ServiceException.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/model/Employee.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/model/Employee.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/model/Employee.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/model/Employee.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/model/Foo.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/model/Foo.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/model/Foo.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/model/Foo.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/service/EmployeeService.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/service/EmployeeService.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/service/EmployeeService.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/service/EmployeeService.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/service/ReactiveUploadService.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/service/ReactiveUploadService.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/service/ReactiveUploadService.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/service/ReactiveUploadService.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Item.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Item.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Item.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Item.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/User.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/User.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/User.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/User.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/UserWithItem.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/UserWithItem.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/UserWithItem.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/UserWithItem.java
diff --git a/spring-reactive-modules/spring-5-reactive-3/src/main/java/com/baeldung/webclient/Product.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/Product.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-3/src/main/java/com/baeldung/webclient/Product.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/Product.java
diff --git a/spring-reactive-modules/spring-5-reactive-3/src/main/java/com/baeldung/webclient/ProductsFeignClient.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/ProductsFeignClient.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-3/src/main/java/com/baeldung/webclient/ProductsFeignClient.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/ProductsFeignClient.java
diff --git a/spring-reactive-modules/spring-5-reactive-3/src/main/java/com/baeldung/webclient/ProductsSlowServiceController.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/ProductsSlowServiceController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-3/src/main/java/com/baeldung/webclient/ProductsSlowServiceController.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/ProductsSlowServiceController.java
diff --git a/spring-reactive-modules/spring-5-reactive-3/src/main/java/com/baeldung/webclient/WebClientApplication.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/WebClientApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-3/src/main/java/com/baeldung/webclient/WebClientApplication.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/WebClientApplication.java
diff --git a/spring-reactive-modules/spring-5-reactive-3/src/main/java/com/baeldung/webclient/WebController.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/WebController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-3/src/main/java/com/baeldung/webclient/WebController.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/WebController.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/ReaderConsumerService.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/json/ReaderConsumerService.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/ReaderConsumerService.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/json/ReaderConsumerService.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/ReaderConsumerServiceImpl.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/json/ReaderConsumerServiceImpl.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/ReaderConsumerServiceImpl.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/json/ReaderConsumerServiceImpl.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/model/Book.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/json/model/Book.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/model/Book.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/json/model/Book.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/model/Reader.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/json/model/Reader.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/json/model/Reader.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/json/model/Reader.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/status/WebClientStatusCodeHandler.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/status/WebClientStatusCodeHandler.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/status/WebClientStatusCodeHandler.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/status/WebClientStatusCodeHandler.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/status/exception/CustomBadRequestException.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/status/exception/CustomBadRequestException.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/status/exception/CustomBadRequestException.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/status/exception/CustomBadRequestException.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/status/exception/CustomServerErrorException.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/status/exception/CustomServerErrorException.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/status/exception/CustomServerErrorException.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/status/exception/CustomServerErrorException.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/timeout/WebClientTimeoutProvider.java b/spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/timeout/WebClientTimeoutProvider.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/timeout/WebClientTimeoutProvider.java
rename to spring-reactive-modules/spring-reactive-client/src/main/java/com/baeldung/webclient/timeout/WebClientTimeoutProvider.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/resources/application.properties b/spring-reactive-modules/spring-reactive-client/src/main/resources/application.properties
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/resources/application.properties
rename to spring-reactive-modules/spring-reactive-client/src/main/resources/application.properties
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/resources/logback.xml b/spring-reactive-modules/spring-reactive-client/src/main/resources/logback.xml
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/resources/logback.xml
rename to spring-reactive-modules/spring-reactive-client/src/main/resources/logback.xml
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/webapp/WEB-INF/web.xml b/spring-reactive-modules/spring-reactive-client/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/webapp/WEB-INF/web.xml
rename to spring-reactive-modules/spring-reactive-client/src/main/webapp/WEB-INF/web.xml
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/SpringContextTest.java b/spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/SpringContextTest.java
rename to spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/SpringContextTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/ReactiveIntegrationTest.java b/spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/reactive/ReactiveIntegrationTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/ReactiveIntegrationTest.java
rename to spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/reactive/ReactiveIntegrationTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/Spring5ReactiveTestApplication.java b/spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/reactive/Spring5ReactiveTestApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/Spring5ReactiveTestApplication.java
rename to spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/reactive/Spring5ReactiveTestApplication.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/WebClientLoggingIntegrationTest.java b/spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/reactive/logging/WebClientLoggingIntegrationTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/WebClientLoggingIntegrationTest.java
rename to spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/reactive/logging/WebClientLoggingIntegrationTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/filters/LogFilters.java b/spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/reactive/logging/filters/LogFilters.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/filters/LogFilters.java
rename to spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/reactive/logging/filters/LogFilters.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/jetty/RequestLogEnhancer.java b/spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/reactive/logging/jetty/RequestLogEnhancer.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/logging/jetty/RequestLogEnhancer.java
rename to spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/reactive/logging/jetty/RequestLogEnhancer.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/service/EmployeeServiceIntegrationTest.java b/spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/reactive/service/EmployeeServiceIntegrationTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/service/EmployeeServiceIntegrationTest.java
rename to spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/reactive/service/EmployeeServiceIntegrationTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/service/EmployeeServiceUnitTest.java b/spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/reactive/service/EmployeeServiceUnitTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/service/EmployeeServiceUnitTest.java
rename to spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/reactive/service/EmployeeServiceUnitTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/service/ReactiveUploadServiceUnitTest.java b/spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/reactive/service/ReactiveUploadServiceUnitTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/service/ReactiveUploadServiceUnitTest.java
rename to spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/reactive/service/ReactiveUploadServiceUnitTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/webclient/simultaneous/ClientIntegrationTest.java b/spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/reactive/webclient/simultaneous/ClientIntegrationTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/reactive/webclient/simultaneous/ClientIntegrationTest.java
rename to spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/reactive/webclient/simultaneous/ClientIntegrationTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/webclient/WebClientStatusCodeHandlerIntegrationTest.java b/spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/webclient/WebClientStatusCodeHandlerIntegrationTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/webclient/WebClientStatusCodeHandlerIntegrationTest.java
rename to spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/webclient/WebClientStatusCodeHandlerIntegrationTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-3/src/test/java/com/baeldung/webclient/WebControllerIntegrationTest.java b/spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/webclient/WebControllerIntegrationTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-3/src/test/java/com/baeldung/webclient/WebControllerIntegrationTest.java
rename to spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/webclient/WebControllerIntegrationTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/webclient/json/ReaderConsumerServiceImplUnitTest.java b/spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/webclient/json/ReaderConsumerServiceImplUnitTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/webclient/json/ReaderConsumerServiceImplUnitTest.java
rename to spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/webclient/json/ReaderConsumerServiceImplUnitTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/webclient/timeout/WebClientTimeoutIntegrationTest.java b/spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/webclient/timeout/WebClientTimeoutIntegrationTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/webclient/timeout/WebClientTimeoutIntegrationTest.java
rename to spring-reactive-modules/spring-reactive-client/src/test/java/com/baeldung/webclient/timeout/WebClientTimeoutIntegrationTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/test/resources/logback-test.xml b/spring-reactive-modules/spring-reactive-client/src/test/resources/logback-test.xml
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-client/src/test/resources/logback-test.xml
rename to spring-reactive-modules/spring-reactive-client/src/test/resources/logback-test.xml
diff --git a/spring-reactive-modules/spring-5-data-reactive-2/README.md b/spring-reactive-modules/spring-reactive-data-2/README.md
similarity index 80%
rename from spring-reactive-modules/spring-5-data-reactive-2/README.md
rename to spring-reactive-modules/spring-reactive-data-2/README.md
index ffc664b8af..c13171cbc6 100644
--- a/spring-reactive-modules/spring-5-data-reactive-2/README.md
+++ b/spring-reactive-modules/spring-reactive-data-2/README.md
@@ -1,6 +1,6 @@
 ## Spring Data Reactive Project
 
-This module contains articles about reactive Spring 5 Data
+This module contains articles about reactive Spring Boot Data
 
 ### The Course
 
diff --git a/spring-reactive-modules/spring-5-data-reactive-2/pom.xml b/spring-reactive-modules/spring-reactive-data-2/pom.xml
similarity index 85%
rename from spring-reactive-modules/spring-5-data-reactive-2/pom.xml
rename to spring-reactive-modules/spring-reactive-data-2/pom.xml
index 3d88e672eb..64ce278973 100644
--- a/spring-reactive-modules/spring-5-data-reactive-2/pom.xml
+++ b/spring-reactive-modules/spring-reactive-data-2/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>spring-5-data-reactive-2</artifactId>
-    <name>spring-5-data-reactive-2</name>
+    <artifactId>spring-reactive-data-2</artifactId>
+    <name>spring-reactive-data-2</name>
     <packaging>jar</packaging>
 
     <parent>
@@ -14,8 +14,6 @@
     </parent>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -56,11 +54,6 @@
             <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>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
diff --git a/spring-reactive-modules/spring-5-data-reactive-2/src/main/java/com/baeldung/pagination/PaginationApplication.java b/spring-reactive-modules/spring-reactive-data-2/src/main/java/com/baeldung/pagination/PaginationApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-data-reactive-2/src/main/java/com/baeldung/pagination/PaginationApplication.java
rename to spring-reactive-modules/spring-reactive-data-2/src/main/java/com/baeldung/pagination/PaginationApplication.java
diff --git a/spring-reactive-modules/spring-5-data-reactive-2/src/main/java/com/baeldung/pagination/config/CustomWebMvcConfigurationSupport.java b/spring-reactive-modules/spring-reactive-data-2/src/main/java/com/baeldung/pagination/config/CustomWebMvcConfigurationSupport.java
similarity index 100%
rename from spring-reactive-modules/spring-5-data-reactive-2/src/main/java/com/baeldung/pagination/config/CustomWebMvcConfigurationSupport.java
rename to spring-reactive-modules/spring-reactive-data-2/src/main/java/com/baeldung/pagination/config/CustomWebMvcConfigurationSupport.java
diff --git a/spring-reactive-modules/spring-5-data-reactive-2/src/main/java/com/baeldung/pagination/config/DatabaseConfig.java b/spring-reactive-modules/spring-reactive-data-2/src/main/java/com/baeldung/pagination/config/DatabaseConfig.java
similarity index 100%
rename from spring-reactive-modules/spring-5-data-reactive-2/src/main/java/com/baeldung/pagination/config/DatabaseConfig.java
rename to spring-reactive-modules/spring-reactive-data-2/src/main/java/com/baeldung/pagination/config/DatabaseConfig.java
diff --git a/spring-reactive-modules/spring-5-data-reactive-2/src/main/java/com/baeldung/pagination/controller/ProductPaginationController.java b/spring-reactive-modules/spring-reactive-data-2/src/main/java/com/baeldung/pagination/controller/ProductPaginationController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-data-reactive-2/src/main/java/com/baeldung/pagination/controller/ProductPaginationController.java
rename to spring-reactive-modules/spring-reactive-data-2/src/main/java/com/baeldung/pagination/controller/ProductPaginationController.java
diff --git a/spring-reactive-modules/spring-5-data-reactive-2/src/main/java/com/baeldung/pagination/model/Product.java b/spring-reactive-modules/spring-reactive-data-2/src/main/java/com/baeldung/pagination/model/Product.java
similarity index 100%
rename from spring-reactive-modules/spring-5-data-reactive-2/src/main/java/com/baeldung/pagination/model/Product.java
rename to spring-reactive-modules/spring-reactive-data-2/src/main/java/com/baeldung/pagination/model/Product.java
diff --git a/spring-reactive-modules/spring-5-data-reactive-2/src/main/java/com/baeldung/pagination/repository/ProductRepository.java b/spring-reactive-modules/spring-reactive-data-2/src/main/java/com/baeldung/pagination/repository/ProductRepository.java
similarity index 100%
rename from spring-reactive-modules/spring-5-data-reactive-2/src/main/java/com/baeldung/pagination/repository/ProductRepository.java
rename to spring-reactive-modules/spring-reactive-data-2/src/main/java/com/baeldung/pagination/repository/ProductRepository.java
diff --git a/spring-reactive-modules/spring-reactive-data-2/src/main/resources/application.properties b/spring-reactive-modules/spring-reactive-data-2/src/main/resources/application.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/spring-reactive-modules/spring-5-data-reactive-2/src/main/resources/init.sql b/spring-reactive-modules/spring-reactive-data-2/src/main/resources/init.sql
similarity index 100%
rename from spring-reactive-modules/spring-5-data-reactive-2/src/main/resources/init.sql
rename to spring-reactive-modules/spring-reactive-data-2/src/main/resources/init.sql
diff --git a/spring-reactive-modules/spring-5-data-reactive-2/src/test/java/com/baeldung/pagination/controller/ProductPaginationControllerIntegrationTest.java b/spring-reactive-modules/spring-reactive-data-2/src/test/java/com/baeldung/pagination/controller/ProductPaginationControllerIntegrationTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-data-reactive-2/src/test/java/com/baeldung/pagination/controller/ProductPaginationControllerIntegrationTest.java
rename to spring-reactive-modules/spring-reactive-data-2/src/test/java/com/baeldung/pagination/controller/ProductPaginationControllerIntegrationTest.java
diff --git a/spring-reactive-modules/spring-reactive-data/README.md b/spring-reactive-modules/spring-reactive-data/README.md
new file mode 100644
index 0000000000..cafd0c502f
--- /dev/null
+++ b/spring-reactive-modules/spring-reactive-data/README.md
@@ -0,0 +1,9 @@
+## Spring Data Reactive Project
+
+This module contains articles about reactive Spring Boot Data
+
+### The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
+
+### Relevant Articles
+- [A Quick Look at R2DBC with Spring Data](https://www.baeldung.com/spring-data-r2dbc)
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-reactive-data/pom.xml b/spring-reactive-modules/spring-reactive-data/pom.xml
new file mode 100644
index 0000000000..91c4dca6e8
--- /dev/null
+++ b/spring-reactive-modules/spring-reactive-data/pom.xml
@@ -0,0 +1,74 @@
+<?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>
+    <artifactId>spring-reactive-data</artifactId>
+    <name>spring-reactive-data</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.spring.reactive</groupId>
+        <artifactId>spring-reactive-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <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>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <scope>test</scope>
+        </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-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-r2dbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.r2dbc</groupId>
+            <artifactId>r2dbc-h2</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <log4j2.version>2.17.1</log4j2.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/R2dbcApplication.java b/spring-reactive-modules/spring-reactive-data/src/main/java/com/baeldung/r2dbc/R2dbcApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/R2dbcApplication.java
rename to spring-reactive-modules/spring-reactive-data/src/main/java/com/baeldung/r2dbc/R2dbcApplication.java
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/configuration/R2DBCConfiguration.java b/spring-reactive-modules/spring-reactive-data/src/main/java/com/baeldung/r2dbc/configuration/R2DBCConfiguration.java
similarity index 100%
rename from spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/configuration/R2DBCConfiguration.java
rename to spring-reactive-modules/spring-reactive-data/src/main/java/com/baeldung/r2dbc/configuration/R2DBCConfiguration.java
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/model/Player.java b/spring-reactive-modules/spring-reactive-data/src/main/java/com/baeldung/r2dbc/model/Player.java
similarity index 100%
rename from spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/model/Player.java
rename to spring-reactive-modules/spring-reactive-data/src/main/java/com/baeldung/r2dbc/model/Player.java
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/repository/PlayerRepository.java b/spring-reactive-modules/spring-reactive-data/src/main/java/com/baeldung/r2dbc/repository/PlayerRepository.java
similarity index 100%
rename from spring-reactive-modules/spring-5-data-reactive/src/main/java/com/baeldung/r2dbc/repository/PlayerRepository.java
rename to spring-reactive-modules/spring-reactive-data/src/main/java/com/baeldung/r2dbc/repository/PlayerRepository.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/resources/logback.xml b/spring-reactive-modules/spring-reactive-data/src/main/resources/logback.xml
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/resources/logback.xml
rename to spring-reactive-modules/spring-reactive-data/src/main/resources/logback.xml
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/SpringContextTest.java b/spring-reactive-modules/spring-reactive-data/src/test/java/com/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/SpringContextTest.java
rename to spring-reactive-modules/spring-reactive-data/src/test/java/com/baeldung/SpringContextTest.java
diff --git a/spring-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/r2dbc/R2dbcApplicationIntegrationTest.java b/spring-reactive-modules/spring-reactive-data/src/test/java/com/baeldung/r2dbc/R2dbcApplicationIntegrationTest.java
similarity index 93%
rename from spring-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/r2dbc/R2dbcApplicationIntegrationTest.java
rename to spring-reactive-modules/spring-reactive-data/src/test/java/com/baeldung/r2dbc/R2dbcApplicationIntegrationTest.java
index 1af570587e..b5e859ae2f 100644
--- a/spring-reactive-modules/spring-5-data-reactive/src/test/java/com/baeldung/r2dbc/R2dbcApplicationIntegrationTest.java
+++ b/spring-reactive-modules/spring-reactive-data/src/test/java/com/baeldung/r2dbc/R2dbcApplicationIntegrationTest.java
@@ -1,6 +1,7 @@
 package com.baeldung.r2dbc;
 
 
+import com.baeldung.r2dbc.configuration.R2DBCConfiguration;
 import com.baeldung.r2dbc.model.Player;
 import com.baeldung.r2dbc.repository.PlayerRepository;
 import io.r2dbc.h2.H2ConnectionFactory;
@@ -9,7 +10,7 @@ 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.data.r2dbc.core.DatabaseClient;
+import org.springframework.r2dbc.core.DatabaseClient;
 import org.springframework.test.context.junit4.SpringRunner;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Hooks;
@@ -20,7 +21,7 @@ import java.util.Arrays;
 import java.util.List;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(classes = R2DBCConfiguration.class)
 public class R2dbcApplicationIntegrationTest {
 
 
@@ -43,7 +44,7 @@ public class R2dbcApplicationIntegrationTest {
                 "DROP TABLE IF EXISTS player;",
                 "CREATE table player (id INT AUTO_INCREMENT NOT NULL, name VARCHAR2, age INT NOT NULL);");
 
-        statements.forEach(it -> client.execute(it) //
+        statements.forEach(it -> client.sql(it) //
                 .fetch() //
                 .rowsUpdated() //
                 .as(StepVerifier::create) //
diff --git a/spring-reactive-modules/spring-reactive-exceptions/README.md b/spring-reactive-modules/spring-reactive-exceptions/README.md
index fc1a31b26f..f10774d188 100644
--- a/spring-reactive-modules/spring-reactive-exceptions/README.md
+++ b/spring-reactive-modules/spring-reactive-exceptions/README.md
@@ -1,3 +1,3 @@
 ## Relevant Articles
 - [How to Resolve Spring Webflux DataBufferLimitException](https://www.baeldung.com/spring-webflux-databufferlimitexception)
-- [Custom WebFlux Exceptions in Spring Boot 3](https://www.baeldung.com/spring-boot-custom-webflux-exceptions)
+- [Custom WebFlux Exceptions in Spring Boot 3](https://www.baeldung.com/spring-boot-custom-webflux-exceptions)
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-5-reactive-filters/.gitignore b/spring-reactive-modules/spring-reactive-filters/.gitignore
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-filters/.gitignore
rename to spring-reactive-modules/spring-reactive-filters/.gitignore
diff --git a/spring-reactive-modules/spring-5-reactive-filters/README.md b/spring-reactive-modules/spring-reactive-filters/README.md
similarity index 76%
rename from spring-reactive-modules/spring-5-reactive-filters/README.md
rename to spring-reactive-modules/spring-reactive-filters/README.md
index 815ca35442..9d73eae9ee 100644
--- a/spring-reactive-modules/spring-5-reactive-filters/README.md
+++ b/spring-reactive-modules/spring-reactive-filters/README.md
@@ -8,3 +8,4 @@ The "REST With Spring" Classes: https://bit.ly/restwithspring
 ### Relevant Articles
 
 - [Spring WebFlux Filters](https://www.baeldung.com/spring-webflux-filters)
+- [Spring WebClient Filters](https://www.baeldung.com/spring-webclient-filters)
diff --git a/spring-reactive-modules/spring-5-reactive-filters/pom.xml b/spring-reactive-modules/spring-reactive-filters/pom.xml
similarity index 81%
rename from spring-reactive-modules/spring-5-reactive-filters/pom.xml
rename to spring-reactive-modules/spring-reactive-filters/pom.xml
index c9503d631a..67f7a11cb4 100644
--- a/spring-reactive-modules/spring-5-reactive-filters/pom.xml
+++ b/spring-reactive-modules/spring-reactive-filters/pom.xml
@@ -3,11 +3,11 @@
     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-5-reactive-filters</artifactId>
+    <artifactId>spring-reactive-filters</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>spring-5-reactive-filters</name>
+    <name>spring-reactive-filters</name>
     <packaging>jar</packaging>
-    <description>spring 5 sample project about new features</description>
+    <description>spring boot sample project about new features</description>
 
     <parent>
         <groupId>com.baeldung.spring.reactive</groupId>
@@ -49,6 +49,12 @@
             <artifactId>netty-all</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock-standalone</artifactId>
+            <version>${wiremock-standalone.version}</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 
@@ -65,4 +71,8 @@
         </plugins>
     </build>
 
+    <properties>
+        <wiremock-standalone.version>2.26.0</wiremock-standalone.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-5-reactive-filters/src/main/java/com/baeldung/reactive/Spring5ReactiveFiltersApplication.java b/spring-reactive-modules/spring-reactive-filters/src/main/java/com/baeldung/reactive/Spring5ReactiveFiltersApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-filters/src/main/java/com/baeldung/reactive/Spring5ReactiveFiltersApplication.java
rename to spring-reactive-modules/spring-reactive-filters/src/main/java/com/baeldung/reactive/Spring5ReactiveFiltersApplication.java
diff --git a/spring-reactive-modules/spring-5-reactive-filters/src/main/java/com/baeldung/reactive/filters/ExampleHandlerFilterFunction.java b/spring-reactive-modules/spring-reactive-filters/src/main/java/com/baeldung/reactive/filters/ExampleHandlerFilterFunction.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-filters/src/main/java/com/baeldung/reactive/filters/ExampleHandlerFilterFunction.java
rename to spring-reactive-modules/spring-reactive-filters/src/main/java/com/baeldung/reactive/filters/ExampleHandlerFilterFunction.java
diff --git a/spring-reactive-modules/spring-5-reactive-filters/src/main/java/com/baeldung/reactive/filters/ExampleWebFilter.java b/spring-reactive-modules/spring-reactive-filters/src/main/java/com/baeldung/reactive/filters/ExampleWebFilter.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-filters/src/main/java/com/baeldung/reactive/filters/ExampleWebFilter.java
rename to spring-reactive-modules/spring-reactive-filters/src/main/java/com/baeldung/reactive/filters/ExampleWebFilter.java
diff --git a/spring-reactive-modules/spring-5-reactive-filters/src/main/java/com/baeldung/reactive/filters/PlayerHandler.java b/spring-reactive-modules/spring-reactive-filters/src/main/java/com/baeldung/reactive/filters/PlayerHandler.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-filters/src/main/java/com/baeldung/reactive/filters/PlayerHandler.java
rename to spring-reactive-modules/spring-reactive-filters/src/main/java/com/baeldung/reactive/filters/PlayerHandler.java
diff --git a/spring-reactive-modules/spring-5-reactive-filters/src/main/java/com/baeldung/reactive/filters/PlayerRouter.java b/spring-reactive-modules/spring-reactive-filters/src/main/java/com/baeldung/reactive/filters/PlayerRouter.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-filters/src/main/java/com/baeldung/reactive/filters/PlayerRouter.java
rename to spring-reactive-modules/spring-reactive-filters/src/main/java/com/baeldung/reactive/filters/PlayerRouter.java
diff --git a/spring-reactive-modules/spring-5-reactive-filters/src/main/java/com/baeldung/reactive/filters/UserController.java b/spring-reactive-modules/spring-reactive-filters/src/main/java/com/baeldung/reactive/filters/UserController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-filters/src/main/java/com/baeldung/reactive/filters/UserController.java
rename to spring-reactive-modules/spring-reactive-filters/src/main/java/com/baeldung/reactive/filters/UserController.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/filter/WebClientFilters.java b/spring-reactive-modules/spring-reactive-filters/src/main/java/com/baeldung/reactive/filters/WebClientFilters.java
similarity index 98%
rename from spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/filter/WebClientFilters.java
rename to spring-reactive-modules/spring-reactive-filters/src/main/java/com/baeldung/reactive/filters/WebClientFilters.java
index c98caf67b4..34fff3c4cb 100644
--- a/spring-reactive-modules/spring-5-reactive-client/src/main/java/com/baeldung/webclient/filter/WebClientFilters.java
+++ b/spring-reactive-modules/spring-reactive-filters/src/main/java/com/baeldung/reactive/filters/WebClientFilters.java
@@ -1,4 +1,4 @@
-package com.baeldung.webclient.filter;
+package com.baeldung.reactive.filters;
 
 import java.io.PrintStream;
 import java.net.URI;
diff --git a/spring-reactive-modules/spring-5-reactive-filters/src/main/resources/application.properties b/spring-reactive-modules/spring-reactive-filters/src/main/resources/application.properties
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-filters/src/main/resources/application.properties
rename to spring-reactive-modules/spring-reactive-filters/src/main/resources/application.properties
diff --git a/spring-reactive-modules/spring-reactive-filters/src/main/resources/logback.xml b/spring-reactive-modules/spring-reactive-filters/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/spring-reactive-modules/spring-reactive-filters/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-reactive-modules/spring-5-reactive-filters/src/test/java/com/baeldung/SpringContextTest.java b/spring-reactive-modules/spring-reactive-filters/src/test/java/com/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-filters/src/test/java/com/baeldung/SpringContextTest.java
rename to spring-reactive-modules/spring-reactive-filters/src/test/java/com/baeldung/SpringContextTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/webclient/filter/FilteredWebClientUnitTest.java b/spring-reactive-modules/spring-reactive-filters/src/test/java/com/baeldung/reactive/filters/FilteredWebClientUnitTest.java
similarity index 95%
rename from spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/webclient/filter/FilteredWebClientUnitTest.java
rename to spring-reactive-modules/spring-reactive-filters/src/test/java/com/baeldung/reactive/filters/FilteredWebClientUnitTest.java
index 675cd03d10..1350db0752 100644
--- a/spring-reactive-modules/spring-5-reactive-client/src/test/java/com/baeldung/webclient/filter/FilteredWebClientUnitTest.java
+++ b/spring-reactive-modules/spring-reactive-filters/src/test/java/com/baeldung/reactive/filters/FilteredWebClientUnitTest.java
@@ -1,8 +1,8 @@
-package com.baeldung.webclient.filter;
+package com.baeldung.reactive.filters;
 
-import static com.baeldung.webclient.filter.WebClientFilters.countingFilter;
-import static com.baeldung.webclient.filter.WebClientFilters.loggingFilter;
-import static com.baeldung.webclient.filter.WebClientFilters.urlModifyingFilter;
+import static com.baeldung.reactive.filters.WebClientFilters.countingFilter;
+import static com.baeldung.reactive.filters.WebClientFilters.loggingFilter;
+import static com.baeldung.reactive.filters.WebClientFilters.urlModifyingFilter;
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
diff --git a/spring-reactive-modules/spring-5-reactive-filters/src/test/java/com/baeldung/reactive/filters/PlayerHandlerIntegrationTest.java b/spring-reactive-modules/spring-reactive-filters/src/test/java/com/baeldung/reactive/filters/PlayerHandlerIntegrationTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-filters/src/test/java/com/baeldung/reactive/filters/PlayerHandlerIntegrationTest.java
rename to spring-reactive-modules/spring-reactive-filters/src/test/java/com/baeldung/reactive/filters/PlayerHandlerIntegrationTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-filters/src/test/java/com/baeldung/reactive/filters/UserControllerIntegrationTest.java b/spring-reactive-modules/spring-reactive-filters/src/test/java/com/baeldung/reactive/filters/UserControllerIntegrationTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-filters/src/test/java/com/baeldung/reactive/filters/UserControllerIntegrationTest.java
rename to spring-reactive-modules/spring-reactive-filters/src/test/java/com/baeldung/reactive/filters/UserControllerIntegrationTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/README.md b/spring-reactive-modules/spring-reactive-oauth/README.md
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/README.md
rename to spring-reactive-modules/spring-reactive-oauth/README.md
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/pom.xml b/spring-reactive-modules/spring-reactive-oauth/pom.xml
similarity index 96%
rename from spring-reactive-modules/spring-5-reactive-oauth/pom.xml
rename to spring-reactive-modules/spring-reactive-oauth/pom.xml
index 9c237607ba..9d2dbf6126 100644
--- a/spring-reactive-modules/spring-5-reactive-oauth/pom.xml
+++ b/spring-reactive-modules/spring-reactive-oauth/pom.xml
@@ -4,9 +4,9 @@
     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.reactive.oauth</groupId>
-    <artifactId>spring-5-reactive-oauth</artifactId>
+    <artifactId>spring-reactive-oauth</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <name>spring-5-reactive-oauth</name>
+    <name>spring-reactive-oauth</name>
     <packaging>jar</packaging>
     <description>WebFlux and Spring Security OAuth</description>
 
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/SecurityConfig.java b/spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/SecurityConfig.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/SecurityConfig.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/SecurityConfig.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/Spring5ReactiveOauthApplication.java b/spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/Spring5ReactiveOauthApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/Spring5ReactiveOauthApplication.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/Spring5ReactiveOauthApplication.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/web/MainController.java b/spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/web/MainController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/web/MainController.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/web/MainController.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/web/dto/Foo.java b/spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/web/dto/Foo.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/web/dto/Foo.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/reactive/oauth/web/dto/Foo.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/OauthClientApplication.java b/spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/OauthClientApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/OauthClientApplication.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/OauthClientApplication.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/configuration/WebClientConfig.java b/spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/configuration/WebClientConfig.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/configuration/WebClientConfig.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/configuration/WebClientConfig.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/configuration/WebSecurityConfig.java b/spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/configuration/WebSecurityConfig.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/configuration/WebSecurityConfig.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/configuration/WebSecurityConfig.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/web/ClientRestController.java b/spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/web/ClientRestController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/web/ClientRestController.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodeclient/web/ClientRestController.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/OauthClientLoginApplication.java b/spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/OauthClientLoginApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/OauthClientLoginApplication.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/OauthClientLoginApplication.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/configuration/WebClientConfig.java b/spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/configuration/WebClientConfig.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/configuration/WebClientConfig.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/configuration/WebClientConfig.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/configuration/WebSecurityConfig.java b/spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/configuration/WebSecurityConfig.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/configuration/WebSecurityConfig.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/configuration/WebSecurityConfig.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/web/ClientRestController.java b/spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/web/ClientRestController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/web/ClientRestController.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/authorizationcodelogin/web/ClientRestController.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/ClientCredentialsOauthApplication.java b/spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/ClientCredentialsOauthApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/ClientCredentialsOauthApplication.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/ClientCredentialsOauthApplication.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/configuration/WebClientConfig.java b/spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/configuration/WebClientConfig.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/configuration/WebClientConfig.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/configuration/WebClientConfig.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/service/WebClientChonJob.java b/spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/service/WebClientChonJob.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/service/WebClientChonJob.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/clientcredentials/service/WebClientChonJob.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/ManualRequestApplication.java b/spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/ManualRequestApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/ManualRequestApplication.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/ManualRequestApplication.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/configure/WebClientConfig.java b/spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/configure/WebClientConfig.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/configure/WebClientConfig.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/configure/WebClientConfig.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/configure/WebSecurityConfig.java b/spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/configure/WebSecurityConfig.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/configure/WebSecurityConfig.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/configure/WebSecurityConfig.java
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-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/web/ManualOauthRequestController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/web/ManualOauthRequestController.java
rename to spring-reactive-modules/spring-reactive-oauth/src/main/java/com/baeldung/webclient/manualrequest/web/ManualOauthRequestController.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/resources/application.yml b/spring-reactive-modules/spring-reactive-oauth/src/main/resources/application.yml
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/resources/application.yml
rename to spring-reactive-modules/spring-reactive-oauth/src/main/resources/application.yml
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/resources/default-application.yml b/spring-reactive-modules/spring-reactive-oauth/src/main/resources/default-application.yml
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/resources/default-application.yml
rename to spring-reactive-modules/spring-reactive-oauth/src/main/resources/default-application.yml
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/resources/webclient-auth-code-client-application.properties b/spring-reactive-modules/spring-reactive-oauth/src/main/resources/webclient-auth-code-client-application.properties
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/resources/webclient-auth-code-client-application.properties
rename to spring-reactive-modules/spring-reactive-oauth/src/main/resources/webclient-auth-code-client-application.properties
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/resources/webclient-auth-code-login-application.properties b/spring-reactive-modules/spring-reactive-oauth/src/main/resources/webclient-auth-code-login-application.properties
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/resources/webclient-auth-code-login-application.properties
rename to spring-reactive-modules/spring-reactive-oauth/src/main/resources/webclient-auth-code-login-application.properties
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/resources/webclient-client-credentials-oauth-application.properties b/spring-reactive-modules/spring-reactive-oauth/src/main/resources/webclient-client-credentials-oauth-application.properties
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/resources/webclient-client-credentials-oauth-application.properties
rename to spring-reactive-modules/spring-reactive-oauth/src/main/resources/webclient-client-credentials-oauth-application.properties
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/main/resources/webclient-manual-request-oauth-application.properties b/spring-reactive-modules/spring-reactive-oauth/src/main/resources/webclient-manual-request-oauth-application.properties
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/main/resources/webclient-manual-request-oauth-application.properties
rename to spring-reactive-modules/spring-reactive-oauth/src/main/resources/webclient-manual-request-oauth-application.properties
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/test/java/com/baeldung/reactive/oauth/Spring5ReactiveOauthIntegrationTest.java b/spring-reactive-modules/spring-reactive-oauth/src/test/java/com/baeldung/reactive/oauth/Spring5ReactiveOauthIntegrationTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/test/java/com/baeldung/reactive/oauth/Spring5ReactiveOauthIntegrationTest.java
rename to spring-reactive-modules/spring-reactive-oauth/src/test/java/com/baeldung/reactive/oauth/Spring5ReactiveOauthIntegrationTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/clientcredentials/OAuth2ClientCredentialsLiveTest.java b/spring-reactive-modules/spring-reactive-oauth/src/test/java/com/baeldung/webclient/clientcredentials/OAuth2ClientCredentialsLiveTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/clientcredentials/OAuth2ClientCredentialsLiveTest.java
rename to spring-reactive-modules/spring-reactive-oauth/src/test/java/com/baeldung/webclient/clientcredentials/OAuth2ClientCredentialsLiveTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/manualrequest/OAuth2ManualRequestLiveTest.java b/spring-reactive-modules/spring-reactive-oauth/src/test/java/com/baeldung/webclient/manualrequest/OAuth2ManualRequestLiveTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/manualrequest/OAuth2ManualRequestLiveTest.java
rename to spring-reactive-modules/spring-reactive-oauth/src/test/java/com/baeldung/webclient/manualrequest/OAuth2ManualRequestLiveTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/utils/ListAppender.java b/spring-reactive-modules/spring-reactive-oauth/src/test/java/com/baeldung/webclient/utils/ListAppender.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/test/java/com/baeldung/webclient/utils/ListAppender.java
rename to spring-reactive-modules/spring-reactive-oauth/src/test/java/com/baeldung/webclient/utils/ListAppender.java
diff --git a/spring-reactive-modules/spring-5-reactive-oauth/src/test/resources/logback-test.xml b/spring-reactive-modules/spring-reactive-oauth/src/test/resources/logback-test.xml
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-oauth/src/test/resources/logback-test.xml
rename to spring-reactive-modules/spring-reactive-oauth/src/test/resources/logback-test.xml
diff --git a/spring-reactive-modules/spring-5-reactive-security/.gitignore b/spring-reactive-modules/spring-reactive-security/.gitignore
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/.gitignore
rename to spring-reactive-modules/spring-reactive-security/.gitignore
diff --git a/spring-reactive-modules/spring-5-reactive-security/README.md b/spring-reactive-modules/spring-reactive-security/README.md
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/README.md
rename to spring-reactive-modules/spring-reactive-security/README.md
diff --git a/spring-reactive-modules/spring-5-reactive-security/pom.xml b/spring-reactive-modules/spring-reactive-security/pom.xml
similarity index 93%
rename from spring-reactive-modules/spring-5-reactive-security/pom.xml
rename to spring-reactive-modules/spring-reactive-security/pom.xml
index e455940d83..8ed976c572 100644
--- a/spring-reactive-modules/spring-5-reactive-security/pom.xml
+++ b/spring-reactive-modules/spring-reactive-security/pom.xml
@@ -3,11 +3,11 @@
     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-5-reactive-security</artifactId>
+    <artifactId>spring-reactive-security</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>spring-5-reactive-security</name>
+    <name>spring-reactive-security</name>
     <packaging>jar</packaging>
-    <description>spring 5 security sample project about new features</description>
+    <description>spring boot security sample project about new features</description>
 
     <parent>
         <groupId>com.baeldung.spring.reactive</groupId>
@@ -66,10 +66,6 @@
             <artifactId>spring-boot-devtools</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceHealthIndicator.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceHealthIndicator.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceHealthIndicator.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/actuator/DownstreamServiceHealthIndicator.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/FeaturesEndpoint.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/actuator/FeaturesEndpoint.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/FeaturesEndpoint.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/actuator/FeaturesEndpoint.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/InfoWebEndpointExtension.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/actuator/InfoWebEndpointExtension.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/InfoWebEndpointExtension.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/actuator/InfoWebEndpointExtension.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/Spring5ReactiveApplication.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/actuator/Spring5ReactiveApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/Spring5ReactiveApplication.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/actuator/Spring5ReactiveApplication.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/WebSecurityConfig.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/actuator/WebSecurityConfig.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/WebSecurityConfig.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/actuator/WebSecurityConfig.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/authresolver/AuthResolverApplication.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/authresolver/AuthResolverApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/authresolver/AuthResolverApplication.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/authresolver/AuthResolverApplication.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/authresolver/AuthResolverController.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/authresolver/AuthResolverController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/authresolver/AuthResolverController.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/authresolver/AuthResolverController.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/authresolver/CustomWebSecurityConfig.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/authresolver/CustomWebSecurityConfig.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/authresolver/CustomWebSecurityConfig.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/authresolver/CustomWebSecurityConfig.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/CorsOnAnnotatedElementsApplication.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/CorsOnAnnotatedElementsApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/CorsOnAnnotatedElementsApplication.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/CorsOnAnnotatedElementsApplication.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/controllers/CorsOnClassController.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/controllers/CorsOnClassController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/controllers/CorsOnClassController.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/controllers/CorsOnClassController.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/controllers/CorsOnMethodsController.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/controllers/CorsOnMethodsController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/controllers/CorsOnMethodsController.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/annotated/controllers/CorsOnMethodsController.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/CorsGlobalConfigApplication.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/global/CorsGlobalConfigApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/CorsGlobalConfigApplication.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/global/CorsGlobalConfigApplication.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/config/CorsGlobalConfiguration.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/global/config/CorsGlobalConfiguration.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/config/CorsGlobalConfiguration.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/global/config/CorsGlobalConfiguration.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/controllers/FurtherCorsConfigsController.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/global/controllers/FurtherCorsConfigsController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/controllers/FurtherCorsConfigsController.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/global/controllers/FurtherCorsConfigsController.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/controllers/RegularRestController.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/global/controllers/RegularRestController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/controllers/RegularRestController.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/global/controllers/RegularRestController.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/functional/handlers/CorsGlobalFunctionalHandler.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/global/functional/handlers/CorsGlobalFunctionalHandler.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/functional/handlers/CorsGlobalFunctionalHandler.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/global/functional/handlers/CorsGlobalFunctionalHandler.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/functional/routers/CorsRouterFunctions.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/global/functional/routers/CorsRouterFunctions.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/global/functional/routers/CorsRouterFunctions.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/global/functional/routers/CorsRouterFunctions.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/CorsWebFilterApplication.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/CorsWebFilterApplication.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/CorsWebFilterApplication.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/CorsWebFilterApplication.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/config/CorsWebFilterConfig.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/config/CorsWebFilterConfig.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/config/CorsWebFilterConfig.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/config/CorsWebFilterConfig.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/controllers/FurtherCorsConfigsController.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/controllers/FurtherCorsConfigsController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/controllers/FurtherCorsConfigsController.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/controllers/FurtherCorsConfigsController.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/controllers/RegularRestController.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/controllers/RegularRestController.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/controllers/RegularRestController.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/controllers/RegularRestController.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/functional/handlers/CorsWithWebFilterHandler.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/functional/handlers/CorsWithWebFilterHandler.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/functional/handlers/CorsWithWebFilterHandler.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/functional/handlers/CorsWithWebFilterHandler.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/functional/routers/CorsWithWebFilterRouterFunctions.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/functional/routers/CorsWithWebFilterRouterFunctions.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/functional/routers/CorsWithWebFilterRouterFunctions.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/reactive/cors/webfilter/functional/routers/CorsWithWebFilterRouterFunctions.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/Employee.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/webflux/Employee.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/Employee.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/webflux/Employee.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeConfig.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/webflux/EmployeeConfig.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeConfig.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/webflux/EmployeeConfig.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeCreationEvent.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/webflux/EmployeeCreationEvent.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeCreationEvent.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/webflux/EmployeeCreationEvent.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSecurityConfig.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSecurityConfig.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSecurityConfig.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSecurityConfig.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketClient.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketClient.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketClient.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketClient.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketHandler.java b/spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketHandler.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketHandler.java
rename to spring-reactive-modules/spring-reactive-security/src/main/java/com/baeldung/webflux/EmployeeWebSocketHandler.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/resources/application.properties b/spring-reactive-modules/spring-reactive-security/src/main/resources/application.properties
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/resources/application.properties
rename to spring-reactive-modules/spring-reactive-security/src/main/resources/application.properties
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/resources/files/hello.txt b/spring-reactive-modules/spring-reactive-security/src/main/resources/files/hello.txt
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/resources/files/hello.txt
rename to spring-reactive-modules/spring-reactive-security/src/main/resources/files/hello.txt
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/main/resources/files/test/test.txt b/spring-reactive-modules/spring-reactive-security/src/main/resources/files/test/test.txt
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/resources/files/test/test.txt
rename to spring-reactive-modules/spring-reactive-security/src/main/resources/files/test/test.txt
diff --git a/spring-reactive-modules/spring-reactive-security/src/main/resources/logback.xml b/spring-reactive-modules/spring-reactive-security/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/spring-reactive-modules/spring-reactive-security/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-reactive-modules/spring-5-reactive-security/src/main/resources/static/client-websocket.html b/spring-reactive-modules/spring-reactive-security/src/main/resources/static/client-websocket.html
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/main/resources/static/client-websocket.html
rename to spring-reactive-modules/spring-reactive-security/src/main/resources/static/client-websocket.html
diff --git a/spring-reactive-modules/spring-5-reactive/src/main/webapp/WEB-INF/web.xml b/spring-reactive-modules/spring-reactive-security/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive/src/main/webapp/WEB-INF/web.xml
rename to spring-reactive-modules/spring-reactive-security/src/main/webapp/WEB-INF/web.xml
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/SpringContextTest.java b/spring-reactive-modules/spring-reactive-security/src/test/java/com/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/SpringContextTest.java
rename to spring-reactive-modules/spring-reactive-security/src/test/java/com/baeldung/SpringContextTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/actuator/ActuatorInfoIntegrationTest.java b/spring-reactive-modules/spring-reactive-security/src/test/java/com/baeldung/reactive/actuator/ActuatorInfoIntegrationTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/actuator/ActuatorInfoIntegrationTest.java
rename to spring-reactive-modules/spring-reactive-security/src/test/java/com/baeldung/reactive/actuator/ActuatorInfoIntegrationTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/authresolver/AuthResolverIntegrationTest.java b/spring-reactive-modules/spring-reactive-security/src/test/java/com/baeldung/reactive/authresolver/AuthResolverIntegrationTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/authresolver/AuthResolverIntegrationTest.java
rename to spring-reactive-modules/spring-reactive-security/src/test/java/com/baeldung/reactive/authresolver/AuthResolverIntegrationTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnAnnotatedElementsLiveTest.java b/spring-reactive-modules/spring-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnAnnotatedElementsLiveTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnAnnotatedElementsLiveTest.java
rename to spring-reactive-modules/spring-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnAnnotatedElementsLiveTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnGlobalConfigLiveTest.java b/spring-reactive-modules/spring-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnGlobalConfigLiveTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnGlobalConfigLiveTest.java
rename to spring-reactive-modules/spring-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnGlobalConfigLiveTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnWebFilterLiveTest.java b/spring-reactive-modules/spring-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnWebFilterLiveTest.java
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnWebFilterLiveTest.java
rename to spring-reactive-modules/spring-reactive-security/src/test/java/com/baeldung/reactive/cors/CorsOnWebFilterLiveTest.java
diff --git a/spring-reactive-modules/spring-5-reactive-security/src/test/resources/baeldung-weekly.png b/spring-reactive-modules/spring-reactive-security/src/test/resources/baeldung-weekly.png
similarity index 100%
rename from spring-reactive-modules/spring-5-reactive-security/src/test/resources/baeldung-weekly.png
rename to spring-reactive-modules/spring-reactive-security/src/test/resources/baeldung-weekly.png
diff --git a/spring-reactive-modules/spring-reactive/README.md b/spring-reactive-modules/spring-reactive/README.md
index 7dfc7b2952..61d781b312 100644
--- a/spring-reactive-modules/spring-reactive/README.md
+++ b/spring-reactive-modules/spring-reactive/README.md
@@ -1,6 +1,5 @@
-### Spring Reactive Articles that are also part of the e-book
 
-This module contains articles about Spring Reactive that are also part of an Ebook.
+This module contains articles about Spring Reactive that **are also part of an Ebook.**
 
 ## Spring Reactive
 
@@ -21,4 +20,4 @@ This module contains articles describing reactive processing in Spring.
 
 ### NOTE:
 
-Since this is a module tied to an e-book, it should **not** be moved or used to store the code for any further article.
+## Since this is a module tied to an e-book, it should **not** be moved or used to store the code for any further article.
diff --git a/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorAttributes.java b/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorAttributes.java
index 3458a175e4..549ae749f2 100644
--- a/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorAttributes.java
+++ b/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorAttributes.java
@@ -1,13 +1,13 @@
 package com.baeldung.reactive.errorhandling;
 
+import java.util.Map;
+
 import org.springframework.boot.web.error.ErrorAttributeOptions;
 import org.springframework.boot.web.reactive.error.DefaultErrorAttributes;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.server.ServerRequest;
 
-import java.util.Map;
-
 @Component
 public class GlobalErrorAttributes extends DefaultErrorAttributes {
 
diff --git a/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorWebExceptionHandler.java b/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorWebExceptionHandler.java
index 24583308cd..69f9a0420e 100644
--- a/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorWebExceptionHandler.java
+++ b/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorWebExceptionHandler.java
@@ -1,5 +1,7 @@
 package com.baeldung.reactive.errorhandling;
 
+import java.util.Map;
+
 import org.springframework.boot.autoconfigure.web.WebProperties;
 import org.springframework.boot.autoconfigure.web.reactive.error.AbstractErrorWebExceptionHandler;
 import org.springframework.boot.web.error.ErrorAttributeOptions;
@@ -16,15 +18,15 @@ import org.springframework.web.reactive.function.server.RouterFunction;
 import org.springframework.web.reactive.function.server.RouterFunctions;
 import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.reactive.function.server.ServerResponse;
-import reactor.core.publisher.Mono;
 
-import java.util.Map;
+import reactor.core.publisher.Mono;
 
 @Component
 @Order(-2)
 public class GlobalErrorWebExceptionHandler extends AbstractErrorWebExceptionHandler {
 
-    public GlobalErrorWebExceptionHandler(GlobalErrorAttributes g, ApplicationContext applicationContext,
+    public GlobalErrorWebExceptionHandler(
+            GlobalErrorAttributes g, ApplicationContext applicationContext,
             ServerCodecConfigurer serverCodecConfigurer) {
         super(g, new WebProperties.Resources(), applicationContext);
         super.setMessageWriters(serverCodecConfigurer.getWriters());
diff --git a/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Handler.java b/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Handler.java
index d49d9b4be2..f9e4ee4c35 100644
--- a/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Handler.java
+++ b/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Handler.java
@@ -5,6 +5,7 @@ import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.reactive.function.server.ServerResponse;
+
 import reactor.core.publisher.Mono;
 
 @Component
diff --git a/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Router.java b/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Router.java
index 5f130ec035..aeea202c31 100644
--- a/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Router.java
+++ b/spring-reactive-modules/spring-reactive/src/main/java/com/baeldung/reactive/errorhandling/Router.java
@@ -1,15 +1,15 @@
 package com.baeldung.reactive.errorhandling;
 
+import static org.springframework.http.MediaType.TEXT_PLAIN;
+import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
+import static org.springframework.web.reactive.function.server.RequestPredicates.accept;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.server.RouterFunction;
 import org.springframework.web.reactive.function.server.RouterFunctions;
 import org.springframework.web.reactive.function.server.ServerResponse;
 
-import static org.springframework.http.MediaType.TEXT_PLAIN;
-import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
-import static org.springframework.web.reactive.function.server.RequestPredicates.accept;
-
 @Component
 public class Router {
 
diff --git a/spring-reactive-modules/spring-reactor/pom.xml b/spring-reactive-modules/spring-reactor/pom.xml
index 22eaa898bd..c2635765f0 100644
--- a/spring-reactive-modules/spring-reactor/pom.xml
+++ b/spring-reactive-modules/spring-reactor/pom.xml
@@ -37,7 +37,6 @@
     </dependencies>
 
     <properties>
-        <spring-cloud-sleuth.version>2.0.2.RELEASE</spring-cloud-sleuth.version>
         <reactor.version>2.0.8.RELEASE</reactor.version>
     </properties>
 
diff --git a/spring-vault/README.md b/spring-vault/README.md
index 9e1d14ba6b..22fb0a7ff2 100644
--- a/spring-vault/README.md
+++ b/spring-vault/README.md
@@ -5,3 +5,4 @@ This module contains articles about Spring Vault
 ### Relevant Articles:
 
 - [Spring Vault](https://www.baeldung.com/spring-vault)
+- [Secure Kubernetes Secrets with Vault](https://www.baeldung.com/spring-vault-kubernetes-secrets)
diff --git a/testing-modules/junit-5-advanced/README.md b/testing-modules/junit-5-advanced/README.md
index a89bcd2de2..873ab0835b 100644
--- a/testing-modules/junit-5-advanced/README.md
+++ b/testing-modules/junit-5-advanced/README.md
@@ -9,3 +9,4 @@
 - [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)
+- [Testing Interface Contract in Java](https://www.baeldung.com/java-junit-verify-interface-contract)
diff --git a/testing-modules/junit-5-advanced/src/main/java/com/baeldung/interfaces/unittest/Circle.java b/testing-modules/junit-5-advanced/src/main/java/com/baeldung/interfaces/unittest/Circle.java
new file mode 100644
index 0000000000..b0e63155f4
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/main/java/com/baeldung/interfaces/unittest/Circle.java
@@ -0,0 +1,19 @@
+package com.baeldung.interfaces.unittest;
+
+public class Circle implements Shape {
+
+    private double radius;
+
+    Circle(double radius) {
+        this.radius = radius;
+    }
+
+    @Override
+    public double area() {
+        return 3.14 * radius * radius;
+    }
+
+    public double circumference() {
+        return 2 * 3.14 * radius;
+    }
+}
diff --git a/testing-modules/junit-5-advanced/src/main/java/com/baeldung/interfaces/unittest/Rectangle.java b/testing-modules/junit-5-advanced/src/main/java/com/baeldung/interfaces/unittest/Rectangle.java
new file mode 100644
index 0000000000..a88233e83b
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/main/java/com/baeldung/interfaces/unittest/Rectangle.java
@@ -0,0 +1,21 @@
+package com.baeldung.interfaces.unittest;
+
+public class Rectangle implements Shape {
+
+    private double length;
+    private double breadth;
+
+    public Rectangle(double length, double breadth) {
+        this.length = length;
+        this.breadth = breadth;
+    }
+
+    @Override
+    public double area() {
+        return length * breadth;
+    }
+
+    public double perimeter() {
+        return 2 * (length + breadth);
+    }
+}
diff --git a/testing-modules/junit-5-advanced/src/main/java/com/baeldung/interfaces/unittest/Shape.java b/testing-modules/junit-5-advanced/src/main/java/com/baeldung/interfaces/unittest/Shape.java
new file mode 100644
index 0000000000..bac42fb246
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/main/java/com/baeldung/interfaces/unittest/Shape.java
@@ -0,0 +1,6 @@
+package com.baeldung.interfaces.unittest;
+
+public interface Shape {
+
+    double area();
+}
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/interfaces/unittest/CircleExtendsBaseUnitTest.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/interfaces/unittest/CircleExtendsBaseUnitTest.java
new file mode 100644
index 0000000000..08ce2bc779
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/interfaces/unittest/CircleExtendsBaseUnitTest.java
@@ -0,0 +1,26 @@
+package com.baeldung.interfaces.unittest;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+
+class CircleExtendsBaseUnitTest extends ShapeUnitTest {
+
+    @Override
+    public Map<String, Object> instantiateShapeWithExpectedArea() {
+        Map<String, Object> shapeAreaMap = new HashMap<>();
+        shapeAreaMap.put("shape", new Circle(5));
+        shapeAreaMap.put("area", 78.5);
+        return shapeAreaMap;
+    }
+
+    @Test
+    void whenCircumferenceIsCalculated_thenSuccessful() {
+        Circle circle = new Circle(2);
+        double circumference = circle.circumference();
+        assertEquals(12.56, circumference);
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/interfaces/unittest/CircleUnitTest.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/interfaces/unittest/CircleUnitTest.java
new file mode 100644
index 0000000000..c0b4eecedc
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/interfaces/unittest/CircleUnitTest.java
@@ -0,0 +1,22 @@
+package com.baeldung.interfaces.unittest;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+class CircleUnitTest {
+
+    @Test
+    void whenAreaIsCalculated_thenSuccessful() {
+        Shape circle = new Circle(5);
+        double area = circle.area();
+        assertEquals(78.5, area);
+    }
+
+    @Test
+    void whenCircumferenceIsCalculated_thenSuccessful() {
+        Circle circle = new Circle(2);
+        double circumference = circle.circumference();
+        assertEquals(12.56, circumference);
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/interfaces/unittest/ParameterizedUnitTest.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/interfaces/unittest/ParameterizedUnitTest.java
new file mode 100644
index 0000000000..6b5cd6b6ab
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/interfaces/unittest/ParameterizedUnitTest.java
@@ -0,0 +1,27 @@
+package com.baeldung.interfaces.unittest;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class ParameterizedUnitTest {
+
+    @ParameterizedTest
+    @MethodSource("data")
+    void givenShapeInstance_whenAreaIsCalculated_thenSuccessful(Shape shapeInstance, double expectedArea) {
+        double area = shapeInstance.area();
+        assertEquals(expectedArea, area);
+
+    }
+
+    private static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][] {
+          { new Circle(5), 78.5 },
+          { new Rectangle(4, 5), 20 }
+        });
+    }
+}
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/interfaces/unittest/RectangleExtendsBaseUnitTest.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/interfaces/unittest/RectangleExtendsBaseUnitTest.java
new file mode 100644
index 0000000000..b6771ad648
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/interfaces/unittest/RectangleExtendsBaseUnitTest.java
@@ -0,0 +1,26 @@
+package com.baeldung.interfaces.unittest;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+
+class RectangleExtendsBaseUnitTest extends ShapeUnitTest {
+
+    @Override
+    public Map<String, Object> instantiateShapeWithExpectedArea() {
+        Map<String, Object> shapeAreaMap = new HashMap<>();
+        shapeAreaMap.put("shape", new Rectangle(5, 4));
+        shapeAreaMap.put("area", 20.0);
+        return shapeAreaMap;
+    }
+
+    @Test
+    void whenPerimeterIsCalculated_thenSuccessful() {
+        Rectangle rectangle = new Rectangle(5, 4);
+        double perimeter = rectangle.perimeter();
+        assertEquals(18, perimeter);
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/interfaces/unittest/RectangleUnitTest.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/interfaces/unittest/RectangleUnitTest.java
new file mode 100644
index 0000000000..1983353667
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/interfaces/unittest/RectangleUnitTest.java
@@ -0,0 +1,22 @@
+package com.baeldung.interfaces.unittest;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+class RectangleUnitTest {
+
+    @Test
+    void whenAreaIsCalculated_thenSuccessful() {
+        Shape rectangle = new Rectangle(5, 4);
+        double area = rectangle.area();
+        assertEquals(20, area);
+    }
+
+    @Test
+    void whenPerimeterIsCalculated_thenSuccessful() {
+        Rectangle rectangle = new Rectangle(5, 4);
+        double perimeter = rectangle.perimeter();
+        assertEquals(18, perimeter);
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/junit-5-advanced/src/test/java/com/baeldung/interfaces/unittest/ShapeUnitTest.java b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/interfaces/unittest/ShapeUnitTest.java
new file mode 100644
index 0000000000..a9d318f698
--- /dev/null
+++ b/testing-modules/junit-5-advanced/src/test/java/com/baeldung/interfaces/unittest/ShapeUnitTest.java
@@ -0,0 +1,21 @@
+package com.baeldung.interfaces.unittest;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+
+public abstract class ShapeUnitTest {
+
+    public abstract Map<String, Object> instantiateShapeWithExpectedArea();
+
+    @Test
+    void givenShapeInstance_whenAreaIsCalculated_thenSuccessful() {
+        Map<String, Object> shapeAreaMap = instantiateShapeWithExpectedArea();
+        Shape shape = (Shape) shapeAreaMap.get("shape");
+        double expectedArea = (double) shapeAreaMap.get("area");
+        double area = shape.area();
+        assertEquals(expectedArea, area);
+    }
+}
diff --git a/testing-modules/junit-5-basics-2/README.md b/testing-modules/junit-5-basics-2/README.md
index f5e2558332..0e0faedb4b 100644
--- a/testing-modules/junit-5-basics-2/README.md
+++ b/testing-modules/junit-5-basics-2/README.md
@@ -1,2 +1,2 @@
 ### Relevant Articles:
-- [Test Main Method with JUnit](http://www.baeldung.com/junit-5)
+- [Test Main Method with JUnit](https://www.baeldung.com/junit-test-main-method)
diff --git a/testing-modules/mockito-2/README.md b/testing-modules/mockito-2/README.md
index 82c97305f6..da8f339e56 100644
--- a/testing-modules/mockito-2/README.md
+++ b/testing-modules/mockito-2/README.md
@@ -7,3 +7,5 @@ This module contains articles about Mockito
 - [Resolving Mockito Exception: Wanted But Not Invoked](https://www.baeldung.com/mockito-exception-wanted-but-not-invoked)
 - [Matching Null With Mockito](https://www.baeldung.com/mockito-match-null)
 - [Mock Same Method with Different Parameters](https://www.baeldung.com/java-mock-same-method-other-parameters)
+- [How to Mock Constructors for Unit Testing using Mockito](https://www.baeldung.com/java-mockito-constructors-unit-testing)
+- [Overview of Mockito MockedConstruction](https://www.baeldung.com/java-mockito-mockedconstruction)
diff --git a/testing-modules/mockito-2/src/main/java/com/baeldung/construction/CoffeeMachine.java b/testing-modules/mockito-2/src/main/java/com/baeldung/construction/CoffeeMachine.java
new file mode 100644
index 0000000000..5cf1d4eecb
--- /dev/null
+++ b/testing-modules/mockito-2/src/main/java/com/baeldung/construction/CoffeeMachine.java
@@ -0,0 +1,23 @@
+package com.baeldung.construction;
+
+public class CoffeeMachine {
+
+    private Grinder grinder;
+    private WaterTank tank;
+
+    public CoffeeMachine() {
+        this.grinder = new Grinder();
+        this.tank = new WaterTank();
+    }
+    
+    public CoffeeMachine(int mils) {
+        this.grinder = new Grinder();
+        this.tank = new WaterTank(mils);
+    }
+
+    public String makeCoffee() {
+        String type = this.tank.isEspresso() ? "Espresso" : "Americano";
+        return String.format("Finished making a delicious %s made with %s beans", type, this.grinder.getBeans());
+    }
+
+}
diff --git a/testing-modules/mockito-2/src/main/java/com/baeldung/construction/Fruit.java b/testing-modules/mockito-2/src/main/java/com/baeldung/construction/Fruit.java
new file mode 100644
index 0000000000..c63f28d25f
--- /dev/null
+++ b/testing-modules/mockito-2/src/main/java/com/baeldung/construction/Fruit.java
@@ -0,0 +1,12 @@
+package com.baeldung.construction;
+
+public class Fruit {
+    
+    public String getName() {
+        return "Apple";
+    }
+
+    public String getColour() {
+        return "Red";
+    }
+}
diff --git a/testing-modules/mockito-2/src/main/java/com/baeldung/construction/Grinder.java b/testing-modules/mockito-2/src/main/java/com/baeldung/construction/Grinder.java
new file mode 100644
index 0000000000..e62b690bb2
--- /dev/null
+++ b/testing-modules/mockito-2/src/main/java/com/baeldung/construction/Grinder.java
@@ -0,0 +1,19 @@
+package com.baeldung.construction;
+
+public class Grinder {
+
+    private String beans;
+
+    public Grinder() {
+        this.beans = "Guatemalan";
+    }
+
+    public String getBeans() {
+        return beans;
+    }
+
+    public void setBeans(String beans) {
+        this.beans = beans;
+    }
+
+}
\ No newline at end of file
diff --git a/testing-modules/mockito-2/src/main/java/com/baeldung/construction/WaterTank.java b/testing-modules/mockito-2/src/main/java/com/baeldung/construction/WaterTank.java
new file mode 100644
index 0000000000..bf744930a0
--- /dev/null
+++ b/testing-modules/mockito-2/src/main/java/com/baeldung/construction/WaterTank.java
@@ -0,0 +1,27 @@
+package com.baeldung.construction;
+
+public class WaterTank {
+
+    private int mils;
+
+    public WaterTank() {
+        this.mils = 25;
+    }
+    
+    public WaterTank(int mils) {
+        this.mils = mils;
+    }
+
+    public int getMils() {
+        return mils;
+    }
+
+    public void setMils(int mils) {
+        this.mils = mils;
+    }
+
+    public boolean isEspresso() {
+        return getMils() < 50;
+    }
+
+}
diff --git a/testing-modules/mockito-2/src/test/java/com/baeldung/construction/CoffeeMachineUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/construction/CoffeeMachineUnitTest.java
new file mode 100644
index 0000000000..7b93ad9db6
--- /dev/null
+++ b/testing-modules/mockito-2/src/test/java/com/baeldung/construction/CoffeeMachineUnitTest.java
@@ -0,0 +1,56 @@
+package com.baeldung.construction;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.mockConstruction;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.MockedConstruction;
+
+class CoffeeMachineUnitTest {
+
+    @Test
+    void givenNoMockedContructor_whenCoffeeMade_thenRealDependencyReturned() {
+        CoffeeMachine machine = new CoffeeMachine();
+        assertEquals("Finished making a delicious Espresso made with Guatemalan beans", machine.makeCoffee());
+    }
+
+    @Test
+    void givenMockedContructor_whenCoffeeMade_thenMockDependencyReturned() {
+        try (MockedConstruction<WaterTank> mockTank = mockConstruction(WaterTank.class); MockedConstruction<Grinder> mockGrinder = mockConstruction(Grinder.class)) {
+
+            CoffeeMachine machine = new CoffeeMachine();
+
+            WaterTank tank = mockTank.constructed()
+                .get(0);
+            Grinder grinder = mockGrinder.constructed()
+                .get(0);
+
+            when(tank.isEspresso()).thenReturn(false);
+            when(grinder.getBeans()).thenReturn("Peruvian");
+
+            assertEquals("Finished making a delicious Americano made with Peruvian beans", machine.makeCoffee());
+        }
+
+    }
+
+    @Test
+    void givenMockedContructorWithArgument_whenCoffeeMade_thenMockDependencyReturned() {
+        try (MockedConstruction<WaterTank> mockTank = mockConstruction(WaterTank.class, (mock, context) -> {
+                int mils = (int) context.arguments().get(0);
+                when(mock.getMils()).thenReturn(mils);         
+            }); 
+            MockedConstruction<Grinder> mockGrinder = mockConstruction(Grinder.class)) {
+
+            CoffeeMachine machine = new CoffeeMachine(100);
+
+            Grinder grinder = mockGrinder.constructed()
+                .get(0);
+
+            when(grinder.getBeans()).thenReturn("Kenyan");
+            assertEquals("Finished making a delicious Americano made with Kenyan beans", machine.makeCoffee());
+        }
+
+    }
+
+}
diff --git a/testing-modules/mockito-2/src/test/java/com/baeldung/construction/FruitUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/construction/FruitUnitTest.java
new file mode 100644
index 0000000000..c7baa1cc7d
--- /dev/null
+++ b/testing-modules/mockito-2/src/test/java/com/baeldung/construction/FruitUnitTest.java
@@ -0,0 +1,50 @@
+package com.baeldung.construction;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Answers;
+import org.mockito.MockedConstruction;
+
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.withSettings;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.List;
+
+import static org.mockito.Mockito.mockConstruction;
+
+class FruitUnitTest {
+
+    @Test
+    void givenMockedContructor_whenFruitCreated_thenMockIsReturned() {
+        assertEquals("Apple", new Fruit().getName());
+        assertEquals("Red", new Fruit().getColour());
+
+        try (MockedConstruction<Fruit> mock = mockConstruction(Fruit.class)) {
+
+            Fruit fruit = new Fruit();
+            when(fruit.getName()).thenReturn("Banana");
+            when(fruit.getColour()).thenReturn("Yellow");
+
+            assertEquals("Banana", fruit.getName());
+            assertEquals("Yellow", fruit.getColour());
+
+            List<Fruit> constructed = mock.constructed();
+            assertEquals(1, constructed.size());
+        }
+    }
+    
+    @Test
+    void givenMockedContructorWithNewDefaultAnswer_whenFruitCreated_thenRealMethodInvoked() {
+        try (MockedConstruction<Fruit> mock = mockConstruction(Fruit.class, withSettings().defaultAnswer(Answers.CALLS_REAL_METHODS))) {
+
+            Fruit fruit = new Fruit();
+
+            assertEquals("Apple", fruit.getName());
+            assertEquals("Red", fruit.getColour());
+
+            List<Fruit> constructed = mock.constructed();
+            assertEquals(1, constructed.size());
+        }
+    }
+
+}
diff --git a/testing-modules/testing-assertions/README.md b/testing-modules/testing-assertions/README.md
index 37de3d4929..8f94277791 100644
--- a/testing-modules/testing-assertions/README.md
+++ b/testing-modules/testing-assertions/README.md
@@ -5,3 +5,4 @@
 - [Assert That a Java Optional Has a Certain Value](https://www.baeldung.com/java-optional-assert-value)
 - [Assert That an Object Is From a Specific Type](https://www.baeldung.com/java-assert-object-of-type)
 - [Asserting Equality on Two Classes Without an equals() Method](https://www.baeldung.com/java-assert-equality-no-equals)
+- [Assert Regex Matches in JUnit](https://www.baeldung.com/junit-assert-regex-matches)