From df6828772837ba75535e1221c2392f9ce9e0c8ca Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Sun, 21 Mar 2021 23:06:03 +0100 Subject: [PATCH] JAVA-3595: Use jmh version defined in the parent pom.xml --- algorithms-miscellaneous-3/pom.xml | 2 -- core-java-modules/core-java-11/pom.xml | 5 ++--- core-java-modules/core-java-arrays-guides/pom.xml | 8 ++------ .../core-java-arrays-operations-basic/pom.xml | 5 ++--- core-java-modules/core-java-arrays-sorting/pom.xml | 5 ++--- core-java-modules/core-java-char/pom.xml | 5 ++--- core-java-modules/core-java-collections-3/pom.xml | 3 +-- core-java-modules/core-java-collections-list-3/pom.xml | 2 +- core-java-modules/core-java-collections/pom.xml | 5 ++--- .../core-java-concurrency-advanced-2/pom.xml | 4 +--- .../core-java-concurrency-collections-2/pom.xml | 5 ++--- core-java-modules/core-java-lang-2/pom.xml | 2 -- core-java-modules/core-java-lang-4/pom.xml | 8 ++------ core-java-modules/core-java-lang-math-2/pom.xml | 3 +-- core-java-modules/core-java-optional/pom.xml | 2 -- .../core-java-string-algorithms-2/pom.xml | 2 +- core-java-modules/core-java-string-algorithms/pom.xml | 2 +- jmh/pom.xml | 5 ++--- libraries-5/pom.xml | 3 +-- libraries-primitive/pom.xml | 5 ++--- libraries/pom.xml | 3 +-- parent-java/pom.xml | 5 ++--- performance-tests/pom.xml | 10 +++------- persistence-modules/hibernate-jpa/pom.xml | 3 +-- persistence-modules/hibernate-queries/pom.xml | 3 +-- persistence-modules/hibernate5/pom.xml | 3 +-- xml/pom.xml | 5 ++--- 27 files changed, 38 insertions(+), 75 deletions(-) diff --git a/algorithms-miscellaneous-3/pom.xml b/algorithms-miscellaneous-3/pom.xml index 877e8bfefa..4b67a30abb 100644 --- a/algorithms-miscellaneous-3/pom.xml +++ b/algorithms-miscellaneous-3/pom.xml @@ -91,8 +91,6 @@ 4.3 28.0-jre 2.6.0 - 1.19 - 1.19 3.8.1 1.1.0 diff --git a/core-java-modules/core-java-11/pom.xml b/core-java-modules/core-java-11/pom.xml index 2f7f5a6bcf..cdb3aab2c7 100644 --- a/core-java-modules/core-java-11/pom.xml +++ b/core-java-modules/core-java-11/pom.xml @@ -32,12 +32,12 @@ org.openjdk.jmh jmh-core - ${jmh.version} + ${jmh-core.version} org.openjdk.jmh jmh-generator-annprocess - ${jmh.version} + ${jmh-generator.version} provided @@ -105,7 +105,6 @@ 27.1-jre 3.11.1 benchmarks - 1.22 10.0.0 3.2.4 diff --git a/core-java-modules/core-java-arrays-guides/pom.xml b/core-java-modules/core-java-arrays-guides/pom.xml index df8639820d..eafdb02ab8 100644 --- a/core-java-modules/core-java-arrays-guides/pom.xml +++ b/core-java-modules/core-java-arrays-guides/pom.xml @@ -17,16 +17,12 @@ org.openjdk.jmh jmh-core - ${jmh.version} + ${jmh-core.version} org.openjdk.jmh jmh-generator-annprocess - ${jmh.version} + ${jmh-generator.version} - - - 1.19 - \ No newline at end of file diff --git a/core-java-modules/core-java-arrays-operations-basic/pom.xml b/core-java-modules/core-java-arrays-operations-basic/pom.xml index dcee6547a0..9157d9deb9 100644 --- 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 @@ org.openjdk.jmh jmh-core - ${jmh.version} + ${jmh-core.version} org.openjdk.jmh jmh-generator-annprocess - ${jmh.version} + ${jmh-generator.version} @@ -68,7 +68,6 @@ 3.2.0 - 1.19 3.10.0 \ No newline at end of file diff --git a/core-java-modules/core-java-arrays-sorting/pom.xml b/core-java-modules/core-java-arrays-sorting/pom.xml index 9b900c3de6..610582260b 100644 --- a/core-java-modules/core-java-arrays-sorting/pom.xml +++ b/core-java-modules/core-java-arrays-sorting/pom.xml @@ -31,12 +31,12 @@ org.openjdk.jmh jmh-core - ${jmh.version} + ${jmh-core.version} org.openjdk.jmh jmh-generator-annprocess - ${jmh.version} + ${jmh-generator.version} @@ -77,7 +77,6 @@ 3.2.0 28.2-jre - 1.19 3.10.0 \ No newline at end of file diff --git a/core-java-modules/core-java-char/pom.xml b/core-java-modules/core-java-char/pom.xml index 3691079482..078a829e00 100644 --- a/core-java-modules/core-java-char/pom.xml +++ b/core-java-modules/core-java-char/pom.xml @@ -25,17 +25,16 @@ org.openjdk.jmh jmh-core - ${openjdk.jmh.version} + ${jmh-core.version} org.openjdk.jmh jmh-generator-annprocess - ${openjdk.jmh.version} + ${jmh-generator.version} - 1.19 3.11.1 diff --git a/core-java-modules/core-java-collections-3/pom.xml b/core-java-modules/core-java-collections-3/pom.xml index 602fcf60f4..aa04d1cb24 100644 --- a/core-java-modules/core-java-collections-3/pom.xml +++ b/core-java-modules/core-java-collections-3/pom.xml @@ -24,7 +24,7 @@ org.openjdk.jmh jmh-core - ${openjdk.jmh.version} + ${jmh-core.version} org.assertj @@ -40,7 +40,6 @@ - 1.19 3.11.1 0.10 diff --git a/core-java-modules/core-java-collections-list-3/pom.xml b/core-java-modules/core-java-collections-list-3/pom.xml index e1cf645c8a..d1d199ec3f 100644 --- 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 @@ org.openjdk.jmh jmh-generator-annprocess - ${jmh-core.version} + ${jmh-generator.version} diff --git a/core-java-modules/core-java-collections/pom.xml b/core-java-modules/core-java-collections/pom.xml index e1219c4713..fe9cf57bfb 100644 --- a/core-java-modules/core-java-collections/pom.xml +++ b/core-java-modules/core-java-collections/pom.xml @@ -25,17 +25,16 @@ org.openjdk.jmh jmh-core - ${openjdk.jmh.version} + ${jmh-core.version} org.openjdk.jmh jmh-generator-annprocess - ${openjdk.jmh.version} + ${jmh-generator.version} - 1.19 3.11.1 diff --git a/core-java-modules/core-java-concurrency-advanced-2/pom.xml b/core-java-modules/core-java-concurrency-advanced-2/pom.xml index 2f374bffac..98f159a85f 100644 --- 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 @@ org.openjdk.jmh jmh-generator-annprocess - ${jmh-generator-annprocess.version} + ${jmh-generator.version} @@ -51,8 +51,6 @@ - 1.19 - 1.19 3.6.1 diff --git a/core-java-modules/core-java-concurrency-collections-2/pom.xml b/core-java-modules/core-java-concurrency-collections-2/pom.xml index f9ee41f6d5..19d43aa7dd 100644 --- 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 @@ org.openjdk.jmh jmh-core - ${jmh.version} + ${jmh-core.version} org.openjdk.jmh jmh-generator-annprocess - ${jmh.version} + ${jmh-generator.version} org.assertj @@ -39,7 +39,6 @@ - 1.21 28.2-jre 3.6.1 diff --git a/core-java-modules/core-java-lang-2/pom.xml b/core-java-modules/core-java-lang-2/pom.xml index d395e8efb1..9da76fa168 100644 --- a/core-java-modules/core-java-lang-2/pom.xml +++ b/core-java-modules/core-java-lang-2/pom.xml @@ -65,8 +65,6 @@ - 1.19 - 1.19 3.12.2 1.9.4 29.0-jre diff --git a/core-java-modules/core-java-lang-4/pom.xml b/core-java-modules/core-java-lang-4/pom.xml index 3e92e9f9c7..f00a9318f7 100644 --- a/core-java-modules/core-java-lang-4/pom.xml +++ b/core-java-modules/core-java-lang-4/pom.xml @@ -20,12 +20,12 @@ org.openjdk.jmh jmh-core - ${jmh.version} + ${jmh-core.version} org.openjdk.jmh jmh-generator-annprocess - ${jmh.version} + ${jmh-generator.version} test @@ -39,9 +39,5 @@ - - - 1.28 - \ No newline at end of file diff --git a/core-java-modules/core-java-lang-math-2/pom.xml b/core-java-modules/core-java-lang-math-2/pom.xml index e2cced4fbf..42704c784a 100644 --- 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 @@ org.openjdk.jmh jmh-generator-annprocess - ${jmh.version} + ${jmh-generator.version} @@ -83,7 +83,6 @@ 1.0.0-beta4 1.2.0 0.6.0 - 1.19 \ No newline at end of file diff --git a/core-java-modules/core-java-optional/pom.xml b/core-java-modules/core-java-optional/pom.xml index 575ccb0759..a6127f5fdd 100644 --- a/core-java-modules/core-java-optional/pom.xml +++ b/core-java-modules/core-java-optional/pom.xml @@ -67,8 +67,6 @@ 5.4.0.Final - 1.19 - 1.19 27.1-jre 3.10.0 3.1.1 diff --git a/core-java-modules/core-java-string-algorithms-2/pom.xml b/core-java-modules/core-java-string-algorithms-2/pom.xml index 2a84cebb4c..ae2685e742 100644 --- 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 @@ org.openjdk.jmh jmh-generator-annprocess - ${jmh-core.version} + ${jmh-generator.version} org.assertj diff --git a/core-java-modules/core-java-string-algorithms/pom.xml b/core-java-modules/core-java-string-algorithms/pom.xml index 6ba9ae7bb3..abafd10f2b 100644 --- a/core-java-modules/core-java-string-algorithms/pom.xml +++ b/core-java-modules/core-java-string-algorithms/pom.xml @@ -39,7 +39,7 @@ org.openjdk.jmh jmh-generator-annprocess - ${jmh-core.version} + ${jmh-generator.version} com.vdurmont diff --git a/jmh/pom.xml b/jmh/pom.xml index 16a5bc54a4..ecee66f410 100644 --- a/jmh/pom.xml +++ b/jmh/pom.xml @@ -19,12 +19,12 @@ org.openjdk.jmh jmh-core - ${openjdk.jmh.version} + ${jmh-core.version} org.openjdk.jmh jmh-generator-annprocess - ${openjdk.jmh.version} + ${jmh-generator.version} org.openjdk.jol @@ -76,7 +76,6 @@ - 1.19 3.0.2 0.10 3.2.0 diff --git a/libraries-5/pom.xml b/libraries-5/pom.xml index 63347dd60d..80b39b590e 100644 --- a/libraries-5/pom.xml +++ b/libraries-5/pom.xml @@ -115,7 +115,7 @@ org.openjdk.jmh jmh-core - ${jmh.version} + ${jmh-core.version} @@ -134,7 +134,6 @@ 4.5.1 1.0 2.1.2 - 1.19 \ No newline at end of file diff --git a/libraries-primitive/pom.xml b/libraries-primitive/pom.xml index 1370468e76..ec084fedeb 100644 --- a/libraries-primitive/pom.xml +++ b/libraries-primitive/pom.xml @@ -26,13 +26,13 @@ org.openjdk.jmh jmh-core - ${jmh.version} + ${jmh-core.version} test org.openjdk.jmh jmh-generator-annprocess - ${jmh.version} + ${jmh-generator.version} test @@ -46,7 +46,6 @@ 8.2.2 4.12 - 1.19 10.0.0 1.8 1.8 diff --git a/libraries/pom.xml b/libraries/pom.xml index fee66f928d..5924ed009a 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -202,7 +202,7 @@ org.openjdk.jmh jmh-core - ${jmh.version} + ${jmh-core.version} junit @@ -395,7 +395,6 @@ 3.0.3 2.3.0 0.9.12 - 1.19 3.0.2 3.6 2.6 diff --git a/parent-java/pom.xml b/parent-java/pom.xml index 9170f45bbe..ce79b34f57 100644 --- a/parent-java/pom.xml +++ b/parent-java/pom.xml @@ -32,18 +32,17 @@ org.openjdk.jmh jmh-core - ${jmh.version} + ${jmh-core.version} org.openjdk.jmh jmh-generator-annprocess - ${jmh.version} + ${jmh-generator.version} 29.0-jre - 1.19 2.3.7 2.2 diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml index fb3f82df38..e9d724aab0 100644 --- a/performance-tests/pom.xml +++ b/performance-tests/pom.xml @@ -42,12 +42,12 @@ org.openjdk.jmh jmh-core - ${jmh.version} + ${jmh-core.version} org.openjdk.jmh jmh-generator-annprocess - ${jmh.version} + ${jmh-generator.version} provided @@ -67,7 +67,7 @@ org.openjdk.jmh jmh-generator-annprocess - ${jmh.version} + ${jmh-generator.version} org.mapstruct @@ -156,10 +156,6 @@ - - 1.23 1.5.4 6.5.0 1.3.1.Final diff --git a/persistence-modules/hibernate-jpa/pom.xml b/persistence-modules/hibernate-jpa/pom.xml index 07b1ee1c51..e5056c413b 100644 --- a/persistence-modules/hibernate-jpa/pom.xml +++ b/persistence-modules/hibernate-jpa/pom.xml @@ -79,7 +79,7 @@ org.openjdk.jmh jmh-generator-annprocess - ${openjdk-jmh.version} + ${jmh-generator.version} org.postgresql @@ -94,7 +94,6 @@ 42.2.11 2.2.3 3.8.0 - 1.21 2.1.7.RELEASE diff --git a/persistence-modules/hibernate-queries/pom.xml b/persistence-modules/hibernate-queries/pom.xml index 4374c833c2..d44bc0f8ae 100644 --- a/persistence-modules/hibernate-queries/pom.xml +++ b/persistence-modules/hibernate-queries/pom.xml @@ -53,7 +53,7 @@ org.openjdk.jmh jmh-generator-annprocess - ${openjdk-jmh.version} + ${jmh-generator.version} @@ -61,7 +61,6 @@ 6.0.6 2.2.3 3.8.0 - 1.21 diff --git a/persistence-modules/hibernate5/pom.xml b/persistence-modules/hibernate5/pom.xml index 3feffc98fd..fe0e7680ab 100644 --- a/persistence-modules/hibernate5/pom.xml +++ b/persistence-modules/hibernate5/pom.xml @@ -59,7 +59,7 @@ org.openjdk.jmh jmh-generator-annprocess - ${openjdk-jmh.version} + ${jmh-generator.version} @@ -68,7 +68,6 @@ 6.0.6 2.2.3 3.8.0 - 1.21 diff --git a/xml/pom.xml b/xml/pom.xml index 837f918b46..e2731abb13 100644 --- a/xml/pom.xml +++ b/xml/pom.xml @@ -75,12 +75,12 @@ org.openjdk.jmh jmh-core - ${jmh.version} + ${jmh-core.version} org.openjdk.jmh jmh-generator-annprocess - ${jmh.version} + ${jmh-generator.version} @@ -374,7 +374,6 @@ 3.12.2 2.6.3 5.5.0 - 1.21 2.3.29 0.9.6