Merge branch 'eugenp:master' into master

akka-modules/akka-http/pom.xml

@@ -15,22 +15,22 @@
     <dependencies>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-http_2.12</artifactId>
+            <artifactId>akka-http_${scala.version}</artifactId>
             <version>${akka.http.version}</version>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-stream_2.12</artifactId>
+            <artifactId>akka-stream_${scala.version}</artifactId>
             <version>${akka.stream.version}</version>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-http-jackson_2.12</artifactId>
+            <artifactId>akka-http-jackson_${scala.version}</artifactId>
             <version>${akka.http.version}</version>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-http-testkit_2.12</artifactId>
+            <artifactId>akka-http-testkit_${scala.version}</artifactId>
             <version>${akka.http.version}</version>
             <scope>test</scope>
         </dependency>

akka-modules/akka-streams/pom.xml

@@ -27,7 +27,6 @@
 
     <properties>
         <akkastreams.version>2.5.2</akkastreams.version>
-        <scala.version>2.11</scala.version>
     </properties>
 
 </project>

akka-modules/pom.xml

@@ -30,4 +30,8 @@
         </pluginManagement>
     </build>
 
+    <properties>
+        <scala.version>2.12</scala.version>
+    </properties>
+
 </project>

akka-modules/spring-akka/pom.xml

@@ -45,7 +45,6 @@
     <properties>
         <spring.version>4.3.4.RELEASE</spring.version>
         <akka.version>2.4.14</akka.version>
-        <scala.version>2.11</scala.version>
     </properties>
 
 </project>

algorithms-modules/algorithms-genetic/pom.xml

@@ -38,9 +38,7 @@
     </dependencies>
 
     <properties>
-        <commons-math3.version>3.6.1</commons-math3.version>
         <io.jenetics.version>3.7.0</io.jenetics.version>
-        <commons-codec.version>1.11</commons-codec.version>
     </properties>
 
 </project>

algorithms-modules/algorithms-miscellaneous-1/pom.xml

@@ -63,10 +63,7 @@
     </reporting>
 
     <properties>
-        <commons-math3.version>3.6.1</commons-math3.version>
-        <commons-codec.version>1.11</commons-codec.version>
         <combinatoricslib3.version>3.3.0</combinatoricslib3.version>
-        <cobertura.plugin.version>2.7</cobertura.plugin.version>
     </properties>
 
 </project>

algorithms-modules/algorithms-miscellaneous-2/pom.xml

@@ -68,12 +68,8 @@
     </reporting>
 
     <properties>
-        <commons-math3.version>3.6.1</commons-math3.version>
-        <tradukisto.version>1.0.1</tradukisto.version>
         <org.jgrapht.core.version>1.0.1</org.jgrapht.core.version>
         <org.jgrapht.ext.version>1.0.1</org.jgrapht.ext.version>
-        <commons-codec.version>1.11</commons-codec.version>
-        <cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
     </properties>
 
 </project>

algorithms-modules/algorithms-miscellaneous-5/pom.xml

@@ -36,10 +36,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <tradukisto.version>1.0.1</tradukisto.version>
-        <commons-codec.version>1.11</commons-codec.version>
-        <commons-math3.version>3.6.1</commons-math3.version>
-    </properties>
-
 </project>

algorithms-modules/algorithms-miscellaneous-6/pom.xml

@@ -32,8 +32,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <commons-math3.version>3.6.1</commons-math3.version>
-    </properties>
-
 </project>

algorithms-modules/algorithms-sorting-2/pom.xml

@@ -31,9 +31,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <commons-math3.version>3.6.1</commons-math3.version>
-        <commons-codec.version>1.11</commons-codec.version>
-    </properties>
-
 </project>

algorithms-modules/algorithms-sorting/pom.xml

@@ -32,9 +32,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <commons-math3.version>3.6.1</commons-math3.version>
-        <commons-codec.version>1.11</commons-codec.version>
-    </properties>
-
 </project>

algorithms-modules/pom.xml

@@ -27,4 +27,11 @@
         <module>algorithms-sorting-2</module>
     </modules>
 
+    <properties>
+        <commons-codec.version>1.11</commons-codec.version>
+        <commons-math3.version>3.6.1</commons-math3.version>
+        <cobertura.plugin.version>2.7</cobertura.plugin.version>
+        <tradukisto.version>1.0.1</tradukisto.version>
+    </properties>
+
 </project>

aws-modules/aws-lambda/lambda/pom.xml

@@ -98,8 +98,6 @@
         <aws-lambda-java-events.version>1.3.0</aws-lambda-java-events.version>
         <aws-lambda-java-core.version>1.2.0</aws-lambda-java-core.version>
         <gson.version>2.8.2</gson.version>
-        <aws-java-sdk.version>1.11.241</aws-java-sdk.version>
-        <maven-shade-plugin.version>3.0.0</maven-shade-plugin.version>
     </properties>
 
 </project>

aws-modules/aws-miscellaneous/pom.xml

@@ -112,12 +112,10 @@
         <aws-lambda-java-events.version>1.3.0</aws-lambda-java-events.version>
         <aws-lambda-java-core.version>1.1.0</aws-lambda-java-core.version>
         <gson.version>2.8.0</gson.version>
-        <aws-java-sdk.version>1.11.290</aws-java-sdk.version>
         <dynamodblocal.version>1.11.86</dynamodblocal.version>
         <dynamodblocal.repository.url>https://s3-us-west-2.amazonaws.com/dynamodb-local/release</dynamodblocal.repository.url>
         <commons-codec-version>1.10.L001</commons-codec-version>
         <jets3t-version>0.9.4.0006L</jets3t-version>
-        <maven-shade-plugin.version>3.0.0</maven-shade-plugin.version>
         <maven-plugins-version>3.1.1</maven-plugins-version>
     </properties>
 

aws-modules/aws-s3/pom.xml

@@ -60,10 +60,8 @@
     </build>
 
     <properties>
-        <aws-java-sdk.version>1.11.290</aws-java-sdk.version>
         <commons-codec-version>1.10.L001</commons-codec-version>
         <jets3t-version>0.9.4.0006L</jets3t-version>
-        <maven-shade-plugin.version>3.0.0</maven-shade-plugin.version>
     </properties>
 
 </project>

aws-modules/pom.xml

@@ -21,4 +21,8 @@
         <module>aws-s3</module>
     </modules>
 
+    <properties>
+        <aws-java-sdk.version>1.11.290</aws-java-sdk.version>
+        <maven-shade-plugin.version>3.0.0</maven-shade-plugin.version>
+    </properties>
 </project>

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

@@ -32,6 +32,16 @@
             <artifactId>log4j-over-slf4j</artifactId>
             <version>${org.slf4j.version}</version>
         </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.15</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>31.1-jre</version>
+        </dependency>
     </dependencies>
 
 </project>

core-java-modules/core-java-io-4/src/main/java/com/baeldung/md5checksum/Md5ChecksumGenerator.java

@@ -0,0 +1,44 @@
+package com.baeldung.md5checksum;
+
+import com.google.common.hash.HashCode;
+import com.google.common.hash.Hashing;
+import com.google.common.io.ByteSource;
+import org.apache.commons.codec.digest.DigestUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigInteger;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class Md5ChecksumGenerator {
+
+    public static String genWithApacheCommons(String filePath) throws IOException {
+        try (InputStream is = Files.newInputStream(Paths.get(filePath))) {
+            return DigestUtils.md5Hex(is);
+        }
+    }
+
+    public static String genWithGuava(String filePath) throws IOException {
+        File file = new File(filePath);
+        ByteSource byteSource = com.google.common.io.Files.asByteSource(file);
+        HashCode hc = byteSource.hash(Hashing.md5());
+        return hc.toString();
+    }
+
+    public static String genWithMessageDigest(String filePath) throws IOException, NoSuchAlgorithmException {
+        byte[] data = Files.readAllBytes(Paths.get(filePath));
+        byte[] hash = MessageDigest.getInstance("MD5").digest(data);
+        return new BigInteger(1, hash).toString(16);
+    }
+
+    public static void main(String[] args) throws IOException, NoSuchAlgorithmException {
+        String filePath = "D:\\temp.txt";
+        System.out.println(genWithApacheCommons(filePath));
+        System.out.println(genWithMessageDigest(filePath));
+        System.out.println(genWithGuava(filePath));
+    }
+}

core-java-modules/core-java-io-apis/src/test/java/com/baeldung/file/FileClassManualTest.java

@@ -9,7 +9,10 @@ import java.util.List;
 
 import static org.junit.Assert.*;
 
-public class FileClassUnitTest {
+/**
+ * Manual tests for data reading and writing
+ */
+public class FileClassManualTest {
 
     @Test
     public void givenDir_whenMkdir_thenDirIsDeleted() {

core-java-modules/core-java-numbers-5/src/main/java/com/baeldung/factors/FactorsOfInteger.java

@@ -0,0 +1,39 @@
+package com.baeldung.factors;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class FactorsOfInteger {
+    public static Set<Integer> getAllFactorsVer1(int n) {
+        Set<Integer> factors = new HashSet<>();
+        for (int i = 1; i <= n; i++) {
+            if (n % i == 0) {
+                factors.add(i);
+            }
+        }
+        return factors;
+    }
+
+    public static Set<Integer> getAllFactorsVer2(int n) {
+        Set<Integer> factors = new HashSet<>();
+        for (int i = 1; i <= Math.sqrt(n); i++) {
+            if (n % i == 0) {
+                factors.add(i);
+                factors.add(n / i);
+            }
+        }
+        return factors;
+    }
+
+    public static Set<Integer> getAllFactorsVer3(int n) {
+        Set<Integer> factors = new HashSet<>();
+        int step = n % 2 == 0 ? 1 : 2;
+        for (int i = 1; i <= Math.sqrt(n); i += step) {
+            if (n % i == 0) {
+                factors.add(i);
+                factors.add(n / i);
+            }
+        }
+        return factors;
+    }
+}

core-java-modules/core-java-numbers-5/src/test/java/com/baeldung/factors/FactorsOfIntegerUnitTest.java

@@ -0,0 +1,40 @@
+package com.baeldung.factors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+
+class FactorsOfIntegerUnitTest {
+    //@formatter:off
+    private final static Map<Integer, Set<Integer>> FACTOR_MAP = ImmutableMap.of(
+    0, ImmutableSet.of(),
+    1, ImmutableSet.of(1),
+    20, ImmutableSet.of(1, 2, 4, 5, 10, 20),
+    24, ImmutableSet.of(1, 2, 3, 4, 6, 8, 12, 24),
+    97, ImmutableSet.of(1, 97),
+    99, ImmutableSet.of(1, 3, 9, 11, 33, 99),
+    100, ImmutableSet.of(1, 2, 4, 5, 10, 20, 25, 50, 100)
+    );
+    //@formatter:on
+
+    @Test
+    void givenAnInteger_whenCallingFindAllFactorsTheDraftVersion_shouldGetExpectedResult() {
+        FACTOR_MAP.forEach((number, expected) -> assertEquals(expected, FactorsOfInteger.getAllFactorsVer1(number)));
+    }
+
+    @Test
+    void givenAnInteger_whenCallingFindAllFactorsVer2_shouldGetExpectedResult() {
+        FACTOR_MAP.forEach((number, expected) -> assertEquals(expected, FactorsOfInteger.getAllFactorsVer2(number)));
+    }
+
+    @Test
+    void givenAnInteger_whenCallingFindAllFactorsVer3_shouldGetExpectedResult() {
+        FACTOR_MAP.forEach((number, expected) -> assertEquals(expected, FactorsOfInteger.getAllFactorsVer3(number)));
+    }
+}

core-java-modules/core-java-numbers-5/src/test/java/com/baeldung/intdivision/IntegerDivisionUnitTest.java

@@ -0,0 +1,26 @@
+package com.baeldung.intdivision;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+class IntegerDivisionUnitTest {
+    @Test
+    void givenTwoInt_whenExecDivision_shouldGetInteger() {
+        int i = 10 / 4;
+        assertEquals(2, i);
+
+        float x = 10 / 4;
+        assertEquals(2, x);
+    }
+
+    @Test
+    void givenTwoInt_whenCastAnyoneToFloat_shouldGetFloatResult() {
+        float x = (float) 10 / 4;
+        assertEquals(2.5, x);
+
+        float y = 10 / (float) 8;
+        assertEquals(1.25, y);
+    }
+
+}

core-java-modules/core-java-string-apis/src/test/java/com/baeldung/removelastcharfromsb/RemoveLastCharFromSbUnitTest.java

@@ -0,0 +1,30 @@
+package com.baeldung.removelastcharfromsb;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+class RemoveLastCharFromSbUnitTest {
+    @Test
+    void givenSb_whenRemovingUsingDeleteCharAt_shouldGetExpectedResult() {
+        StringBuilder sb = new StringBuilder("Using the sb.deleteCharAt() method!");
+        sb.deleteCharAt(sb.length() - 1);
+        assertEquals("Using the sb.deleteCharAt() method", sb.toString());
+    }
+
+    @Test
+    void givenSb_whenRemovingUsingReplace_shouldGetExpectedResult() {
+        StringBuilder sb = new StringBuilder("Using the sb.replace() method!");
+        int last = sb.length() - 1;
+        sb.replace(last, last + 1, "");
+        assertEquals("Using the sb.replace() method", sb.toString());
+    }
+
+    @Test
+    void givenSb_whenRemovingUsingSubString_shouldGetExpectedResult() {
+        StringBuilder sb = new StringBuilder("Using the sb.substring() method!");
+        assertEquals("Using the sb.substring() method", sb.substring(0, sb.length() - 1));
+        //the stringBuilder object is not changed
+        assertEquals("Using the sb.substring() method!", sb.toString());
+    }
+}

core-java-modules/core-java-string-operations-5/README.md

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

core-java-modules/core-java-string-operations-5/pom.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>core-java-string-operations-5</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-string-operations-5</name>
+    <packaging>jar</packaging>
+
+    <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.source}</source>
+                    <target>${maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+</project>

core-java-modules/core-java-string-operations-5/src/test/java/com/baeldung/charcomparison/CharComparisonUnitTest.java

@@ -0,0 +1,55 @@
+package com.baeldung.charcomparison;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Objects;
+
+import org.junit.jupiter.api.Test;
+
+class CharComparisonUnitTest {
+
+    @Test
+    void givenTwoPrimitiveChars_whenUsingRelationalOperators_thenCompare() {
+        assertFalse('a' == 'A');
+        assertTrue('a' < 'v');
+        assertTrue('F' > 'D');
+    }
+
+    @Test
+    void givenTwoPrimitiveChars_whenUsingCompareMethod_thenCompare() {
+        assertTrue(Character.compare('C', 'C') == 0);
+        assertTrue(Character.compare('f', 'A') > 0);
+        assertTrue(Character.compare('Y', 'z') < 0);
+    }
+
+    @Test
+    void givenTwoCharObjects_whenUsingCompareToMethod_thenCompare() {
+        Character chK = Character.valueOf('K');
+        Character chG = Character.valueOf('G');
+        Character chH = Character.valueOf('H');
+
+        assertTrue(chK.compareTo(chK) == 0);
+        assertTrue(chK.compareTo(chG) > 0);
+        assertTrue(chG.compareTo(chH) < 0);
+    }
+
+    @Test
+    void givenTwoCharObjects_whenUsingEqualsMethod_thenCompare() {
+        Character chL = 'L';
+        Character chV = 'V';
+
+        assertTrue(chL.equals(chL));
+        assertFalse(chL.equals(chV));
+    }
+
+    @Test
+    void givenTwoCharObjects_whenUsingObjectsEqualsMethod_thenCompare() {
+        Character chA = 'A';
+        Character chB = 'B';
+
+        assertTrue(Objects.equals(chA, chA));
+        assertFalse(Objects.equals(chA, chB));
+    }
+
+}

docker-modules/docker-compose/rebuild-container/docker-compose-independents.yml

@@ -0,0 +1,8 @@
+version: "3.9"
+services:
+  ubuntu:
+    image: "ubuntu:latest"
+    tty: true
+  alpine:
+    image: "alpine:latest"
+    tty: true

docker-modules/docker-compose/rebuild-container/docker-compose-with-dependency.yml

@@ -0,0 +1,10 @@
+version: "3.9"
+services:
+  ubuntu:
+    image: "ubuntu:latest"
+    tty: true
+    depends_on:
+      - "alpine"
+  alpine:
+    image: "alpine:latest"
+    tty: true

patterns/solid/src/main/java/com/baeldung/s/BadBook.java

@@ -10,8 +10,8 @@ public class BadBook {
 
 
   //methods that directly relate to the book properties
-  public String replaceWordInText(String word){
-    return text.replaceAll(word, text);
+  public String replaceWordInText(String word, String replacementWord){
+    return text.replaceAll(word, replacementWord);
   }
 
   public boolean isWordInText(String word){

patterns/solid/src/main/java/com/baeldung/s/GoodBook.java

@@ -9,8 +9,8 @@ public class GoodBook {
   //constructor, getters and setters
 
   //methods that directly relate to the book properties
-  public String replaceWordInText(String word){
-    return text.replaceAll(word, text);
+  public String replaceWordInText(String word, String replacementWord){
+    return text.replaceAll(word, replacementWord);
   }
 
   public boolean isWordInText(String word){

pom.xml

@@ -617,6 +617,7 @@
 
                 <module>static-analysis</module>
                 <module>stripe</module>
+                <module>struts</module>
 
                 <module>tensorflow-java</module>
                 <module>testing-modules</module>
@@ -1008,6 +1009,7 @@
 
                 <module>static-analysis</module>
                 <module>stripe</module>
+                <module>struts</module>
 
                 <module>tensorflow-java</module>
                 <module>testing-modules</module>
@@ -1302,8 +1304,8 @@
         <java.version>1.8</java.version>
         <log4j.version>1.2.17</log4j.version>
         <esapi.version>2.5.0.0</esapi.version>
-        <jmh-core.version>1.33</jmh-core.version>
-        <jmh-generator.version>1.33</jmh-generator.version>
+        <jmh-core.version>1.35</jmh-core.version>
+        <jmh-generator.version>1.35</jmh-generator.version>
         <maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
         <commons-collections4.version>4.4</commons-collections4.version>
         <commons-io.version>2.11.0</commons-io.version>

spring-cloud-modules/pom.xml

@@ -52,6 +52,7 @@
         <module>spring-cloud-bus</module>
         <module>spring-cloud-data-flow</module>
         <module>spring-cloud-sleuth</module>
+        <module>spring-cloud-openfeign-2</module>
     </modules>
 
     <build>

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

@@ -16,8 +16,8 @@
     </parent>
 
     <modules>
-        <module>spring-cloud-config-client</module>
-        <module>spring-cloud-config-server</module>
+        <module>spring-cloud-bus-client</module>
+        <module>spring-cloud-bus-server</module>
     </modules>
 
     <dependencyManagement>

spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-client/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-cloud-config-client</artifactId>
-    <name>spring-cloud-config-client</name>
+    <artifactId>spring-cloud-bus-client</artifactId>
+    <name>spring-cloud-bus-client</name>
     <packaging>jar</packaging>
     <description>Demo Spring Cloud Config Client</description>
 

spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-server/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-cloud-config-server</artifactId>
-    <name>spring-cloud-config-server</name>
+    <artifactId>spring-cloud-bus-server</artifactId>
+    <name>spring-cloud-bus-server</name>
     <packaging>jar</packaging>
     <description>Demo Spring Cloud Config Server</description>
 

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

@@ -16,8 +16,8 @@
     </parent>
 
     <modules>
-        <module>server</module>
-        <module>client</module>
+        <module>spring-cloud-config-server</module>
+        <module>spring-cloud-config-client</module>
     </modules>
 
     <dependencyManagement>

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

@@ -3,8 +3,8 @@
     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>client</artifactId>
-    <name>client</name>
+    <artifactId>spring-cloud-config-client</artifactId>
+    <name>spring-cloud-config-client</name>
 
     <parent>
         <groupId>com.baeldung.spring.cloud</groupId>

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

@@ -3,8 +3,8 @@
     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>server</artifactId>
-    <name>server</name>
+    <artifactId>spring-cloud-config-server</artifactId>
+    <name>spring-cloud-config-server</name>
 
     <parent>
         <groupId>com.baeldung.spring.cloud</groupId>

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

@@ -17,8 +17,8 @@
     <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>
+        <module>spring-cloud-data-flow-batch-job</module>
+        <module>spring-cloud-data-flow-apache-spark-job</module>
     </modules>
 
 </project>

spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-apache-spark-job/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>apache-spark-job</artifactId>
-    <name>apache-spark-job</name>
+    <artifactId>spring-cloud-data-flow-apache-spark-job</artifactId>
+    <name>spring-cloud-data-flow-apache-spark-job</name>
 
     <parent>
         <groupId>com.baeldung.spring.cloud</groupId>

spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-batch-job/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.spring.cloud</groupId>
-    <artifactId>batch-job</artifactId>
+    <artifactId>spring-cloud-data-flow-batch-job</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>batch-job</name>
+    <name>spring-cloud-data-flow-batch-job</name>
     <packaging>jar</packaging>
     <description>Demo project for Spring Boot</description>
 

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

@@ -15,9 +15,9 @@
     </parent>
 
     <modules>
-        <module>feign-rest-consumer</module>
-        <module>rest-producer</module>
-        <module>rest-consumer</module>
+        <module>spring-cloud-hystrix-feign-rest-consumer</module>
+        <module>spring-cloud-hystrix-rest-producer</module>
+        <module>spring-cloud-hystrix-rest-consumer</module>
     </modules>
 
 </project>

spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-feign-rest-consumer/pom.xml

@@ -3,9 +3,9 @@
     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>feign-rest-consumer</artifactId>
+    <artifactId>spring-cloud-hystrix-feign-rest-consumer</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <name>feign-rest-consumer</name>
+    <name>spring-cloud-hystrix-feign-rest-consumer</name>
     <packaging>jar</packaging>
 
     <parent>

spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-consumer/pom.xml

@@ -3,9 +3,9 @@
     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>rest-consumer</artifactId>
+    <artifactId>spring-cloud-hystrix-rest-consumer</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <name>rest-consumer</name>
+    <name>spring-cloud-hystrix-rest-consumer</name>
     <packaging>jar</packaging>
 
     <parent>

spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-producer/pom.xml

@@ -3,9 +3,9 @@
     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>rest-producer</artifactId>
+    <artifactId>spring-cloud-hystrix-rest-producer</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <name>rest-producer</name>
+    <name>spring-cloud-hystrix-rest-producer</name>
     <packaging>jar</packaging>
 
     <parent>

spring-cloud-modules/spring-cloud-netflix-sidecar/pom.xml

@@ -17,8 +17,8 @@
     </parent>
 
     <modules>
-        <module>sidecar-demo</module>
-        <module>echo-demo</module>
+        <module>spring-cloud-netflix-sidecar-demo</module>
+        <module>spring-cloud-netflix-sidecar-echo-demo</module>
     </modules>
 
     <properties>

spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-demo/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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>sidecar-demo</artifactId>
-    <name>sidecar-demo</name>
+    <artifactId>spring-cloud-netflix-sidecar-demo</artifactId>
+    <name>spring-cloud-netflix-sidecar-demo</name>
     <description>Sidecar demo for hello endpoint</description>
 
     <parent>