JAVA-3595: Use jmh version defined in the parent pom.xml

Krzysztof Woyke · Krzysztof Woyke · commit a7c5be1b2826 · 2021-03-21T23:06:03.000+01:00
diff --git a/algorithms-miscellaneous-3/pom.xml b/algorithms-miscellaneous-3/pom.xml
@@ -91,8 +91,6 @@
         <commons-collections4.version>4.3</commons-collections4.version>
         <guava.version>28.0-jre</guava.version>
         <retrofit.version>2.6.0</retrofit.version>
-        <jmh-core.version>1.19</jmh-core.version>
-        <jmh-generator.version>1.19</jmh-generator.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-11/pom.xml b/core-java-modules/core-java-11/pom.xml
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-generator.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -105,7 +105,6 @@
         <guava.version>27.1-jre</guava.version>
         <assertj.version>3.11.1</assertj.version>
         <uberjar.name>benchmarks</uberjar.name>
-        <jmh.version>1.22</jmh.version>
         <eclipse.collections.version>10.0.0</eclipse.collections.version>
         <shade.plugin.version>3.2.4</shade.plugin.version>
     </properties>
diff --git a/core-java-modules/core-java-arrays-guides/pom.xml b/core-java-modules/core-java-arrays-guides/pom.xml
@@ -17,16 +17,12 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-generator.version}</version>
         </dependency>
     </dependencies>
-
-    <properties>
-        <jmh.version>1.19</jmh.version>
-    </properties>
 </project>
diff --git a/core-java-modules/core-java-arrays-operations-basic/pom.xml b/core-java-modules/core-java-arrays-operations-basic/pom.xml
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-generator.version}</version>
         </dependency>
 
         <dependency>
@@ -68,7 +68,6 @@
 
     <properties>
         <shade.plugin.version>3.2.0</shade.plugin.version>
-        <jmh.version>1.19</jmh.version>
         <assertj-core.version>3.10.0</assertj-core.version>
     </properties>
 </project>
diff --git a/core-java-modules/core-java-arrays-sorting/pom.xml b/core-java-modules/core-java-arrays-sorting/pom.xml
@@ -31,12 +31,12 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-generator.version}</version>
         </dependency>
 
         <!-- Testing -->
@@ -77,7 +77,6 @@
     <properties>
         <shade.plugin.version>3.2.0</shade.plugin.version>
         <guava.version>28.2-jre</guava.version>
-        <jmh.version>1.19</jmh.version>
         <assertj-core.version>3.10.0</assertj-core.version>
     </properties>
 </project>
diff --git a/core-java-modules/core-java-char/pom.xml b/core-java-modules/core-java-char/pom.xml
@@ -25,17 +25,16 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${openjdk.jmh.version}</version>
+            <version>${jmh-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${openjdk.jmh.version}</version>
+            <version>${jmh-generator.version}</version>
         </dependency>
     </dependencies>
 
     <properties>
-        <openjdk.jmh.version>1.19</openjdk.jmh.version>
         <assertj.version>3.11.1</assertj.version>
     </properties>
 
diff --git a/core-java-modules/core-java-collections-3/pom.xml b/core-java-modules/core-java-collections-3/pom.xml
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${openjdk.jmh.version}</version>
+            <version>${jmh-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
@@ -40,7 +40,6 @@
     </dependencies>
 
     <properties>
-        <openjdk.jmh.version>1.19</openjdk.jmh.version>
         <assertj.version>3.11.1</assertj.version>
         <jol-core.version>0.10</jol-core.version>
     </properties>
diff --git a/core-java-modules/core-java-collections-list-3/pom.xml b/core-java-modules/core-java-collections-list-3/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh-core.version}</version>
+            <version>${jmh-generator.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/core-java-modules/core-java-collections/pom.xml b/core-java-modules/core-java-collections/pom.xml
@@ -25,17 +25,16 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${openjdk.jmh.version}</version>
+            <version>${jmh-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${openjdk.jmh.version}</version>
+            <version>${jmh-generator.version}</version>
         </dependency>
     </dependencies>
 
     <properties>
-        <openjdk.jmh.version>1.19</openjdk.jmh.version>
         <assertj.version>3.11.1</assertj.version>
     </properties>
 
diff --git a/core-java-modules/core-java-concurrency-advanced-2/pom.xml b/core-java-modules/core-java-concurrency-advanced-2/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh-generator-annprocess.version}</version>
+            <version>${jmh-generator.version}</version>
         </dependency>
 
         <dependency>
@@ -51,8 +51,6 @@
     </build>
 
     <properties>
-        <jmh-core.version>1.19</jmh-core.version>
-        <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
         <assertj.version>3.6.1</assertj.version>
     </properties>
 
diff --git a/core-java-modules/core-java-concurrency-collections-2/pom.xml b/core-java-modules/core-java-concurrency-collections-2/pom.xml
@@ -23,12 +23,12 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-generator.version}</version>
         </dependency>
 		<dependency>
             <groupId>org.assertj</groupId>
@@ -39,7 +39,6 @@
     </dependencies>
 
     <properties>
-        <jmh.version>1.21</jmh.version>
         <guava.version>28.2-jre</guava.version>
          <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
diff --git a/core-java-modules/core-java-lang-2/pom.xml b/core-java-modules/core-java-lang-2/pom.xml
@@ -65,8 +65,6 @@
     </build>
 
     <properties>
-        <jmh-core.version>1.19</jmh-core.version>
-        <jmh-generator.version>1.19</jmh-generator.version>
         <assertj.version>3.12.2</assertj.version>
         <commons.beanutils.version>1.9.4</commons.beanutils.version>
         <guava.version>29.0-jre</guava.version>
diff --git a/core-java-modules/core-java-lang-4/pom.xml b/core-java-modules/core-java-lang-4/pom.xml
@@ -20,12 +20,12 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-generator.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -39,9 +39,5 @@
             </resource>
         </resources>
     </build>
-
-    <properties>
-        <jmh.version>1.28</jmh.version>
-    </properties>
       
 </project>
diff --git a/core-java-modules/core-java-lang-math-2/pom.xml b/core-java-modules/core-java-lang-math-2/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-generator.version}</version>
         </dependency>
     </dependencies>
 
@@ -83,7 +83,6 @@
         <nd4j.version>1.0.0-beta4</nd4j.version>
         <colt.version>1.2.0</colt.version>
         <la4j.version>0.6.0</la4j.version>
-        <jmh.version>1.19</jmh.version>
     </properties>
 
 </project>
diff --git a/core-java-modules/core-java-optional/pom.xml b/core-java-modules/core-java-optional/pom.xml
@@ -67,8 +67,6 @@
 
     <properties>
         <hibernate.core.version>5.4.0.Final</hibernate.core.version>
-        <jmh-core.version>1.19</jmh-core.version>
-        <jmh-generator.version>1.19</jmh-generator.version>
         <guava.version>27.1-jre</guava.version>
         <assertj.version>3.10.0</assertj.version>
         <rest-assured.version>3.1.1</rest-assured.version>
diff --git a/core-java-modules/core-java-string-algorithms-2/pom.xml b/core-java-modules/core-java-string-algorithms-2/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh-core.version}</version>
+            <version>${jmh-generator.version}</version>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
diff --git a/core-java-modules/core-java-string-algorithms/pom.xml b/core-java-modules/core-java-string-algorithms/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh-core.version}</version>
+            <version>${jmh-generator.version}</version>
         </dependency>
         <dependency>
             <groupId>com.vdurmont</groupId>
diff --git a/jmh/pom.xml b/jmh/pom.xml
@@ -19,12 +19,12 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${openjdk.jmh.version}</version>
+            <version>${jmh-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${openjdk.jmh.version}</version>
+            <version>${jmh-generator.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jol</groupId>
@@ -76,7 +76,6 @@
     </build>
 
     <properties>
-        <openjdk.jmh.version>1.19</openjdk.jmh.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
         <jol-core.version>0.10</jol-core.version>
         <maven-assembly-plugin.version>3.2.0</maven-assembly-plugin.version>
diff --git a/libraries-5/pom.xml b/libraries-5/pom.xml
@@ -115,7 +115,7 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-core.version}</version>
         </dependency>
     </dependencies>
 
@@ -134,7 +134,6 @@
         <fugue.version>4.5.1</fugue.version>
         <jnats.version>1.0</jnats.version>
         <jctools.version>2.1.2</jctools.version>
-        <jmh.version>1.19</jmh.version>
     </properties>
 
 </project>
diff --git a/libraries-primitive/pom.xml b/libraries-primitive/pom.xml
@@ -26,13 +26,13 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-core.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-generator.version}</version>
             <scope>test</scope>
         </dependency>
         <!-- Eclipse Collections -->
@@ -46,7 +46,6 @@
     <properties>
         <fastutil.version>8.2.2</fastutil.version>
         <junit.version>4.12</junit.version>
-        <jmh.version>1.19</jmh.version>
         <eclipse-collections.version>10.0.0</eclipse-collections.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
diff --git a/libraries/pom.xml b/libraries/pom.xml
@@ -202,7 +202,7 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-core.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -395,7 +395,6 @@
         <spring-mock-mvc.version>3.0.3</spring-mock-mvc.version>
         <quartz.version>2.3.0</quartz.version>
         <jool.version>0.9.12</jool.version>
-        <jmh.version>1.19</jmh.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
         <commons-net.version>3.6</commons-net.version>
         <commonsio.version>2.6</commonsio.version>
diff --git a/parent-java/pom.xml b/parent-java/pom.xml
@@ -32,18 +32,17 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
+            <version>${jmh-generator.version}</version>
         </dependency>
     </dependencies>
 
     <properties>
         <guava.version>29.0-jre</guava.version>
-        <jmh.version>1.19</jmh.version>
         <modelmapper.version>2.3.7</modelmapper.version>
         <hamcrest.version>2.2</hamcrest.version>
     </properties>
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
diff --git a/persistence-modules/hibernate-jpa/pom.xml b/persistence-modules/hibernate-jpa/pom.xml
diff --git a/persistence-modules/hibernate-queries/pom.xml b/persistence-modules/hibernate-queries/pom.xml
diff --git a/persistence-modules/hibernate5/pom.xml b/persistence-modules/hibernate5/pom.xml
diff --git a/xml/pom.xml b/xml/pom.xml
