Merge branch 'eugenp:master' into master

cas/cas-secured-app/pom.xml

@@ -10,10 +10,9 @@
     <description>Demo project for CAS</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <groupId>com.baeldung.cas</groupId>
+        <artifactId>cas</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredApplication.java

@@ -88,7 +88,6 @@ public class CasSecuredApplication {
     @Bean
     public SingleSignOutFilter singleSignOutFilter() {
         SingleSignOutFilter singleSignOutFilter = new SingleSignOutFilter();
-        singleSignOutFilter.setCasServerUrlPrefix("https://localhost:8443");
         singleSignOutFilter.setLogoutCallbackPath("/exit/cas");
         singleSignOutFilter.setIgnoreInitConfiguration(true);
         return singleSignOutFilter;

cas/pom.xml

@@ -0,0 +1,22 @@
+<?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.baeldung.cas</groupId>
+    <artifactId>cas</artifactId>
+    <name>cas</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
+
+    <modules>
+        <module>cas-secured-app</module>
+    </modules>
+
+</project>

core-java-modules/core-java-11-2/README.md

@@ -13,3 +13,4 @@ This module contains articles about Java 11 core features
 - [Call Methods at Runtime Using Java Reflection](https://www.baeldung.com/java-method-reflection)
 - [Java HttpClient Basic Authentication](https://www.baeldung.com/java-httpclient-basic-auth)
 - [Java HttpClient With SSL](https://www.baeldung.com/java-httpclient-ssl)
+- [Adding Parameters to Java HttpClient Requests](https://www.baeldung.com/java-httpclient-request-parameters)

core-java-modules/core-java-11-2/src/test/java/com/baeldung/httpclient/ssl/HttpClientSSLBypassUnitTest.java

@@ -21,7 +21,7 @@ public class HttpClientSSLBypassUnitTest {
           .build();
 
         HttpRequest request = HttpRequest.newBuilder()
-          .uri(URI.create("https://www.testingmcafeesites.com/"))
+          .uri(URI.create("https://wrong.host.badssl.com/"))
           .build();
 
         HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());

core-java-modules/core-java-date-operations-2/pom.xml

@@ -30,11 +30,29 @@
             <artifactId>hirondelle-date4j</artifactId>
             <version>${hirondelle-date4j.version}</version>
         </dependency>
+        <dependency>
+            <groupId>net.time4j</groupId>
+            <artifactId>time4j-base</artifactId>
+            <version>${time4j-base.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.time4j</groupId>
+            <artifactId>time4j-sqlxml</artifactId>
+            <version>${time4j-sqlxml.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ocpsoft.prettytime</groupId>
+            <artifactId>prettytime</artifactId>
+            <version>${prettytime.version}</version>
+        </dependency>
     </dependencies>
 
     <properties>
         <joda-time.version>2.10</joda-time.version>
         <hirondelle-date4j.version>1.5.1</hirondelle-date4j.version>
+        <prettytime.version>3.2.7.Final</prettytime.version>
+        <time4j-base.version>5.9</time4j-base.version>
+        <time4j-sqlxml.version>5.8</time4j-sqlxml.version>
     </properties>
 
 </project>

core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/timeago/version7/TimeAgoCalculator.java

@@ -0,0 +1,94 @@
+package com.baeldung.timeago.version7;
+
+import java.util.Date;
+import java.util.TimeZone;
+
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.joda.time.Period;
+import org.joda.time.format.PeriodFormat;
+import org.joda.time.format.PeriodFormatter;
+import org.joda.time.format.PeriodFormatterBuilder;
+
+public class TimeAgoCalculator {
+
+    public static String calculateTimeAgoByTimeGranularity(Date pastTime, TimeGranularity granularity) {
+        Date currentTime = new Date();
+        long timeDifferenceInMillis = currentTime.getTime() - pastTime.getTime();
+        return timeDifferenceInMillis / granularity.toMillis() + " " + granularity.name()
+            .toLowerCase() + " ago";
+    }
+
+    public static String calculateHumanFriendlyTimeAgo(Date pastTime) {
+        Date currentTime = new Date();
+        long timeDifferenceInMillis = currentTime.getTime() - pastTime.getTime();
+        if (timeDifferenceInMillis / TimeGranularity.DECADES.toMillis() > 0)
+            return "several decades ago";
+        else if (timeDifferenceInMillis / TimeGranularity.YEARS.toMillis() > 0)
+            return "several years ago";
+        else if (timeDifferenceInMillis / TimeGranularity.MONTHS.toMillis() > 0)
+            return "several months ago";
+        else if (timeDifferenceInMillis / TimeGranularity.WEEKS.toMillis() > 0)
+            return "several weeks ago";
+        else if (timeDifferenceInMillis / TimeGranularity.DAYS.toMillis() > 0)
+            return "several days ago";
+        else if (timeDifferenceInMillis / TimeGranularity.HOURS.toMillis() > 0)
+            return "several hours ago";
+        else if (timeDifferenceInMillis / TimeGranularity.MINUTES.toMillis() > 0)
+            return "several minutes ago";
+        else
+            return "moments ago";
+    }
+
+    public static String calculateExactTimeAgoWithJodaTime(Date pastTime) {
+        Period period = new Period(new DateTime(pastTime.getTime()), new DateTime());
+        PeriodFormatter formatter = new PeriodFormatterBuilder().appendYears()
+            .appendSuffix(" year ", " years ")
+            .appendSeparator("and ")
+            .appendMonths()
+            .appendSuffix(" month ", " months ")
+            .appendSeparator("and ")
+            .appendWeeks()
+            .appendSuffix(" week ", " weeks ")
+            .appendSeparator("and ")
+            .appendDays()
+            .appendSuffix(" day ", " days ")
+            .appendSeparator("and ")
+            .appendHours()
+            .appendSuffix(" hour ", " hours ")
+            .appendSeparator("and ")
+            .appendMinutes()
+            .appendSuffix(" minute ", " minutes ")
+            .appendSeparator("and ")
+            .appendSeconds()
+            .appendSuffix(" second", " seconds")
+            .toFormatter();
+        return formatter.print(period);
+    }
+
+    public static String calculateHumanFriendlyTimeAgoWithJodaTime(Date pastTime) {
+        Period period = new Period(new DateTime(pastTime.getTime()), new DateTime());
+        if (period.getYears() != 0)
+            return "several years ago";
+        else if (period.getMonths() != 0)
+            return "several months ago";
+        else if (period.getWeeks() != 0)
+            return "several weeks ago";
+        else if (period.getDays() != 0)
+            return "several days ago";
+        else if (period.getHours() != 0)
+            return "several hours ago";
+        else if (period.getMinutes() != 0)
+            return "several minutes ago";
+        else
+            return "moments ago";
+    }
+
+    public static String calculateZonedTimeAgoWithJodaTime(Date pastTime, TimeZone zone) {
+        DateTimeZone dateTimeZone = DateTimeZone.forID(zone.getID());
+        Period period = new Period(new DateTime(pastTime.getTime(), dateTimeZone), new DateTime(dateTimeZone));
+        return PeriodFormat.getDefault()
+            .print(period);
+    }
+
+}

core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/timeago/version7/TimeGranularity.java

@@ -0,0 +1,41 @@
+package com.baeldung.timeago.version7;
+
+import java.util.concurrent.TimeUnit;
+
+public enum TimeGranularity {
+    SECONDS {
+        public long toMillis() {
+            return TimeUnit.SECONDS.toMillis(1);
+        }
+    }, MINUTES {
+        public long toMillis() {
+            return TimeUnit.MINUTES.toMillis(1);
+        }
+    }, HOURS {
+        public long toMillis() {
+            return TimeUnit.HOURS.toMillis(1);
+        }
+    }, DAYS {
+        public long toMillis() {
+            return TimeUnit.DAYS.toMillis(1);
+        }
+    }, WEEKS {
+        public long toMillis() {
+            return TimeUnit.DAYS.toMillis(7);
+        }
+    }, MONTHS {
+        public long toMillis() {
+            return TimeUnit.DAYS.toMillis(30);
+        }
+    }, YEARS {
+        public long toMillis() {
+            return TimeUnit.DAYS.toMillis(365);
+        }
+    }, DECADES {
+        public long toMillis() {
+            return TimeUnit.DAYS.toMillis(365 * 10);
+        }
+    };
+
+    public abstract long toMillis();
+}

core-java-modules/core-java-date-operations-2/src/main/java/com/baeldung/timeago/version8/TimeAgoCalculator.java

@@ -0,0 +1,44 @@
+package com.baeldung.timeago.version8;
+
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.Period;
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.Locale;
+
+import org.ocpsoft.prettytime.PrettyTime;
+
+public class TimeAgoCalculator {
+
+    public static String calculateTimeAgoWithPeriodAndDuration(LocalDateTime pastTime, ZoneId zone) {
+        Period period = Period.between(pastTime.toLocalDate(), LocalDate.now(zone));
+        Duration duration = Duration.between(pastTime, LocalDateTime.now(zone));
+        if (period.getYears() != 0)
+            return "several years ago";
+        else if (period.getMonths() != 0)
+            return "several months ago";
+        else if (period.getDays() != 0)
+            return "several days ago";
+        else if (duration.toHours() != 0)
+            return "several hours ago";
+        else if (duration.toMinutes() != 0)
+            return "several minutes ago";
+        else if (duration.getSeconds() != 0)
+            return "several seconds ago";
+        else
+            return "moments ago";
+    }
+
+    public static String calculateTimeAgoWithPrettyTime(Date pastTime) {
+        PrettyTime prettyTime = new PrettyTime();
+        return prettyTime.format(pastTime);
+    }
+
+    public static String calculateTimeAgoWithTime4J(Date pastTime, ZoneId zone, Locale locale) {
+        return net.time4j.PrettyTime.of(locale)
+            .printRelative(pastTime.toInstant(), zone);
+    }
+
+}

core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version7/TimeAgoCalculatorUnitTest.java

@@ -0,0 +1,55 @@
+package com.baeldung.timeago.version7;
+
+import java.util.Date;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TimeAgoCalculatorUnitTest {
+
+    @Test
+    public void timeAgoByTimeGranularityTest() {
+        long DAY_IN_MILLIS = 1000 * 60 * 60 * 24;
+        Assert.assertEquals("5 seconds ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * 1000)), TimeGranularity.SECONDS));
+        Assert.assertEquals("5 minutes ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * 60 * 1000)), TimeGranularity.MINUTES));
+        Assert.assertEquals("5 hours ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * 60 * 60 * 1000)), TimeGranularity.HOURS));
+        Assert.assertEquals("5 days ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS)), TimeGranularity.DAYS));
+        Assert.assertEquals("5 months ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 30)), TimeGranularity.MONTHS));
+        Assert.assertEquals("5 weeks ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 7)), TimeGranularity.WEEKS));
+        Assert.assertEquals("5 years ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 365)), TimeGranularity.YEARS));
+        Assert.assertEquals("5 decades ago", TimeAgoCalculator.calculateTimeAgoByTimeGranularity(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 365 * 10)), TimeGranularity.DECADES));
+    }
+
+    @Test
+    public void humanFriendlyTimeAgoTest() {
+        long DAY_IN_MILLIS = 1000 * 60 * 60 * 24;
+        Assert.assertEquals("moments ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (5 * 1000))));
+        Assert.assertEquals("several minutes ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (5 * 60 * 1000))));
+        Assert.assertEquals("several hours ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (5 * 60 * 60 * 1000))));
+        Assert.assertEquals("several days ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS))));
+        Assert.assertEquals("several months ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 30))));
+        Assert.assertEquals("several weeks ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (3 * DAY_IN_MILLIS * 7))));
+        Assert.assertEquals("several years ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 365))));
+        Assert.assertEquals("several decades ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgo(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 365 * 10))));
+    }
+
+    @Test
+    public void calculateExactTimeAgoWithJodaTimeTest() {
+        Assert.assertEquals("5 hours and 15 minutes and 3 seconds", TimeAgoCalculator.calculateExactTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * 60 * 60 * 1000 + 15 * 60 * 1000 + 3 * 1000))));
+        Assert.assertEquals("5 hours and 1 minute and 1 second", TimeAgoCalculator.calculateExactTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * 60 * 60 * 1000 + 1 * 60 * 1000 + 1 * 1000))));
+        Assert.assertEquals("2 days and 1 minute and 1 second", TimeAgoCalculator.calculateExactTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (2 * 24 * 60 * 60 * 1000 + 1 * 60 * 1000 + 1 * 1000))));
+    }
+
+    @Test
+    public void calculateHumanFriendlyTimeAgoWithJodaTimeTest() {
+        long DAY_IN_MILLIS = 1000 * 60 * 60 * 24;
+        Assert.assertEquals("moments ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * 1000))));
+        Assert.assertEquals("several minutes ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * 60 * 1000))));
+        Assert.assertEquals("several hours ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * 60 * 60 * 1000))));
+        Assert.assertEquals("several days ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS))));
+        Assert.assertEquals("several months ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 30))));
+        Assert.assertEquals("several weeks ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (3 * DAY_IN_MILLIS * 7))));
+        Assert.assertEquals("several years ago", TimeAgoCalculator.calculateHumanFriendlyTimeAgoWithJodaTime(new Date(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 365))));
+    }
+
+}

core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/timeago/version8/TimeAgoCalculatorUnitTest.java

@@ -0,0 +1,23 @@
+package com.baeldung.timeago.version8;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TimeAgoCalculatorUnitTest {
+
+    @Test
+    public void calculateTimeAgoWithPeriodAndDurationTest() {
+        long DAY_IN_MILLIS = 1000 * 60 * 60 * 24;
+        Assert.assertEquals("moments ago", TimeAgoCalculator.calculateTimeAgoWithPeriodAndDuration(LocalDateTime.ofInstant(Instant.ofEpochMilli(System.currentTimeMillis()), ZoneId.systemDefault()), ZoneId.systemDefault()));
+        Assert.assertEquals("several seconds ago", TimeAgoCalculator.calculateTimeAgoWithPeriodAndDuration(LocalDateTime.ofInstant(Instant.ofEpochMilli(System.currentTimeMillis() - (5 * 1000)), ZoneId.systemDefault()), ZoneId.systemDefault()));
+        Assert.assertEquals("several minutes ago", TimeAgoCalculator.calculateTimeAgoWithPeriodAndDuration(LocalDateTime.ofInstant(Instant.ofEpochMilli(System.currentTimeMillis() - (5 * 60 * 1000)), ZoneId.systemDefault()), ZoneId.systemDefault()));
+        Assert.assertEquals("several hours ago", TimeAgoCalculator.calculateTimeAgoWithPeriodAndDuration(LocalDateTime.ofInstant(Instant.ofEpochMilli(System.currentTimeMillis() - (5 * 60 * 60 * 1000)), ZoneId.systemDefault()), ZoneId.systemDefault()));
+        Assert.assertEquals("several days ago", TimeAgoCalculator.calculateTimeAgoWithPeriodAndDuration(LocalDateTime.ofInstant(Instant.ofEpochMilli(System.currentTimeMillis() - (5 * DAY_IN_MILLIS)), ZoneId.systemDefault()), ZoneId.systemDefault()));
+        Assert.assertEquals("several months ago", TimeAgoCalculator.calculateTimeAgoWithPeriodAndDuration(LocalDateTime.ofInstant(Instant.ofEpochMilli(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 30)), ZoneId.systemDefault()), ZoneId.systemDefault()));
+        Assert.assertEquals("several years ago", TimeAgoCalculator.calculateTimeAgoWithPeriodAndDuration(LocalDateTime.ofInstant(Instant.ofEpochMilli(System.currentTimeMillis() - (5 * DAY_IN_MILLIS * 365)), ZoneId.systemDefault()), ZoneId.systemDefault()));
+    }
+}

core-java-modules/core-java-exceptions-2/README.md

@@ -14,3 +14,5 @@ This module contains articles about core java exceptions
 - [How to Find an Exception’s Root Cause in Java](https://www.baeldung.com/java-exception-root-cause)
 - [Java IOException “Too many open files”](https://www.baeldung.com/java-too-many-open-files)
 - [When Does Java Throw the ExceptionInInitializerError?](https://www.baeldung.com/java-exceptionininitializererror)
+- More articles: [[<-- prev]](../core-java-exceptions) [[next -->]](../core-java-exceptions-3)
+

core-java-modules/core-java-exceptions-3/README.md

@@ -1,5 +1,8 @@
-### Relevant Articles:
+## Core Java Exceptions
 
+This module contains articles about core java exceptions
+
+### Relevant Articles:
 - [NoSuchMethodError in Java](https://www.baeldung.com/java-nosuchmethod-error)
 - [IllegalArgumentException or NullPointerException for a Null Parameter?](https://www.baeldung.com/java-illegalargumentexception-or-nullpointerexception)
 - [IllegalMonitorStateException in Java](https://www.baeldung.com/java-illegalmonitorstateexception)
@@ -10,3 +13,5 @@
 - [NoSuchFieldError in Java](https://www.baeldung.com/java-nosuchfielderror)
 - [IllegalAccessError in Java](https://www.baeldung.com/java-illegalaccesserror)
 - [Working with (Unknown Source) Stack Traces in Java](https://www.baeldung.com/java-unknown-source-stack-trace)
+- More articles: [[<-- prev]](../core-java-exceptions-2) [[next -->]](../core-java-exceptions-4)
+

core-java-modules/core-java-exceptions-4/README.md

@@ -1,5 +1,10 @@
-### Relevant Articles:
+## Core Java Exceptions
 
+This module contains articles about core java exceptions
+
+### Relevant articles:
 - [Java ArrayIndexOutOfBoundsException](https://www.baeldung.com/java-arrayindexoutofboundsexception)
 - [Java Missing Return Statement](https://www.baeldung.com/java-missing-return-statement)
 - [Convert long to int Type in Java](https://www.baeldung.com/java-convert-long-to-int)
+- [“Sneaky Throws” in Java](https://www.baeldung.com/java-sneaky-throws)
+- [[<-- Prev]](../core-java-exceptions-3)

core-java-modules/core-java-exceptions-4/pom.xml

@@ -22,6 +22,12 @@
             <version>${h2.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

core-java-modules/core-java-exceptions-4/src/main/java/com/baeldung/exception/sneakythrows/SneakyThrowsExamples.java

@@ -1,9 +1,9 @@
-package com.baeldung.exceptions.sneakythrows;
-
-import java.io.IOException;
+package com.baeldung.exception.sneakythrows;
 
 import lombok.SneakyThrows;
 
+import java.io.IOException;
+
 public class SneakyThrowsExamples {
 
     public static <E extends Throwable> void sneakyThrow(Throwable e) throws E {

core-java-modules/core-java-exceptions-4/src/test/java/com/baeldung/exception/sneakythrows/SneakyThrowsExamplesUnitTest.java

@@ -1,12 +1,12 @@
-package com.baeldung.exceptions.sneakythrows;
+package com.baeldung.exception.sneakythrows;
 
-import static com.baeldung.exceptions.sneakythrows.SneakyThrowsExamples.throwSneakyIOException;
-import static com.baeldung.exceptions.sneakythrows.SneakyThrowsExamples.throwSneakyIOExceptionUsingLombok;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import org.junit.Test;
 
 import java.io.IOException;
 
-import org.junit.Test;
+import static com.baeldung.exception.sneakythrows.SneakyThrowsExamples.throwSneakyIOException;
+import static com.baeldung.exception.sneakythrows.SneakyThrowsExamples.throwSneakyIOExceptionUsingLombok;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class SneakyThrowsExamplesUnitTest {
 

core-java-modules/core-java-exceptions/README.md

@@ -9,9 +9,9 @@ This module contains articles about core java exceptions
 - [Exception Handling in Java](https://www.baeldung.com/java-exceptions)
 - [Differences Between Final, Finally and Finalize in Java](https://www.baeldung.com/java-final-finally-finalize)
 - [Difference Between Throw and Throws in Java](https://www.baeldung.com/java-throw-throws)
-- [“Sneaky Throws” in Java](https://www.baeldung.com/java-sneaky-throws)
 - [The StackOverflowError in Java](https://www.baeldung.com/java-stack-overflow-error)
 - [Checked and Unchecked Exceptions in Java](https://www.baeldung.com/java-checked-unchecked-exceptions)
 - [Common Java Exceptions](https://www.baeldung.com/java-common-exceptions)
 - [Will an Error Be Caught by Catch Block in Java?](https://www.baeldung.com/java-error-catch)
-- [[Next -->]](/core-java-modules/core-java-exceptions-2)
+- [[Next -->]](../core-java-exceptions-2)
+- 

core-java-modules/core-java-exceptions/pom.xml

@@ -21,12 +21,6 @@
             <artifactId>mail</artifactId>
             <version>${javax.mail.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

core-java-modules/core-java-httpclient/README.md

@@ -4,3 +4,4 @@ This module contains articles about Java HttpClient
 
 ### Relevant articles
 - [Posting with Java HttpClient](https://www.baeldung.com/java-httpclient-post)
+- [Custom HTTP Header With the Java HttpClient](https://www.baeldung.com/java-http-client-custom-header)

core-java-modules/core-java-lang-operators-2/README.md

@@ -7,3 +7,4 @@ This module contains articles about Java operators
 - [Logical vs Bitwise OR Operator](https://www.baeldung.com/java-logical-vs-bitwise-or-operator)
 - [Bitmasking in Java with Bitwise Operators](https://www.baeldung.com/java-bitmasking)
 - [Getting a Bit at a Certain Position from Integral Values](https://www.baeldung.com/java-get-bit-at-position)
+- [Check if at Least Two Out of Three Booleans Are True in Java](https://www.baeldung.com/java-check-two-of-three-booleans)

core-java-modules/core-java-reflection-2/README.md

@@ -8,3 +8,4 @@
 - [Finding All Classes in a Java Package](https://www.baeldung.com/java-find-all-classes-in-package)
 - [Invoke a Static Method Using Java Reflection API](https://www.baeldung.com/java-invoke-static-method-reflection)
 - [What Is the JDK com.sun.proxy.$Proxy Class?](https://www.baeldung.com/jdk-com-sun-proxy)
+- [Unit Test Private Methods in Java](https://www.baeldung.com/java-unit-test-private-methods)

core-java-modules/core-java-regex-2/src/main/java/com/baeldung/regex/array/RegexMatches.java

@@ -1,4 +1,4 @@
-package regex.array;
+package com.baeldung.regex.array;
 
 import java.util.ArrayList;
 import java.util.List;

core-java-modules/core-java-regex-2/src/test/java/com/baeldung/regex/array/RegexMatchesUnitTest.java

@@ -1,10 +1,9 @@
-package regex.array;
+package com.baeldung.regex.array;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
-import regex.array.RegexMatches;
-
 class RegexMatchesUnitTest {
 
 	@Test

core-java-modules/core-java-string-conversions-2/README.md

@@ -11,4 +11,5 @@ This module contains articles about string conversions from/to another type.
 - [Convert a String to Camel Case](https://www.baeldung.com/java-string-to-camel-case)
 - [Convert a ByteBuffer to String in Java](https://www.baeldung.com/java-bytebuffer-to-string)
 - [Convert String to Float and Back in Java](https://www.baeldung.com/java-string-to-float)
-- More articles: [[<-- prev]](/core-java-string-conversions)
+- [Difference Between parseInt() and valueOf() in Java](https://www.baeldung.com/java-integer-parseint-vs-valueof)
+- More articles: [[<-- prev]](/core-java-modules/core-java-string-conversions)

core-java-modules/core-java-string-conversions/README.md

@@ -13,4 +13,4 @@ This module contains articles about string conversions from/to another type.
 - [Convert String to Double in Java](https://www.baeldung.com/java-string-to-double)
 - [Convert Char to String in Java](https://www.baeldung.com/java-convert-char-to-string)
 - [Convert String to int or Integer in Java](https://www.baeldung.com/java-convert-string-to-int-or-integer)
-- More articles: [[next -->]](/core-java-string-conversions-2)
+- More articles: [[next -->]](/core-java-modules/core-java-string-conversions-2)

gradle/gradle-fat-jar/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.3'
     }
 }
 
@@ -20,7 +20,7 @@ jar {
     }
 
     from {
-        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     }
 }
 
@@ -30,12 +30,13 @@ task customFatJar(type: Jar) {
         attributes 'Main-Class': 'com.baeldung.fatjar.Application'
     }
     baseName = 'all-in-one-jar'
-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
     with jar
 }
 
 
 dependencies{
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
-    compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
-}
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
+    implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
+}

gradle/gradle-fat-jar/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'gradle-fat-jar'

libraries-data-io/src/main/resources/csv/namedColumn.csv

@@ -0,0 +1,4 @@
+name,Age
+Joe,27
+Jane,32
+Bob,53

maven-modules/maven-properties/README.md

@@ -7,3 +7,4 @@ have their own dedicated modules.
 
 - [Accessing Maven Properties in Java](https://www.baeldung.com/java-accessing-maven-properties)
 - [Default Values for Maven Properties](https://www.baeldung.com/maven-properties-defaults)
+- [A Guide to Maven Encoding](https://www.baeldung.com/maven-encoding)

persistence-modules/pom.xml

@@ -87,6 +87,7 @@
         <module>spring-data-jdbc</module>
         <module>spring-data-keyvalue</module>
         <module>spring-data-mongodb</module>
+        <module>spring-data-mongodb-2</module>
         <module>spring-data-mongodb-reactive</module>
         <module>spring-data-neo4j</module>
         <module>spring-data-redis</module>

persistence-modules/spring-data-mongodb-2/README.md

@@ -0,0 +1,7 @@
+=========
+
+## Spring Data MongoDB 2
+
+### Relevant Articles: 
+- [Return Only Specific Fields for a Query in Spring Data MongoDB](https://www.baeldung.com/mongodb-return-specific-fields)
+

persistence-modules/spring-data-mongodb-2/pom.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-data-mongodb-2</artifactId>
+    <name>spring-data-mongodb-2</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-spring-5</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-spring-5</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-mongodb</artifactId>
+            <version>${org.springframework.data.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mongodb</groupId>
+            <artifactId>mongodb-driver-sync</artifactId>
+            <version>${mongodb-driver.version}</version>
+        </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>de.flapdoodle.embed</groupId>
+            <artifactId>de.flapdoodle.embed.mongo</artifactId>
+            <version>${embed.mongo.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <org.springframework.data.version>3.0.3.RELEASE</org.springframework.data.version>
+        <mongodb-driver.version>4.0.5</mongodb-driver.version>
+        <embed.mongo.version>3.2.6</embed.mongo.version>
+    </properties>
+
+</project>

persistence-modules/spring-data-mongodb/README.md

@@ -11,7 +11,6 @@
 - [Spring Data MongoDB: Projections and Aggregations](http://www.baeldung.com/spring-data-mongodb-projections-aggregations)
 - [Spring Data Annotations](http://www.baeldung.com/spring-data-annotations)
 - [Spring Data MongoDB Transactions](https://www.baeldung.com/spring-data-mongodb-transactions)
-- [Return Only Specific Fields for a Query in Spring Data MongoDB](https://www.baeldung.com/mongodb-return-specific-fields)
 
 ## Spring Data MongoDB Live Testing
 

pom.xml

@@ -365,7 +365,7 @@
                 <module>bazel</module>
                 <module>blade</module>
                 <module>bootique</module>
-                <!-- <module>cas</module> --> <!-- Not a maven project -->
+                <module>cas</module>
                 <module>cdi</module>
                 <module>checker-plugin</module>
                 <!-- <module>clojure</module> --> <!-- Not a maven project -->
@@ -423,7 +423,7 @@
 
                 <module>javafx</module>
                 <module>java-jdi</module>
-                <module>java-lite</module>                
+                <module>java-lite</module>
                 <module>java-rmi</module>
                 <module>java-spi</module>
                 <module>java-vavr-stream</module>
@@ -610,9 +610,7 @@
                 <module>spring-caching-2</module>
 
                 <module>spring-cloud-modules</module>
-                <module>spring-cloud-bus</module>
                 <!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
-                <module>spring-cloud-data-flow</module>
 
                 <module>spring-core</module>
                 <module>spring-core-2</module>
@@ -654,7 +652,6 @@
                 <module>spring-scheduling</module>
                 <module>spring-security-modules</module>
                 <module>spring-shell</module>
-                <module>spring-sleuth</module>
                 <module>spring-soap</module>
                 <module>spring-spel</module>
                 <module>spring-state-machine</module>
@@ -821,7 +818,7 @@
                 <module>bazel</module>
                 <module>blade</module>
                 <module>bootique</module>
-                <!-- <module>cas</module> --> <!-- Not a maven project -->
+                <module>cas</module>
                 <module>cdi</module>
                 <module>checker-plugin</module>
                 <!-- <module>clojure</module> --> <!-- Not a maven project -->
@@ -1285,7 +1282,7 @@
                  <module>core-java-modules/core-java-string-operations-3</module>
                  <module>core-java-modules/core-java-string-operations-4</module>
                  <module>core-java-modules/core-java-time-measurements</module>
-                 <module>core-java-modules/core-java-networking-3</module>                 
+                 <module>core-java-modules/core-java-networking-3</module>
                  <module>core-java-modules/core-java-strings</module>
                  <module>core-java-modules/core-java-httpclient</module>
                  <module>ddd-contexts</module>
@@ -1354,7 +1351,7 @@
                 <module>core-java-modules/core-java-string-operations-3</module>
                 <module>core-java-modules/core-java-string-operations-4</module>
                 <module>core-java-modules/core-java-time-measurements</module>
-                <module>core-java-modules/core-java-networking-3</module>                
+                <module>core-java-modules/core-java-networking-3</module>
                 <module>core-java-modules/core-java-strings</module>
                 <module>ddd-contexts</module>
                 <module>docker-modules</module>

regexMatchesToArray/src/regex/array/RegexMatches.java

@@ -1,24 +0,0 @@
-package regex.array;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.*;
-	
-class RegexMatches {
-	
-    String[] regexMatch(String strSearch)
-	{
-	    List<String> matchesList = new ArrayList<String>();
-	    String stringToSearch = strSearch;
-	    Pattern p1 = Pattern.compile("780{1}\\d{7}");
-	    Matcher m1 = p1.matcher(stringToSearch);
-	    while (m1.find()) 
-	    {
-	    	matchesList.add(m1.group());
-	    }
-	    int sizeOfNewArray = matchesList.size();
-	    String newArrayOfMatches[] = new String[sizeOfNewArray];
-	    matchesList.toArray(newArrayOfMatches);
-	    return newArrayOfMatches;
-	}
-}

regexMatchesToArray/test/regex/array/RegexMatchesUnitTest.java

@@ -1,33 +0,0 @@
-package regex.array;
-
-import static org.junit.jupiter.api.Assertions.*;
-import org.junit.jupiter.api.Test;
-
-import regex.array.RegexMatches;
-
-class RegexMatchesUnitTest {
-
-	@Test
-	void whenFourNums_thenFourMatches() {
-		RegexMatches rm = new RegexMatches();
-		String actual[] = rm.regexMatch("7801111211fsdafasdfa  7802222222  sadfsadfsda7803333333 sadfdasfasd 7804444444");
-		
-		assertArrayEquals(new String[] {"7801111211", "7802222222", "7803333333", "7804444444"}, actual, "success");
-	}
-
-	@Test
-	void whenThreeNums_thenThreeMatches() {
-		RegexMatches rm = new RegexMatches();
-		String actual[] = rm.regexMatch("7801111211fsdafasdfa  780222222  sadfsadfsda7803333333 sadfdasfasd 7804444444");
-		
-		assertArrayEquals(new String[] {"7801111211", "7803333333", "7804444444"}, actual, "success");
-	}
-
-	@Test
-	void whenZeroNums_thenZeroMatches() {
-		RegexMatches rm = new RegexMatches();
-		String actual[] = rm.regexMatch("78011111fsdafasdfa  780222222  sadfsadfsda78033333 sadfdasfasd 7804444");
-		
-		assertArrayEquals(new String[] {}, actual, "success");
-	}
-}

spring-boot-modules/pom.xml

@@ -77,6 +77,7 @@
         <module>spring-boot-actuator</module>
         <module>spring-boot-data-2</module>
         <module>spring-boot-validation</module>
+        <module>spring-boot-data-3</module>
     </modules>
 
     <dependencyManagement>

spring-boot-modules/spring-boot-data-3/README.md

@@ -0,0 +1 @@
+### Relevant Articles:

spring-boot-modules/spring-boot-data-3/pom.xml

@@ -0,0 +1,47 @@
+<?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.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <groupId>com.baeldung</groupId>
+    <artifactId>spring-boot-data-3</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-boot-data-3</name>
+    <description>spring-boot-data-3</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-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/startwithoutdb/StartWithoutDbApplication.java

@@ -0,0 +1,13 @@
+package com.baeldung.startwithoutdb;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class StartWithoutDbApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(StartWithoutDbApplication.class, args);
+    }
+
+}

spring-boot-modules/spring-boot-data-3/src/main/resources/application.properties

@@ -0,0 +1,7 @@
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:mysql://localhost:3306/myDb
+spring.datasource.username=root
+spring.datasource.password=root
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+spring.jpa.hibernate.ddl-auto=none
+spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false

spring-boot-modules/spring-boot-data-3/src/test/java/com/baeldung/startwithoutdb/StartWithoutDbIntegrationTest.java

@@ -0,0 +1,24 @@
+package com.baeldung.startwithoutdb;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.sql.DataSource;
+
+@SpringBootTest(classes = StartWithoutDbApplication.class)
+class StartWithoutDbIntegrationTest {
+
+    @Autowired
+    private ApplicationContext context;
+
+    @Test
+    public void givenAutoConfigDisabled_whenStarting_thenNoAutoconfiguredBeansInContext() {
+        context.getBean(DataSource.class);
+    }
+
+
+}

spring-boot-modules/spring-boot-keycloak/README.md

@@ -10,3 +10,4 @@ This module contains articles about Keycloak in Spring Boot projects.
 - [Customizing Themes for Keycloak](https://www.baeldung.com/spring-keycloak-custom-themes)
 - [Securing SOAP Web Services With Keycloak](https://www.baeldung.com/soap-keycloak)
 - [Get Keycloak User ID in Spring](https://www.baeldung.com/spring-keycloak-get-user-id)
+- [Disabling Keycloak Security in Spring Boot](https://www.baeldung.com/spring-keycloak-security-disable)

spring-boot-modules/spring-boot-springdoc/README.md

@@ -5,3 +5,4 @@
 - [Hiding Endpoints From Swagger Documentation in Spring Boot](https://www.baeldung.com/spring-swagger-hiding-endpoints)
 - [Swagger @Api Description Is Deprecated](https://www.baeldung.com/java-swagger-api-description-deprecated)
 - [Set List of Objects in Swagger API Response](https://www.baeldung.com/java-swagger-set-list-response)
+- [Configure JWT Authentication for OpenAPI](https://www.baeldung.com/openapi-jwt-authentication)

spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-shell/spring-shell.log

@@ -1,2 +0,0 @@
-// dataflow 1.2.0.RELEASE log opened at 2016-10-20 13:13:20
-// dataflow 1.2.0.RELEASE log opened at 2016-10-24 16:51:17

spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/pom.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-cloud-data-flow-stream-processing</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-cloud-data-flow-stream-processing</name>
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>spring-cloud-data-flow</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-
-    <modules>
-        <module>data-flow-server</module>
-        <module>data-flow-shell</module>
-        <module>time-source</module>
-        <module>time-processor</module>
-        <module>log-sink</module>
-    </modules>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>

spring-cloud-modules/pom.xml

@@ -27,7 +27,7 @@
         <module>spring-cloud-zookeeper</module>
         <module>spring-cloud-gateway</module>
         <module>spring-cloud-stream</module>
-        <module>spring-cloud-stream-starters/twitterhdfs</module>
+        <module>spring-cloud-stream-starters</module>
         <module>spring-cloud-connectors-heroku</module>
         <module>spring-cloud-aws</module>
         <module>spring-cloud-consul</module>
@@ -50,6 +50,9 @@
         <module>spring-cloud-sentinel</module>
         <module>spring-cloud-dapr</module>
         <module>spring-cloud-docker</module>
+        <module>spring-cloud-bus</module>
+        <module>spring-cloud-data-flow</module>
+        <module>spring-cloud-sleuth</module>
     </modules>
 
     <build>
@@ -92,4 +95,4 @@
         <spring-cloud-stream.version>3.1.3</spring-cloud-stream.version>
     </properties>
 
-</project>
+</project>

spring-cloud-modules/spring-cloud-bus/pom.xml

@@ -10,10 +10,9 @@
     <packaging>pom</packaging>
 
     <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.cloud</groupId>
+        <artifactId>spring-cloud-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <modules>

spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/pom.xml

@@ -1,54 +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>spring-cloud-config-client</artifactId>
-    <name>spring-cloud-config-client</name>
-    <packaging>jar</packaging>
-    <description>Demo Spring Cloud Config Client</description>
-
-    <parent>
-        <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>spring-cloud-bus</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-actuator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-actuator-autoconfigure</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-bus-amqp</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-cloud-config-client</artifactId>
+    <name>spring-cloud-config-client</name>
+    <packaging>jar</packaging>
+    <description>Demo Spring Cloud Config Client</description>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-bus</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-actuator-autoconfigure</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bus-amqp</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml

@@ -1,27 +1,27 @@
----
-spring:
-  application:
-    name: config-client
-  profiles:
-    active: development
-  config:
-    import: configserver:http://root:s3cr3t@localhost:8888
-  rabbitmq:
-    host: localhost
-    port: 5672
-    username: guest
-    password: guest
-  cloud:
-    bus:
-      enabled: true
-      refresh:
-        enabled: true
-    config:
-      fail-fast: true
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-  security:
+---
+spring:
+  application:
+    name: config-client
+  profiles:
+    active: development
+  config:
+    import: configserver:http://root:s3cr3t@localhost:8888
+  rabbitmq:
+    host: localhost
+    port: 5672
+    username: guest
+    password: guest
+  cloud:
+    bus:
+      enabled: true
+      refresh:
+        enabled: true
+    config:
+      fail-fast: true
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  security:
     enabled: false

spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/pom.xml

@@ -1,50 +1,50 @@
-<?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-cloud-config-server</artifactId>
-    <name>spring-cloud-config-server</name>
-    <packaging>jar</packaging>
-    <description>Demo Spring Cloud Config Server</description>
-
-    <parent>
-        <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>spring-cloud-bus</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-config-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-config-monitor</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-cloud-config-server</artifactId>
+    <name>spring-cloud-config-server</name>
+    <packaging>jar</packaging>
+    <description>Demo Spring Cloud Config Server</description>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-bus</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-config-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-config-monitor</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties

@@ -1,14 +1,14 @@
-server.port=8888
-spring.cloud.config.server.git.uri=
-spring.cloud.bus.enabled=true
-spring.security.user.name=root
-spring.security.user.password=s3cr3t
-spring.rabbitmq.host=localhost
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=guest
-spring.rabbitmq.password=guest
-
-encrypt.key-store.location=classpath:/config-server.jks
-encrypt.key-store.password=my-s70r3-s3cr3t
-encrypt.key-store.alias=config-server-key
+server.port=8888
+spring.cloud.config.server.git.uri=
+spring.cloud.bus.enabled=true
+spring.security.user.name=root
+spring.security.user.password=s3cr3t
+spring.rabbitmq.host=localhost
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=guest
+spring.rabbitmq.password=guest
+
+encrypt.key-store.location=classpath:/config-server.jks
+encrypt.key-store.password=my-s70r3-s3cr3t
+encrypt.key-store.alias=config-server-key
 encrypt.key-store.secret=my-k34-s3cr3t

spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/pom.xml

@@ -7,7 +7,7 @@
     <name>apache-spark-job</name>
 
     <parent>
-        <groupId>com.baeldung</groupId>
+        <groupId>com.baeldung.spring.cloud</groupId>
         <artifactId>spring-cloud-data-flow</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>

spring-cloud-modules/spring-cloud-data-flow/batch-job/pom.xml

@@ -11,7 +11,7 @@
     <description>Demo project for Spring Boot</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
+        <groupId>com.baeldung.spring.cloud</groupId>
         <artifactId>spring-cloud-data-flow</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>

spring-cloud-modules/spring-cloud-data-flow/pom.xml

@@ -1,25 +1,24 @@
-<?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-cloud-data-flow</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-cloud-data-flow</name>
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
-    </parent>
-
-    <modules>
-        <module>spring-cloud-data-flow-stream-processing</module>
-        <module>spring-cloud-data-flow-etl</module>
-        <module>batch-job</module>
-        <module>apache-spark-job</module>
-    </modules>
-
+<?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-cloud-data-flow</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-cloud-data-flow</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>spring-cloud-data-flow-stream-processing</module>
+        <module>spring-cloud-data-flow-etl</module>
+        <module>batch-job</module>
+        <module>apache-spark-job</module>
+    </modules>
+
 </project>

spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-mongodb-sink/pom.xml

@@ -9,7 +9,7 @@
     <description>Example ETL Load Project</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
+        <groupId>com.baeldung.spring.cloud</groupId>
         <artifactId>spring-cloud-data-flow-etl</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>

spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-etl/customer-transform/pom.xml

@@ -9,7 +9,7 @@
     <description>Example transform ETL step</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
+        <groupId>com.baeldung.spring.cloud</groupId>
         <artifactId>spring-cloud-data-flow-etl</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>