Merge pull request eugenp#11517 from kwoyke/JAVA-8709

lor6 · web-flow · commit ec85ef689f29 · 2021-11-29T12:10:15.000+02:00
JAVA-8709: Extract commons-collections4.version property to the main …
diff --git a/algorithms-miscellaneous-3/pom.xml b/algorithms-miscellaneous-3/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>${commons.lang3.version}</version>
+            <version>${commons-lang3.version}</version>
         </dependency>
         <dependency>
             <groupId>pl.pragmatists</groupId>
@@ -63,10 +63,8 @@
     </dependencies>
 
     <properties>
-        <commons-collections4.version>4.3</commons-collections4.version>
         <guava.version>28.0-jre</guava.version>
         <retrofit.version>2.6.0</retrofit.version>
-        <commons.lang3.version>3.8.1</commons.lang3.version>
         <JUnitParams.version>1.1.0</JUnitParams.version>
     </properties>
 
diff --git a/core-java-modules/core-java-10/pom.xml b/core-java-modules/core-java-10/pom.xml
@@ -39,7 +39,6 @@
     <properties>
         <maven.compiler.source.version>10</maven.compiler.source.version>
         <maven.compiler.target.version>10</maven.compiler.target.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
     </properties>
 
 </project>
diff --git a/core-java-modules/core-java-8/pom.xml b/core-java-modules/core-java-8/pom.xml
@@ -43,9 +43,4 @@
         </resources>
     </build>
 
-    <properties>
-        <!-- util -->
-        <commons-collections4.version>4.1</commons-collections4.version>
-    </properties>
-
 </project>
diff --git a/core-java-modules/core-java-9/pom.xml b/core-java-modules/core-java-9/pom.xml
@@ -76,7 +76,6 @@
         <maven.compiler.source>1.9</maven.compiler.source>
         <maven.compiler.target>1.9</maven.compiler.target>
         <guava.version>25.1-jre</guava.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
     </properties>
 
 </project>
diff --git a/core-java-modules/core-java-collections-2/pom.xml b/core-java-modules/core-java-collections-2/pom.xml
@@ -44,7 +44,6 @@
 
     <properties>
         <eclipse.collections.version>7.1.0</eclipse.collections.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
         <commons-exec.version>1.3</commons-exec.version>
     </properties>
 
diff --git a/core-java-modules/core-java-collections-array-list/pom.xml b/core-java-modules/core-java-collections-array-list/pom.xml
@@ -22,8 +22,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <commons-collections4.version>4.1</commons-collections4.version>
-    </properties>
-
 </project>
diff --git a/core-java-modules/core-java-collections-list-2/pom.xml b/core-java-modules/core-java-collections-list-2/pom.xml
@@ -28,8 +28,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <commons-collections4.version>4.1</commons-collections4.version>
-    </properties>
-
 </project>
diff --git a/core-java-modules/core-java-collections-list-3/pom.xml b/core-java-modules/core-java-collections-list-3/pom.xml
@@ -54,7 +54,6 @@
     </dependencies>
 
     <properties>
-        <commons-collections4.version>4.1</commons-collections4.version>
         <trove4j.version>3.0.2</trove4j.version>
         <fastutil.version>8.1.0</fastutil.version>
         <colt.version>1.2.0</colt.version>
diff --git a/core-java-modules/core-java-collections-list/pom.xml b/core-java-modules/core-java-collections-list/pom.xml
@@ -27,8 +27,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <commons-collections4.version>4.1</commons-collections4.version>
-    </properties>
-
 </project>
diff --git a/core-java-modules/core-java-collections-maps-2/pom.xml b/core-java-modules/core-java-collections-maps-2/pom.xml
@@ -55,7 +55,6 @@
 
     <properties>
         <streamex.version>0.6.5</streamex.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
         <avaitility.version>1.7.0</avaitility.version>
         <eclipse-collections.version>8.2.0</eclipse-collections.version>
         <hppc.version>0.7.2</hppc.version>
diff --git a/core-java-modules/core-java-collections-maps/pom.xml b/core-java-modules/core-java-collections-maps/pom.xml
@@ -22,8 +22,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <commons-collections4.version>4.1</commons-collections4.version>
-    </properties>
-
 </project>
diff --git a/core-java-modules/core-java-collections-set/pom.xml b/core-java-modules/core-java-collections-set/pom.xml
@@ -49,7 +49,6 @@
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
-        <commons-collections4.version>4.3</commons-collections4.version>
         <gson.version>2.8.5</gson.version>
     </properties>
 
diff --git a/core-java-modules/core-java-concurrency-advanced/pom.xml b/core-java-modules/core-java-concurrency-advanced/pom.xml
@@ -56,7 +56,6 @@
     <properties>
         <guava.version>21.0</guava.version>
         <commons-math3.version>3.6.1</commons-math3.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
         <collections-generic.version>4.01</collections-generic.version>
         <avaitility.version>1.7.0</avaitility.version>
     </properties>
diff --git a/core-java-modules/core-java-os/pom.xml b/core-java-modules/core-java-os/pom.xml
@@ -75,7 +75,6 @@
     </build>
 
     <properties>
-        <commons-collections4.version>4.1</commons-collections4.version>
         <collections-generic.version>4.01</collections-generic.version>
         <asspectj.version>1.8.9</asspectj.version>
         <maven.compiler.source>1.9</maven.compiler.source>
diff --git a/gson/pom.xml b/gson/pom.xml
@@ -61,10 +61,7 @@
     </build>
 
     <properties>
-        <!-- marshalling -->
         <gson.version>2.8.0</gson.version>
-        <!-- util -->
-        <commons-collections4.version>4.1</commons-collections4.version>
         <joda-time.version>2.9.6</joda-time.version>
     </properties>
 
diff --git a/guava-modules/guava-collections-list/pom.xml b/guava-modules/guava-collections-list/pom.xml
@@ -45,9 +45,6 @@
     </build>
 
     <properties>
-        <!-- util -->
-        <commons-collections4.version>4.1</commons-collections4.version>
-        <!-- testing -->
         <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
     </properties>
 
diff --git a/guava-modules/guava-collections/pom.xml b/guava-modules/guava-collections/pom.xml
@@ -50,10 +50,7 @@
     </build>
 
     <properties>
-        <!-- util -->
-        <commons-collections4.version>4.1</commons-collections4.version>
         <jool.version>0.9.12</jool.version>
-        <!-- testing -->
         <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
     </properties>
 
diff --git a/java-collections-conversions/pom.xml b/java-collections-conversions/pom.xml
@@ -38,8 +38,4 @@
         </resources>
     </build>
 
-    <properties>
-        <commons-collections4.version>4.4</commons-collections4.version>
-    </properties>
-
 </project>
diff --git a/java-collections-maps-3/pom.xml b/java-collections-maps-3/pom.xml
@@ -30,7 +30,6 @@
     </dependencies>
 
     <properties>
-        <commons-collections4.version>4.1</commons-collections4.version>
         <spring.version>5.2.5.RELEASE</spring.version>
     </properties>
 
diff --git a/json/pom.xml b/json/pom.xml
@@ -74,7 +74,6 @@
         <everit.json.schema.version>1.4.1</everit.json.schema.version>
         <fastjson.version>1.2.21</fastjson.version>
         <jsonb-api.version>1.0</jsonb-api.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
         <yasson.version>1.0.1</yasson.version>
         <json.version>20171018</json.version>
         <gson.version>2.8.5</gson.version>
diff --git a/libraries-6/pom.xml b/libraries-6/pom.xml
@@ -146,7 +146,6 @@
         <renjin.version>3.5-beta72</renjin.version>
         <rcaller.version>3.0</rcaller.version>
         <rserve.version>1.8.1</rserve.version>
-        <commons-collections4.version>4.4</commons-collections4.version>
         <libphonenumber.version>8.12.9</libphonenumber.version>
         <org.modelmapper.version>2.4.4</org.modelmapper.version>
     </properties>
diff --git a/libraries-apache-commons-collections/pom.xml b/libraries-apache-commons-collections/pom.xml
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
-            <version>${commons.collections.version}</version>
+            <version>${commons-collections4.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
@@ -27,7 +27,6 @@
     </dependencies>
 
     <properties>
-        <commons.collections.version>4.1</commons.collections.version>
         <org.hamcrest.java-hamcrest.version>2.0.0.0</org.hamcrest.java-hamcrest.version>
     </properties>
 
diff --git a/pom.xml b/pom.xml
@@ -1433,6 +1433,7 @@
         <jmh-core.version>1.33</jmh-core.version>
         <jmh-generator.version>1.33</jmh-generator.version>
         <maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
+        <commons-collections4.version>4.4</commons-collections4.version>
         <commons-io.version>2.11.0</commons-io.version>
         <commons-lang.version>2.6</commons-lang.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
diff --git a/spring-5-reactive-client/pom.xml b/spring-5-reactive-client/pom.xml
@@ -153,7 +153,6 @@
         <johnzon.version>1.1.3</johnzon.version>
         <jsonb-api.version>1.0</jsonb-api.version>
         <geronimo-json_1.1_spec.version>1.0</geronimo-json_1.1_spec.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
         <jetty-reactive-httpclient.version>1.1.6</jetty-reactive-httpclient.version>
         <okhttp.version>4.0.1</okhttp.version>
     </properties>
diff --git a/spring-5-reactive-security/pom.xml b/spring-5-reactive-security/pom.xml
@@ -123,7 +123,6 @@
         <johnzon.version>1.1.3</johnzon.version>
         <jsonb-api.version>1.0</jsonb-api.version>
         <geronimo-json_1.1_spec.version>1.0</geronimo-json_1.1_spec.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
         <project-reactor-test>3.1.6.RELEASE</project-reactor-test>
     </properties>
 
diff --git a/spring-5-reactive/pom.xml b/spring-5-reactive/pom.xml
@@ -153,7 +153,6 @@
         <johnzon.version>1.1.3</johnzon.version>
         <jsonb-api.version>1.0</jsonb-api.version>
         <geronimo-json_1.1_spec.version>1.0</geronimo-json_1.1_spec.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
     </properties>
 
 </project>
diff --git a/spring-5/pom.xml b/spring-5/pom.xml
@@ -142,7 +142,6 @@
     <properties>
         <geronimo-json_1.1_spec.version>1.0</geronimo-json_1.1_spec.version>
         <asciidoctor-plugin.version>1.5.6</asciidoctor-plugin.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
         <snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
         <hikaricp.version>4.0.3</hikaricp.version>
     </properties>
diff --git a/testing-modules/testing-assertions/pom.xml b/testing-modules/testing-assertions/pom.xml
@@ -26,8 +26,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <commons-collections4.version>4.4</commons-collections4.version>
-    </properties>
-
 </project>
diff --git a/video-tutorials/jackson-annotations/pom.xml b/video-tutorials/jackson-annotations/pom.xml
@@ -116,7 +116,6 @@
         <!-- various -->
         <joda-time.version>2.9.6</joda-time.version>
         <gson.version>2.8.0</gson.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
         <!-- testing -->
         <rest-assured.version>3.0.1</rest-assured.version>
         <rest-assured-json-schema-validator.version>3.0.0</rest-assured-json-schema-validator.version>
diff --git a/xml/pom.xml b/xml/pom.xml
@@ -355,7 +355,6 @@
         <jaxen.version>1.2.0</jaxen.version>
         <jdom2.version>2.0.6</jdom2.version>
         <joox.version>1.6.2</joox.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
         <jibx-version>1.2.4.5</jibx-version>
         <jaxb-api.version>2.3.1</jaxb-api.version>
         <jaxp-api.version>1.4.2</jaxp-api.version>
