From baecf2cfc35727b5eac001df7ee0e2ecb55ef113 Mon Sep 17 00:00:00 2001
From: mikr <michael.krimgen@ximedes.com>
Date: Tue, 27 Apr 2021 22:52:13 +0200
Subject: [PATCH] JAVA-4583 Fix failing tests in the
 tutorials-default-jdk9-and-above job

---
 .../{consumermodule => consumermodule1}/pom.xml               | 2 +-
 .../main/java/com/baeldung/consumermodule/Application.java    | 0
 .../src/main/java/module-info.java                            | 0
 core-java-modules/core-java-jpms/decoupling-pattern1/pom.xml  | 4 ++--
 .../{servicemodule => servicemodule1}/pom.xml                 | 0
 .../java/com/baeldung/servicemodule/external/TextService.java | 0
 .../baeldung/servicemodule/external/TextServiceFactory.java   | 0
 .../baeldung/servicemodule/internal/LowercaseTextService.java | 0
 .../baeldung/servicemodule/internal/UppercaseTextService.java | 0
 .../src/main/java/module-info.java                            | 0
 .../{consumermodule => consumermodule2}/pom.xml               | 2 +-
 .../main/java/com/baeldung/consumermodule/Application.java    | 0
 .../src/main/java/module-info.java                            | 0
 core-java-modules/core-java-jpms/decoupling-pattern2/pom.xml  | 4 ++--
 .../core-java-jpms/decoupling-pattern2/providermodule/pom.xml | 2 +-
 .../{servicemodule => servicemodule2}/pom.xml                 | 0
 .../src/main/java/com/baeldung/servicemodule/TextService.java | 0
 .../src/main/java/module-info.java                            | 0
 18 files changed, 7 insertions(+), 7 deletions(-)
 rename core-java-modules/core-java-jpms/decoupling-pattern1/{consumermodule => consumermodule1}/pom.xml (96%)
 rename core-java-modules/core-java-jpms/decoupling-pattern1/{consumermodule => consumermodule1}/src/main/java/com/baeldung/consumermodule/Application.java (100%)
 rename core-java-modules/core-java-jpms/decoupling-pattern1/{consumermodule => consumermodule1}/src/main/java/module-info.java (100%)
 rename core-java-modules/core-java-jpms/decoupling-pattern1/{servicemodule => servicemodule1}/pom.xml (100%)
 rename core-java-modules/core-java-jpms/decoupling-pattern1/{servicemodule => servicemodule1}/src/main/java/com/baeldung/servicemodule/external/TextService.java (100%)
 rename core-java-modules/core-java-jpms/decoupling-pattern1/{servicemodule => servicemodule1}/src/main/java/com/baeldung/servicemodule/external/TextServiceFactory.java (100%)
 rename core-java-modules/core-java-jpms/decoupling-pattern1/{servicemodule => servicemodule1}/src/main/java/com/baeldung/servicemodule/internal/LowercaseTextService.java (100%)
 rename core-java-modules/core-java-jpms/decoupling-pattern1/{servicemodule => servicemodule1}/src/main/java/com/baeldung/servicemodule/internal/UppercaseTextService.java (100%)
 rename core-java-modules/core-java-jpms/decoupling-pattern1/{servicemodule => servicemodule1}/src/main/java/module-info.java (100%)
 rename core-java-modules/core-java-jpms/decoupling-pattern2/{consumermodule => consumermodule2}/pom.xml (97%)
 rename core-java-modules/core-java-jpms/decoupling-pattern2/{consumermodule => consumermodule2}/src/main/java/com/baeldung/consumermodule/Application.java (100%)
 rename core-java-modules/core-java-jpms/decoupling-pattern2/{consumermodule => consumermodule2}/src/main/java/module-info.java (100%)
 rename core-java-modules/core-java-jpms/decoupling-pattern2/{servicemodule => servicemodule2}/pom.xml (100%)
 rename core-java-modules/core-java-jpms/decoupling-pattern2/{servicemodule => servicemodule2}/src/main/java/com/baeldung/servicemodule/TextService.java (100%)
 rename core-java-modules/core-java-jpms/decoupling-pattern2/{servicemodule => servicemodule2}/src/main/java/module-info.java (100%)

diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule/pom.xml b/core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule1/pom.xml
similarity index 96%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule/pom.xml
rename to core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule1/pom.xml
index fb6d2b1065..0213a17d74 100644
--- a/core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule/pom.xml
+++ b/core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule1/pom.xml
@@ -4,7 +4,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>consumermodule</artifactId>
+    <artifactId>consumermodule1</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
 
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule/src/main/java/com/baeldung/consumermodule/Application.java b/core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule1/src/main/java/com/baeldung/consumermodule/Application.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule/src/main/java/com/baeldung/consumermodule/Application.java
rename to core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule1/src/main/java/com/baeldung/consumermodule/Application.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule/src/main/java/module-info.java b/core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule1/src/main/java/module-info.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule/src/main/java/module-info.java
rename to core-java-modules/core-java-jpms/decoupling-pattern1/consumermodule1/src/main/java/module-info.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/pom.xml b/core-java-modules/core-java-jpms/decoupling-pattern1/pom.xml
index f80d7d4815..2808f0afb5 100644
--- a/core-java-modules/core-java-jpms/decoupling-pattern1/pom.xml
+++ b/core-java-modules/core-java-jpms/decoupling-pattern1/pom.xml
@@ -16,8 +16,8 @@
     </parent>
 
     <modules>
-        <module>servicemodule</module>
-        <module>consumermodule</module>
+        <module>servicemodule1</module>
+        <module>consumermodule1</module>
     </modules>
 
     <build>
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule/pom.xml b/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/pom.xml
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule/pom.xml
rename to core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/pom.xml
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule/src/main/java/com/baeldung/servicemodule/external/TextService.java b/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/com/baeldung/servicemodule/external/TextService.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule/src/main/java/com/baeldung/servicemodule/external/TextService.java
rename to core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/com/baeldung/servicemodule/external/TextService.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule/src/main/java/com/baeldung/servicemodule/external/TextServiceFactory.java b/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/com/baeldung/servicemodule/external/TextServiceFactory.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule/src/main/java/com/baeldung/servicemodule/external/TextServiceFactory.java
rename to core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/com/baeldung/servicemodule/external/TextServiceFactory.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule/src/main/java/com/baeldung/servicemodule/internal/LowercaseTextService.java b/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/com/baeldung/servicemodule/internal/LowercaseTextService.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule/src/main/java/com/baeldung/servicemodule/internal/LowercaseTextService.java
rename to core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/com/baeldung/servicemodule/internal/LowercaseTextService.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule/src/main/java/com/baeldung/servicemodule/internal/UppercaseTextService.java b/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/com/baeldung/servicemodule/internal/UppercaseTextService.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule/src/main/java/com/baeldung/servicemodule/internal/UppercaseTextService.java
rename to core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/com/baeldung/servicemodule/internal/UppercaseTextService.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule/src/main/java/module-info.java b/core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/module-info.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule/src/main/java/module-info.java
rename to core-java-modules/core-java-jpms/decoupling-pattern1/servicemodule1/src/main/java/module-info.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/pom.xml b/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule2/pom.xml
similarity index 97%
rename from core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/pom.xml
rename to core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule2/pom.xml
index c7bff60a8b..58f162d5a2 100644
--- a/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/pom.xml
+++ b/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule2/pom.xml
@@ -5,7 +5,7 @@
     xsi: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.consumermodule</groupId>
-    <artifactId>consumermodule</artifactId>
+    <artifactId>consumermodule2</artifactId>
     <version>1.0</version>
 
     <parent>
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/src/main/java/com/baeldung/consumermodule/Application.java b/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule2/src/main/java/com/baeldung/consumermodule/Application.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/src/main/java/com/baeldung/consumermodule/Application.java
rename to core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule2/src/main/java/com/baeldung/consumermodule/Application.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/src/main/java/module-info.java b/core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule2/src/main/java/module-info.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule/src/main/java/module-info.java
rename to core-java-modules/core-java-jpms/decoupling-pattern2/consumermodule2/src/main/java/module-info.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/pom.xml b/core-java-modules/core-java-jpms/decoupling-pattern2/pom.xml
index 91b92b9df5..f1dcccb8af 100644
--- a/core-java-modules/core-java-jpms/decoupling-pattern2/pom.xml
+++ b/core-java-modules/core-java-jpms/decoupling-pattern2/pom.xml
@@ -16,9 +16,9 @@
     </parent>
 
     <modules>
-        <module>servicemodule</module>
+        <module>servicemodule2</module>
         <module>providermodule</module>
-        <module>consumermodule</module>
+        <module>consumermodule2</module>
     </modules>
 
     <build>
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/providermodule/pom.xml b/core-java-modules/core-java-jpms/decoupling-pattern2/providermodule/pom.xml
index 6c0f1956b9..9e8f73cc38 100644
--- a/core-java-modules/core-java-jpms/decoupling-pattern2/providermodule/pom.xml
+++ b/core-java-modules/core-java-jpms/decoupling-pattern2/providermodule/pom.xml
@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>com.baeldung.servicemodule</groupId>
-            <artifactId>servicemodule</artifactId>
+            <artifactId>servicemodule2</artifactId>
             <version>${servicemodule.version}</version>
         </dependency>
     </dependencies>
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule/pom.xml b/core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule2/pom.xml
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule/pom.xml
rename to core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule2/pom.xml
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule/src/main/java/com/baeldung/servicemodule/TextService.java b/core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule2/src/main/java/com/baeldung/servicemodule/TextService.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule/src/main/java/com/baeldung/servicemodule/TextService.java
rename to core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule2/src/main/java/com/baeldung/servicemodule/TextService.java
diff --git a/core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule/src/main/java/module-info.java b/core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule2/src/main/java/module-info.java
similarity index 100%
rename from core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule/src/main/java/module-info.java
rename to core-java-modules/core-java-jpms/decoupling-pattern2/servicemodule2/src/main/java/module-info.java