Merge pull request #10584 from kwoyke/JAVA-3295

JAVA-3295: POM Properties Cleanup

spring-boot-modules/spring-boot-autoconfiguration/pom.xml

@@ -48,7 +48,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
-            <version>2.1.6.RELEASE</version>
             <optional>true</optional>
         </dependency>
 

spring-boot-modules/spring-boot-bootstrap/pom.xml

@@ -167,7 +167,7 @@
                     <dependency>
                         <groupId>org.springframework.cloud</groupId>
                         <artifactId>spring-cloud-dependencies</artifactId>
-                        <version>Greenwich.RELEASE</version>
+                        <version>${spring-cloud.version}</version>
                         <type>pom</type>
                         <scope>import</scope>
                     </dependency>
@@ -177,12 +177,12 @@
                 <dependency>
                     <groupId>org.springframework.cloud</groupId>
                     <artifactId>spring-cloud-gcp-starter</artifactId>
-                    <version>1.0.0.RELEASE</version>
+                    <version>${spring-cloud-gcp.version}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.springframework.cloud</groupId>
                     <artifactId>spring-cloud-gcp-starter-sql-mysql</artifactId>
-                    <version>1.0.0.RELEASE</version>
+                    <version>${spring-cloud-gcp.version}</version>
                 </dependency>
             </dependencies>
             <build>
@@ -215,7 +215,7 @@
                     <dependency>
                         <groupId>org.springframework.cloud</groupId>
                         <artifactId>spring-cloud-dependencies</artifactId>
-                        <version>Greenwich.RELEASE</version>
+                        <version>${spring-cloud.version}</version>
                         <type>pom</type>
                         <scope>import</scope>
                     </dependency>
@@ -332,6 +332,8 @@
 
     <properties>
         <servlet.version>4.0.0</servlet.version>
+        <spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
+        <spring-cloud-gcp.version>1.0.0.RELEASE</spring-cloud-gcp.version>
     </properties>
 
 </project>

spring-boot-modules/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/pom.xml

@@ -62,7 +62,6 @@
     </build>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
         <greeter.version>0.0.1-SNAPSHOT</greeter.version>
     </properties>

spring-boot-modules/spring-boot-custom-starter/greeter-spring-boot-starter/pom.xml

@@ -49,7 +49,6 @@
     </build>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <greeter.version>0.0.1-SNAPSHOT</greeter.version>
         <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
     </properties>

spring-boot-modules/spring-boot-parent/spring-boot-with-custom-parent/pom.xml

@@ -23,8 +23,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
-
 </project>

spring-boot-modules/spring-boot-parent/spring-boot-with-starter-parent/pom.xml

@@ -39,7 +39,6 @@
     </dependencies>
 
     <properties>
-        <java.version>1.8</java.version>
         <spring-boot-starter-data-jpa.version>2.2.5.RELEASE</spring-boot-starter-data-jpa.version>
     </properties>
 </project>

spring-boot-modules/spring-boot-properties-3/pom.xml

@@ -14,9 +14,6 @@
     <name>spring-boot-properties-3</name>
     <description>Spring Boot Properties Module</description>
 
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

spring-boot-modules/spring-boot-properties/pom.xml

@@ -134,7 +134,6 @@
     </repositories>
 
     <properties>
-        <java.version>1.8</java.version>
         <spring-cloud.version>2020.0.0-M5</spring-cloud.version>
         <commons-configuration.version>1.10</commons-configuration.version>
         <guava.version>20.0</guava.version>

spring-boot-modules/spring-boot-security/pom.xml

@@ -71,7 +71,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
-<!--            <version>2.1.1.RELEASE</version>-->
         </dependency>
     </dependencies>
 

spring-boot-modules/spring-boot-springdoc/pom.xml

@@ -169,7 +169,6 @@
     </build>
 
     <properties>
-        <java.version>1.8</java.version>
         <hibernate.version>5.2.10.Final</hibernate.version>
         <springdoc.version>1.5.2</springdoc.version>
         <asciidoctor-plugin.version>1.5.6</asciidoctor-plugin.version>

spring-boot-modules/spring-boot-swagger-jwt/pom.xml

@@ -25,7 +25,7 @@
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-boot-starter</artifactId>
-            <version>3.0.0</version>
+            <version>${springfox.version}</version>
         </dependency>
     </dependencies>
 
@@ -38,4 +38,8 @@
         </plugins>
     </build>
 
+    <properties>
+        <springfox.version>3.0.0</springfox.version>
+    </properties>
+
 </project>

spring-boot-modules/spring-boot-swagger/pom.xml

@@ -25,7 +25,7 @@
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-boot-starter</artifactId>
-            <version>3.0.0</version>
+            <version>${springfox.version}</version>
         </dependency>
     </dependencies>
 
@@ -38,4 +38,8 @@
         </plugins>
     </build>
 
+    <properties>
+        <springfox.version>3.0.0</springfox.version>
+    </properties>
+
 </project>