[BAEL-13314] - Fix formatting of POMs

spring-cloud/spring-cloud-archaius/extra-configs/pom.xml

@@ -37,6 +37,7 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
     <properties>
         <spring-cloud-dependencies.version>2.0.1.RELEASE</spring-cloud-dependencies.version>
     </properties>

spring-cloud/spring-cloud-consul/pom.xml

@@ -29,13 +29,14 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>1.5.10.RELEASE</version>
+            <version>${spring-boot-starter-test.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <properties>
         <spring-cloud-starter-consul.version>1.3.0.RELEASE</spring-cloud-starter-consul.version>
+        <spring-boot-starter-test.version>1.5.10.RELEASE</spring-boot-starter-test.version>
     </properties>
 
 </project>

spring-cloud/spring-cloud-kubernetes-2/client-service/pom.xml

@@ -12,12 +12,6 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <properties>
-        <java.version>1.8</java.version>
-        <spring-cloud-dependencies.version>Finchley.SR2</spring-cloud-dependencies.version>
-        <spring.cloud.k8s.version>1.0.0.RELEASE</spring.cloud.k8s.version>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -93,4 +87,10 @@
         </plugins>
     </build>
 
+    <properties>
+        <java.version>1.8</java.version>
+        <spring-cloud-dependencies.version>Finchley.SR2</spring-cloud-dependencies.version>
+        <spring.cloud.k8s.version>1.0.0.RELEASE</spring.cloud.k8s.version>
+    </properties>
+
 </project>

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

@@ -7,10 +7,11 @@
     <version>1.0-SNAPSHOT</version>
     <name>spring-cloud-kubernetes-2</name>
     <packaging>pom</packaging>
-
-    <properties>
-        <spring-boot.version>2.0.6.RELEASE</spring-boot.version>
-    </properties>
+    	
+    <modules>
+        <module>client-service</module>
+        <module>travel-agency-service</module>
+    </modules>
 
     <dependencyManagement>
         <dependencies>
@@ -23,10 +24,9 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    	
-    <modules>
-        <module>client-service</module>
-        <module>travel-agency-service</module>
-    </modules>
+
+    <properties>
+        <spring-boot.version>2.0.6.RELEASE</spring-boot.version>
+    </properties>
 
 </project>

spring-cloud/spring-cloud-kubernetes-2/travel-agency-service/pom.xml

@@ -10,12 +10,6 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <properties>
-        <java.version>1.8</java.version>
-        <spring-cloud-dependencies.version>Finchley.SR2</spring-cloud-dependencies.version>
-    </properties>
-
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -73,4 +67,9 @@
         </plugins>
     </build>
 
+    <properties>
+        <java.version>1.8</java.version>
+        <spring-cloud-dependencies.version>Finchley.SR2</spring-cloud-dependencies.version>
+    </properties>
+
 </project>