From d28cef4ee8da9cc9548e864005f98e600c3d00b8 Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.aws@gmail.com>
Date: Thu, 17 Mar 2022 22:06:38 +0530
Subject: [PATCH] JAVA-10132: Align module names, folder names and artifact id

---
 jakarta-ee/pom.xml                            |  47 ++++++++----------
 persistence-modules/fauna/pom.xml             |  26 ++++++----
 spring-cloud/pom.xml                          |   2 +-
 .../README.md                                 |   0
 .../pom.xml                                   |   0
 .../.gitignore                                |   0
 .../.mvn/wrapper/MavenWrapperDownloader.java  |   0
 .../.mvn/wrapper/maven-wrapper.jar            | Bin
 .../.mvn/wrapper/maven-wrapper.properties     |   0
 .../spring-cloud-loadbalancer-client/mvnw     |   0
 .../spring-cloud-loadbalancer-client/mvnw.cmd |   0
 .../spring-cloud-loadbalancer-client/pom.xml  |   0
 .../client/ClientApplication.java             |   0
 .../src/main/resources/application.properties |   0
 .../.gitignore                                |   0
 .../.mvn/wrapper/MavenWrapperDownloader.java  |   0
 .../.mvn/wrapper/maven-wrapper.jar            | Bin
 .../.mvn/wrapper/maven-wrapper.properties     |   0
 .../spring-cloud-loadbalancer-server/mvnw     |   0
 .../spring-cloud-loadbalancer-server/mvnw.cmd |   0
 .../spring-cloud-loadbalancer-server/pom.xml  |   0
 .../server/ServerApplication.java             |   0
 .../src/main/resources/application.properties |   0
 23 files changed, 38 insertions(+), 37 deletions(-)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/README.md (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/pom.xml (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/spring-cloud-loadbalancer-client/.gitignore (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/spring-cloud-loadbalancer-client/.mvn/wrapper/MavenWrapperDownloader.java (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.jar (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.properties (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/spring-cloud-loadbalancer-client/mvnw (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/spring-cloud-loadbalancer-client/mvnw.cmd (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/spring-cloud-loadbalancer-client/pom.xml (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/spring-cloud-loadbalancer-client/src/main/java/com/baeldung/spring/cloud/loadbalancer/client/ClientApplication.java (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/spring-cloud-loadbalancer-client/src/main/resources/application.properties (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/spring-cloud-loadbalancer-server/.gitignore (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/spring-cloud-loadbalancer-server/.mvn/wrapper/MavenWrapperDownloader.java (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.jar (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.properties (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/spring-cloud-loadbalancer-server/mvnw (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/spring-cloud-loadbalancer-server/mvnw.cmd (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/spring-cloud-loadbalancer-server/pom.xml (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/spring-cloud-loadbalancer-server/src/main/java/com/baeldung/spring/cloud/loadbalancer/server/ServerApplication.java (100%)
 rename spring-cloud/{spring-cloud-load-balancer => spring-cloud-loadbalancer}/spring-cloud-loadbalancer-server/src/main/resources/application.properties (100%)

diff --git a/jakarta-ee/pom.xml b/jakarta-ee/pom.xml
index 074ca1eec8..dea4437345 100644
--- a/jakarta-ee/pom.xml
+++ b/jakarta-ee/pom.xml
@@ -1,28 +1,13 @@
-<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">
+<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>mvc-2.0</artifactId>
+    <artifactId>jakarta-ee</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <name>jakarta-ee</name>
     <packaging>war</packaging>
 
-    <name>mvc-2.0</name>
-
-    <properties>
-        <jakartaee-api.version>9.0.0</jakartaee-api.version>
-        <krazo.version>2.0.0</krazo.version>
-        <jakarta.mvc-api.version>2.0.0</jakarta.mvc-api.version>
-        <junit.jupiter.version>5.8.2</junit.jupiter.version>
-        <local.glassfish.home>C:/glassfish6</local.glassfish.home>
-        <local.glassfish.user>admin</local.glassfish.user>
-        <local.glassfish.domain>mvn-domain</local.glassfish.domain>
-        <mockito.version>1.10.19</mockito.version>
-        <local.glassfish.passfile>
-            ${local.glassfish.home}\\domains\\${local.glassfish.domain}\\config\\domain-passwords
-        </local.glassfish.passfile>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>jakarta.platform</groupId>
@@ -30,13 +15,11 @@
             <version>${jakartaee-api.version}</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>jakarta.mvc</groupId>
             <artifactId>jakarta.mvc-api</artifactId>
             <version>${jakarta.mvc-api.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.eclipse.krazo</groupId>
             <artifactId>krazo-jersey</artifactId>
@@ -54,7 +37,6 @@
             <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -67,7 +49,7 @@
                 <configuration>
                     <glassfishDirectory>${local.glassfish.home}</glassfishDirectory>
                     <user>admin</user>
-                    <!-- <passwordFile>${local.glassfish.passfile}</passwordFile>-->
+                    <!-- <passwordFile>${local.glassfish.passfile}</passwordFile> -->
                     <adminPassword>password</adminPassword>
 
                     <domain>
@@ -108,4 +90,19 @@
             </plugin>
         </plugins>
     </build>
-</project>
+
+    <properties>
+        <jakartaee-api.version>9.0.0</jakartaee-api.version>
+        <krazo.version>2.0.0</krazo.version>
+        <jakarta.mvc-api.version>2.0.0</jakarta.mvc-api.version>
+        <junit.jupiter.version>5.8.2</junit.jupiter.version>
+        <local.glassfish.home>C:/glassfish6</local.glassfish.home>
+        <local.glassfish.user>admin</local.glassfish.user>
+        <local.glassfish.domain>mvn-domain</local.glassfish.domain>
+        <mockito.version>1.10.19</mockito.version>
+        <local.glassfish.passfile>
+            ${local.glassfish.home}\\domains\\${local.glassfish.domain}\\config\\domain-passwords
+        </local.glassfish.passfile>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/persistence-modules/fauna/pom.xml b/persistence-modules/fauna/pom.xml
index 67aabb7501..ff18865e5f 100644
--- a/persistence-modules/fauna/pom.xml
+++ b/persistence-modules/fauna/pom.xml
@@ -1,21 +1,21 @@
 <?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"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>fauna</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>fauna</name>
+    <description>Blogging Service built with FaunaDB</description>
+
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.6.2</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <relativePath /> <!-- lookup parent from repository -->
     </parent>
-    <groupId>com.baeldung</groupId>
-    <artifactId>fauna-blog</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>fauna-blog</name>
-    <description>Blogging Service built with FaunaDB</description>
-    <properties>
-        <java.version>17</java.version>
-    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -53,4 +53,8 @@
         </plugins>
     </build>
 
-</project>
+    <properties>
+        <java.version>17</java.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml
index 75010fbd34..c5ebb4116a 100644
--- a/spring-cloud/pom.xml
+++ b/spring-cloud/pom.xml
@@ -17,7 +17,7 @@
     </parent>
 
     <modules>
-        <module>spring-cloud-load-balancer</module>
+        <module>spring-cloud-loadbalancer</module>
         <module>spring-cloud-config</module>
         <module>spring-cloud-eureka</module>
         <module>spring-cloud-hystrix</module>
diff --git a/spring-cloud/spring-cloud-load-balancer/README.md b/spring-cloud/spring-cloud-loadbalancer/README.md
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/README.md
rename to spring-cloud/spring-cloud-loadbalancer/README.md
diff --git a/spring-cloud/spring-cloud-load-balancer/pom.xml b/spring-cloud/spring-cloud-loadbalancer/pom.xml
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/pom.xml
rename to spring-cloud/spring-cloud-loadbalancer/pom.xml
diff --git a/spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/.gitignore b/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.gitignore
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/.gitignore
rename to spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.gitignore
diff --git a/spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/.mvn/wrapper/MavenWrapperDownloader.java b/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/MavenWrapperDownloader.java
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/.mvn/wrapper/MavenWrapperDownloader.java
rename to spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.jar b/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.jar
rename to spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.jar
diff --git a/spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.properties b/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.properties
rename to spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.properties
diff --git a/spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/mvnw b/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/mvnw
rename to spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw
diff --git a/spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/mvnw.cmd b/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw.cmd
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/mvnw.cmd
rename to spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw.cmd
diff --git a/spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/pom.xml b/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/pom.xml
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/pom.xml
rename to spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/pom.xml
diff --git a/spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/src/main/java/com/baeldung/spring/cloud/loadbalancer/client/ClientApplication.java b/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/java/com/baeldung/spring/cloud/loadbalancer/client/ClientApplication.java
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/src/main/java/com/baeldung/spring/cloud/loadbalancer/client/ClientApplication.java
rename to spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/java/com/baeldung/spring/cloud/loadbalancer/client/ClientApplication.java
diff --git a/spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/src/main/resources/application.properties b/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/resources/application.properties
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/src/main/resources/application.properties
rename to spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/resources/application.properties
diff --git a/spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/.gitignore b/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.gitignore
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/.gitignore
rename to spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.gitignore
diff --git a/spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/.mvn/wrapper/MavenWrapperDownloader.java b/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/MavenWrapperDownloader.java
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/.mvn/wrapper/MavenWrapperDownloader.java
rename to spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.jar b/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.jar
rename to spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.jar
diff --git a/spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.properties b/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.properties
rename to spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.properties
diff --git a/spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/mvnw b/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/mvnw
rename to spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw
diff --git a/spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/mvnw.cmd b/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw.cmd
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/mvnw.cmd
rename to spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw.cmd
diff --git a/spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/pom.xml b/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/pom.xml
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/pom.xml
rename to spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/pom.xml
diff --git a/spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/src/main/java/com/baeldung/spring/cloud/loadbalancer/server/ServerApplication.java b/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/java/com/baeldung/spring/cloud/loadbalancer/server/ServerApplication.java
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/src/main/java/com/baeldung/spring/cloud/loadbalancer/server/ServerApplication.java
rename to spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/java/com/baeldung/spring/cloud/loadbalancer/server/ServerApplication.java
diff --git a/spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/src/main/resources/application.properties b/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/resources/application.properties
similarity index 100%
rename from spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/src/main/resources/application.properties
rename to spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/resources/application.properties