JAVA-7783: POM properties cleanup

kwoyke · kwoyke · commit 0ab9e2e4f277 · 2021-11-16T15:10:49.000+01:00
diff --git a/core-java-modules/core-java-11-2/pom.xml b/core-java-modules/core-java-11-2/pom.xml
@@ -89,7 +89,6 @@
         <guava.version>29.0-jre</guava.version>
         <assertj.version>3.17.2</assertj.version>
         <mockserver.version>5.11.1</mockserver.version>
-        <commons-lang3.version>3.12.0</commons-lang3.version>
         <jakarta.ws-api.version>3.0.0</jakarta.ws-api.version>
         <jaxws-rt.version>3.0.0</jaxws-rt.version>
         <jaxws-ri.version>2.3.1</jaxws-ri.version>
diff --git a/core-java-modules/core-java-12/pom.xml b/core-java-modules/core-java-12/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
+            <version>${commons-io.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/core-java-modules/core-java-16/pom.xml b/core-java-modules/core-java-16/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>${commons-lang3.version}</version>
         </dependency>
     </dependencies>
 
@@ -66,7 +66,6 @@
         <maven.compiler.source.version>16</maven.compiler.source.version>
         <maven.compiler.target.version>16</maven.compiler.target.version>
         <maven.compiler.release>16</maven.compiler.release>
-        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <surefire.plugin.version>3.0.0-M5</surefire.plugin.version>
         <assertj.version>3.17.2</assertj.version>
     </properties>
diff --git a/core-java-modules/core-java-17/pom.xml b/core-java-modules/core-java-17/pom.xml
@@ -62,7 +62,6 @@
         <maven.compiler.source.version>17</maven.compiler.source.version>
         <maven.compiler.target.version>17</maven.compiler.target.version>
         <maven.compiler.release>17</maven.compiler.release>
-        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <surefire.plugin.version>3.0.0-M5</surefire.plugin.version>
         <assertj.version>3.17.2</assertj.version>
     </properties>
diff --git a/core-java-modules/core-java-9/pom.xml b/core-java-modules/core-java-9/pom.xml
@@ -85,7 +85,6 @@
         <maven.compiler.target>1.9</maven.compiler.target>
         <guava.version>25.1-jre</guava.version>
         <commons-collections4.version>4.1</commons-collections4.version>
-        <commons-collections3.version>3.2.2</commons-collections3.version>
     </properties>
 
 </project>
diff --git a/core-java-modules/core-java-annotations/pom.xml b/core-java-modules/core-java-annotations/pom.xml
@@ -23,10 +23,6 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <assertj-core.version>3.10.0</assertj-core.version>
-    </properties>
-
     <build>
         <finalName>core-java-annotations</finalName>
         <resources>
@@ -36,5 +32,9 @@
             </resource>
         </resources>
     </build>
+    
+    <properties>
+        <assertj-core.version>3.10.0</assertj-core.version>
+    </properties>
 
 </project>
diff --git a/core-java-modules/core-java-arrays-guides/pom.xml b/core-java-modules/core-java-arrays-guides/pom.xml
@@ -27,9 +27,13 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.19.0</version>
+            <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
+    <properties>
+        <assertj.version>3.19.0</assertj.version>
+    </properties>
+
 </project>
diff --git a/core-java-modules/core-java-date-operations-1/pom.xml b/core-java-modules/core-java-date-operations-1/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>com.darwinsys</groupId>
             <artifactId>hirondelle-date4j</artifactId>
-            <version>RELEASE</version>
+            <version>${hirondelle-date4j.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -64,6 +64,7 @@
         <joda-time.version>2.10</joda-time.version>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
+        <hirondelle-date4j.version>RELEASE</hirondelle-date4j.version>
         <maven.compiler.source>1.9</maven.compiler.source>
         <maven.compiler.target>1.9</maven.compiler.target>
     </properties>
diff --git a/core-java-modules/core-java-datetime-string/pom.xml b/core-java-modules/core-java-datetime-string/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.darwinsys</groupId>
             <artifactId>hirondelle-date4j</artifactId>
-            <version>RELEASE</version>
+            <version>${hirondelle-date4j.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -75,6 +75,7 @@
     <properties>
         <commons-validator.version>1.6</commons-validator.version>
         <joda-time.version>2.10.10</joda-time.version>
+        <hirondelle-date4j.version>RELEASE</hirondelle-date4j.version>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
         <maven.compiler.source>1.9</maven.compiler.source>
diff --git a/core-java-modules/core-java-exceptions-2/pom.xml b/core-java-modules/core-java-exceptions-2/pom.xml
@@ -25,12 +25,11 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>${commons.lang3.version}</version>
+            <version>${commons-lang3.version}</version>
         </dependency>
     </dependencies>
 
     <properties>
-        <commons.lang3.version>3.10</commons.lang3.version>
         <!-- testing -->
         <assertj-core.version>3.10.0</assertj-core.version>
     </properties>
diff --git a/core-java-modules/core-java-exceptions-3/pom.xml b/core-java-modules/core-java-exceptions-3/pom.xml
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.191</version>
+            <version>${h2.version}</version>
             <scope>test</scope>
         </dependency>
         <!-- test scoped -->
@@ -34,6 +34,7 @@
     <properties>
         <!-- testing -->
         <assertj-core.version>3.10.0</assertj-core.version>
+        <h2.version>1.4.191</h2.version>
     </properties>
 
 </project>
diff --git a/core-java-modules/core-java-exceptions/pom.xml b/core-java-modules/core-java-exceptions/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>${commons.lang3.version}</version>
+            <version>${commons-lang3.version}</version>
         </dependency>
         <!-- test scoped -->
         <dependency>
@@ -43,7 +43,6 @@
 
     <properties>
         <javax.mail.version>1.5.0-b01</javax.mail.version>
-        <commons.lang3.version>3.10</commons.lang3.version>
         <!-- testing -->
         <assertj-core.version>3.10.0</assertj-core.version>
     </properties>
diff --git a/core-java-modules/core-java-jndi/pom.xml b/core-java-modules/core-java-jndi/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.21.0</version>
+            <version>${assertj-core.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -71,6 +71,7 @@
     <properties>
         <spring.version>5.0.9.RELEASE</spring.version>
         <h2.version>1.4.199</h2.version>
+        <assertj-core.version>3.21.0</assertj-core.version>
         <apacheds.version>2.0.0.AM26</apacheds.version>
         <source.version>1.8</source.version>
         <target.version>1.8</target.version>
diff --git a/core-java-modules/core-java-jpms/pom.xml b/core-java-modules/core-java-jpms/pom.xml
@@ -25,7 +25,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${compiler.plugin.version}</version>
+                    <version>${maven-compiler-plugin.version}</version>
                     <configuration>
                         <source>${source.version}</source>
                         <target>${target.version}</target>
@@ -36,7 +36,6 @@
     </build>
 
     <properties>
-        <compiler.plugin.version>3.8.0</compiler.plugin.version>
         <source.version>11</source.version>
         <target.version>11</target.version>
     </properties>
diff --git a/core-java-modules/core-java-lang-oop-methods/pom.xml b/core-java-modules/core-java-lang-oop-methods/pom.xml
@@ -40,7 +40,6 @@
 
     <properties>
         <lombok.version>1.18.12</lombok.version>
-        <commons-lang.version>2.6</commons-lang.version>
         <assertj-core.version>3.10.0</assertj-core.version>
         <equalsverifier.version>3.0.3</equalsverifier.version>
     </properties>
diff --git a/core-java-modules/core-java-networking-3/pom.xml b/core-java-modules/core-java-networking-3/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>javax.mail</artifactId>
-            <version>1.6.2</version>
+            <version>${javax.mail.version}</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.github.seancfoley/ipaddress -->
         <dependency>
@@ -80,6 +80,7 @@
         <seancfoley.ipaddress.version>5.3.3</seancfoley.ipaddress.version>
         <jgonian.commons-ip-math.version>1.32</jgonian.commons-ip-math.version>
         <googlecode.ipv6.version>0.17</googlecode.ipv6.version>
+        <javax.mail.version>1.6.2</javax.mail.version>
     </properties>
 
 </project>
diff --git a/core-java-modules/core-java-nio-2/pom.xml b/core-java-modules/core-java-nio-2/pom.xml
@@ -18,9 +18,13 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.6.1</version>
+            <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
+    <properties>
+        <assertj.version>3.6.1</assertj.version>
+    </properties>
+
 </project>
diff --git a/core-java-modules/core-java-reflection-2/pom.xml b/core-java-modules/core-java-reflection-2/pom.xml
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
-            <version>0.9.12</version>
+            <version>${reflections.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>30.1.1-jre</version>
+            <version>${guava.version}</version>
         </dependency>
     </dependencies>
 
@@ -56,7 +56,8 @@
     </build>
 
     <properties>
-        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+        <reflections.version>0.9.12</reflections.version>
+        <guava.version>30.1.1-jre</guava.version>
         <source.version>1.8</source.version>
         <target.version>1.8</target.version>
         <spring.version>5.3.4</spring.version>
diff --git a/core-java-modules/core-java-reflection/pom.xml b/core-java-modules/core-java-reflection/pom.xml
@@ -45,7 +45,6 @@
     </build>
 
     <properties>
-        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
         <assertj-core.version>3.10.0</assertj-core.version>
         <source.version>1.8</source.version>
         <target.version>1.8</target.version>
diff --git a/core-java-modules/core-java-serialization/pom.xml b/core-java-modules/core-java-serialization/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>4.3.20.RELEASE</version>
+            <version>${spring.core.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/core-java-modules/core-java-streams-3/pom.xml b/core-java-modules/core-java-streams-3/pom.xml
@@ -65,7 +65,7 @@
                         <path>
                             <groupId>org.openjdk.jmh</groupId>
                             <artifactId>jmh-generator-annprocess</artifactId>
-                            <version>${jmh.version}</version>
+                            <version>${jmh-generator.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>
@@ -77,7 +77,6 @@
         <lombok.version>1.18.20</lombok.version>
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
-        <jmh.version>1.29</jmh.version>
     </properties>
 
 </project>
diff --git a/core-java-modules/core-java-string-conversions-2/pom.xml b/core-java-modules/core-java-string-conversions-2/pom.xml
@@ -49,13 +49,6 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <icu.version>64.2</icu.version>
-        <assertj.version>3.12.2</assertj.version>
-        <commons-text.version>1.9</commons-text.version>
-        <guava.version>30.1.1-jre</guava.version>
-    </properties>
-
     <build>
         <finalName>core-java-string-conversions-2</finalName>
         <resources>
@@ -65,5 +58,12 @@
             </resource>
         </resources>
     </build>
+    
+    <properties>
+        <icu.version>64.2</icu.version>
+        <assertj.version>3.12.2</assertj.version>
+        <commons-text.version>1.9</commons-text.version>
+        <guava.version>30.1.1-jre</guava.version>
+    </properties>
 
 </project>
diff --git a/spring-security-modules/spring-security-web-mvc-custom/pom.xml b/spring-security-modules/spring-security-web-mvc-custom/pom.xml
@@ -97,12 +97,6 @@
             <version>${jstl.version}</version>
             <scope>runtime</scope>
         </dependency>
-        <!-- ops -->
-        <!-- <dependency> -->
-        <!-- <groupId>com.codahale.metrics</groupId> -->
-        <!-- <artifactId>metrics-core</artifactId> -->
-        <!-- <version>3.0.1</version> -->
-        <!-- </dependency> -->
         <!-- util -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/spring-security-modules/spring-security-web-persistent-login/pom.xml b/spring-security-modules/spring-security-web-persistent-login/pom.xml
@@ -127,12 +127,6 @@
             <version>${spring-boot.version}</version>
             <scope>test</scope>
         </dependency>
-        <!-- ops -->
-        <!-- <dependency> -->
-        <!-- <groupId>com.codahale.metrics</groupId> -->
-        <!-- <artifactId>metrics-core</artifactId> -->
-        <!-- <version>3.0.1</version> -->
-        <!-- </dependency> -->
     </dependencies>
 
     <build>
diff --git a/spring-security-modules/spring-security-web-rest-basic-auth/pom.xml b/spring-security-modules/spring-security-web-rest-basic-auth/pom.xml
@@ -91,17 +91,6 @@
             <version>${jackson.version}</version>
         </dependency>
         <!-- http -->
-        <!-- <dependency> -->
-        <!-- <groupId>org.apache.httpcomponents</groupId> -->
-        <!-- <artifactId>fluent-hc</artifactId> -->
-        <!-- <version>4.2.5</version> -->
-        <!-- <exclusions> -->
-        <!-- <exclusion> -->
-        <!-- <artifactId>commons-logging</artifactId> -->
-        <!-- <groupId>commons-logging</groupId> -->
-        <!-- </exclusion> -->
-        <!-- </exclusions> -->
-        <!-- </dependency> -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
diff --git a/spring-security-modules/spring-security-web-thymeleaf/pom.xml b/spring-security-modules/spring-security-web-thymeleaf/pom.xml
@@ -45,13 +45,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/spring-vertx/pom.xml b/spring-vertx/pom.xml
diff --git a/spring-webflux-amqp/pom.xml b/spring-webflux-amqp/pom.xml
diff --git a/spring-webflux-threads/pom.xml b/spring-webflux-threads/pom.xml
