Merge pull request #11920 from freelansam/JAVA-10138

JAVA-10138 - Fix formatting of POMs

spring-cloud/spring-cloud-archaius/zookeeper-config/pom.xml

@@ -45,7 +45,7 @@
     <properties>
         <cloud.zookeeper.version>2.0.0.RELEASE</cloud.zookeeper.version>
         <zookeeper.version>3.4.13</zookeeper.version>
-         <log4j2.version>2.17.1</log4j2.version>
+        <log4j2.version>2.17.1</log4j2.version>
     </properties>
 
 </project>

spring-cloud/spring-cloud-eureka-self-preservation/pom.xml

@@ -14,7 +14,12 @@
         <artifactId>spring-cloud</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
-    
+
+    <modules>
+        <module>spring-cloud-eureka-server</module>
+        <module>spring-cloud-eureka-client</module>
+    </modules>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -27,11 +32,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <modules>
-        <module>spring-cloud-eureka-server</module>
-        <module>spring-cloud-eureka-client</module>
-    </modules>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

spring-cloud/spring-cloud-eureka/pom.xml

@@ -14,7 +14,14 @@
         <artifactId>spring-cloud</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
-    
+
+    <modules>
+        <module>spring-cloud-eureka-server</module>
+        <module>spring-cloud-eureka-client</module>
+        <module>spring-cloud-eureka-feign-client</module>
+        <module>spring-cloud-eureka-feign-client-integration-test</module>
+    </modules>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -27,13 +34,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <modules>
-        <module>spring-cloud-eureka-server</module>
-        <module>spring-cloud-eureka-client</module>
-        <module>spring-cloud-eureka-feign-client</module>
-        <module>spring-cloud-eureka-feign-client-integration-test</module>
-    </modules>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

spring-cloud/spring-cloud-functions/pom.xml

@@ -10,7 +10,7 @@
     <packaging>jar</packaging>
     <description>Demo project for Spring Cloud Function</description>
 
-     <parent>
+    <parent>
         <groupId>com.baeldung.spring.cloud</groupId>
         <artifactId>spring-cloud</artifactId>
         <version>1.0.0-SNAPSHOT</version>

spring-cloud/spring-cloud-gateway/pom.xml

@@ -83,31 +83,28 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
         </dependency>
-
         <!-- Spring security -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-oauth2-client</artifactId>
         </dependency>
-        
     </dependencies>
 
     <build>
         <plugins>
-        <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
-        </configuration>
-      </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
@@ -123,15 +120,6 @@
         </plugins>
     </build>
 
-    <properties>
-<!--         <spring-cloud-dependencies.version>Hoxton.SR3</spring-cloud-dependencies.version> -->
-<!--         <spring-boot.version>2.2.6.RELEASE</spring-boot.version> -->
-        <hibernate-validator.version>6.0.2.Final</hibernate-validator.version>
-        <redis.version>0.7.2</redis.version>
-        <oauth2-oidc-sdk.version>9.19</oauth2-oidc-sdk.version>
-<!--         <junit-bom.version>5.5.2</junit-bom.version> -->
-    </properties>
-    
     <profiles>
         <profile>
             <id>quotes-application</id>
@@ -177,7 +165,6 @@
                 </plugins>
             </build>
         </profile>
-        
         <profile>
             <id>gateway-url-rewrite</id>
             <build>
@@ -192,6 +179,16 @@
                     </plugin>
                 </plugins>
             </build>
-        </profile>        
+        </profile>
     </profiles>
+
+    <properties>
+        <!-- <spring-cloud-dependencies.version>Hoxton.SR3</spring-cloud-dependencies.version> -->
+        <!-- <spring-boot.version>2.2.6.RELEASE</spring-boot.version> -->
+        <hibernate-validator.version>6.0.2.Final</hibernate-validator.version>
+        <redis.version>0.7.2</redis.version>
+        <oauth2-oidc-sdk.version>9.19</oauth2-oidc-sdk.version>
+        <!-- <junit-bom.version>5.5.2</junit-bom.version> -->
+    </properties>
+
 </project>

spring-cloud/spring-cloud-kubernetes/pom.xml

@@ -15,6 +15,15 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
+    <modules>
+        <module>kubernetes-minikube/demo-frontend</module>
+        <module>kubernetes-minikube/demo-backend</module>
+        <module>kubernetes-selfhealing/liveness-example</module>
+        <module>kubernetes-selfhealing/readiness-example</module>
+        <module>kubernetes-guide/client-service</module>
+        <module>kubernetes-guide/travel-agency-service</module>
+    </modules>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -27,15 +36,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <modules>
-        <module>kubernetes-minikube/demo-frontend</module>
-        <module>kubernetes-minikube/demo-backend</module>
-        <module>kubernetes-selfhealing/liveness-example</module>
-        <module>kubernetes-selfhealing/readiness-example</module>
-        <module>kubernetes-guide/client-service</module>
-        <module>kubernetes-guide/travel-agency-service</module>
-    </modules>
-
     <properties>
         <spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
     </properties>

spring-cloud/spring-cloud-load-balancer/pom.xml

@@ -19,7 +19,7 @@
         <module>spring-cloud-loadbalancer-server</module>
         <module>spring-cloud-loadbalancer-client</module>
     </modules>
-    
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -44,7 +44,7 @@
     <properties>
         <spring-boot.version>2.6.1</spring-boot.version>
         <spring-cloud.version>2021.0.0</spring-cloud.version>
-         <log4j2.version>2.17.1</log4j2.version>
+        <log4j2.version>2.17.1</log4j2.version>
     </properties>
 
-</project>
+</project>

spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-client/pom.xml

@@ -3,17 +3,30 @@
     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.springcloud.loadbalancer</groupId>
+    <artifactId>spring-cloud-loadbalancer-client</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-cloud-loadbalancer-client</name>
+    <description>Spring Cloud Load Balancer Demo - Client</description>
+
     <parent>
         <groupId>com.baeldung.spring.cloud</groupId>
         <artifactId>spring-cloud-loadbalancer</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>com.baeldung.springcloud.loadbalancer</groupId>
-    <artifactId>spring-cloud-loadbalancer-client</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-cloud-loadbalancer-client</name>
-    <description>Spring Cloud Load Balancer Demo - Client</description>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -30,17 +43,6 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 
     <build>
         <plugins>
@@ -51,4 +53,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

spring-cloud/spring-cloud-load-balancer/spring-cloud-loadbalancer-server/pom.xml

@@ -3,24 +3,23 @@
     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>
-    <parent>
-        <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>spring-cloud-loadbalancer</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
     <groupId>com.baeldung.spring.cloud.loadbalancer</groupId>
     <artifactId>spring-cloud-loadbalancer-server</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>spring-cloud-loadbalancer-server</name>
     <description>Spring Cloud Load Balancer Demo - Server</description>
 
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-loadbalancer</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -37,4 +36,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml

@@ -52,7 +52,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    
+
     <properties>
         <log4j2.version>2.17.1</log4j2.version>
     </properties>

spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml

@@ -52,7 +52,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    
+
     <properties>
         <log4j2.version>2.17.1</log4j2.version>
     </properties>

spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml

@@ -60,8 +60,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    
-     <properties>
+
+    <properties>
         <log4j2.version>2.17.1</log4j2.version>
     </properties>
 

spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml

@@ -13,7 +13,7 @@
         <artifactId>spring-cloud-zuul</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    
+
     <dependencyManagement>
         <dependencies>
             <dependency>