diff --git a/7ff584954008.tar.bz2 b/7ff584954008.tar.bz2 deleted file mode 100644 index b1115f4..0000000 Binary files a/7ff584954008.tar.bz2 and /dev/null differ diff --git a/jmh-e87669c676c4.tar.bz2 b/jmh-e87669c676c4.tar.bz2 new file mode 100644 index 0000000..deacd9a Binary files /dev/null and b/jmh-e87669c676c4.tar.bz2 differ diff --git a/jmh.spec b/jmh.spec index aff0633..1ffe207 100644 --- a/jmh.spec +++ b/jmh.spec @@ -1,12 +1,12 @@ -%global hghash 7ff584954008 +%global hghash e87669c676c4 Name: jmh -Version: 1.13 +Version: 1.25.2 Release: 1 Summary: Java Microbenchmark Harness License: GPLv2 with exceptions URL: http://openjdk.java.net/projects/code-tools/jmh/ -Source0: http://hg.openjdk.java.net/code-tools/jmh/archive/%{hghash}.tar.bz2 +Source0: http://hg.openjdk.java.net/code-tools/jmh/archive/%{name}-%{hghash}.tar.bz2 # Patch for jopt-simple >= 5 Patch0: jopt-simple.patch @@ -75,7 +75,6 @@ This package contains javadoc for %{name}. %pom_remove_plugin -r :maven-source-plugin %pom_remove_plugin -r :maven-javadoc-plugin %pom_xpath_remove "pom:build/pom:extensions" %{name}-core -rm -r %{name}-core/src/test/java/org/openjdk/jmh/results/format/ResultFormatTest.java for s in $(find %{name}-samples -name "*.java") \ %{name}-core-benchmarks/src/main/java/org/openjdk/jmh/validation/tests/BlackholeConsumeCPUTest.java \ %{name}-core-benchmarks/src/main/java/org/openjdk/jmh/validation/tests/BlackholeConsecutiveTest.java \ @@ -120,5 +119,8 @@ sed -i "s,59,51,;s,Temple Place,Franklin Street,;s,Suite 330,Fifth Floor,;s,0211 %license LICENSE src/license/* %changelog +* Mon Jan 15 2024 Ge Wang -1.25.2-1 +- update to version 1.25.2 + * Tue Aug 11 2020 maminjie - 1.13-1 - package init diff --git a/jopt-simple.patch b/jopt-simple.patch index e80bf2f..06ebecd 100644 --- a/jopt-simple.patch +++ b/jopt-simple.patch @@ -6,21 +6,22 @@ Upgrade to latest jopt-simple diff --git a/jmh-core/pom.xml b/jmh-core/pom.xml +index 59e927e..6a19c5a 100644 --- a/jmh-core/pom.xml +++ b/jmh-core/pom.xml -@@ -60,7 +60,7 @@ +@@ -59,6 +59,7 @@ questions. net.sf.jopt-simple jopt-simple -- 4.6 + 5.0.4 org.apache.commons diff --git a/jmh-core/src/main/java/org/openjdk/jmh/runner/options/IntegerValueConverter.java b/jmh-core/src/main/java/org/openjdk/jmh/runner/options/IntegerValueConverter.java +index 430c5ac..83be90f 100644 --- a/jmh-core/src/main/java/org/openjdk/jmh/runner/options/IntegerValueConverter.java +++ b/jmh-core/src/main/java/org/openjdk/jmh/runner/options/IntegerValueConverter.java -@@ -66,7 +66,7 @@ +@@ -66,7 +66,7 @@ public class IntegerValueConverter implements ValueConverter { } @Override @@ -30,9 +31,10 @@ diff --git a/jmh-core/src/main/java/org/openjdk/jmh/runner/options/IntegerValueC } diff --git a/jmh-core/src/main/java/org/openjdk/jmh/runner/options/ThreadsValueConverter.java b/jmh-core/src/main/java/org/openjdk/jmh/runner/options/ThreadsValueConverter.java +index c88f876..c032eac 100644 --- a/jmh-core/src/main/java/org/openjdk/jmh/runner/options/ThreadsValueConverter.java +++ b/jmh-core/src/main/java/org/openjdk/jmh/runner/options/ThreadsValueConverter.java -@@ -42,7 +42,7 @@ +@@ -42,7 +42,7 @@ public class ThreadsValueConverter implements ValueConverter { } @Override @@ -42,9 +44,10 @@ diff --git a/jmh-core/src/main/java/org/openjdk/jmh/runner/options/ThreadsValueC } diff --git a/jmh-core/src/test/java/org/openjdk/jmh/runner/options/TestOptions.java b/jmh-core/src/test/java/org/openjdk/jmh/runner/options/TestOptions.java +index c3f8f97..4c19e76 100644 --- a/jmh-core/src/test/java/org/openjdk/jmh/runner/options/TestOptions.java +++ b/jmh-core/src/test/java/org/openjdk/jmh/runner/options/TestOptions.java -@@ -244,7 +244,7 @@ +@@ -244,7 +244,7 @@ public class TestOptions { new CommandLineOptions("-t", "0"); Assert.fail(); } catch (CommandLineOptionException e) { @@ -53,7 +56,7 @@ diff --git a/jmh-core/src/test/java/org/openjdk/jmh/runner/options/TestOptions.j } } -@@ -264,7 +264,7 @@ +@@ -264,7 +264,7 @@ public class TestOptions { new CommandLineOptions("-t", "-1"); Assert.fail(); } catch (CommandLineOptionException e) { @@ -62,7 +65,7 @@ diff --git a/jmh-core/src/test/java/org/openjdk/jmh/runner/options/TestOptions.j } } -@@ -274,7 +274,7 @@ +@@ -274,7 +274,7 @@ public class TestOptions { new CommandLineOptions("-t", "-42"); Assert.fail(); } catch (CommandLineOptionException e) { @@ -71,7 +74,7 @@ diff --git a/jmh-core/src/test/java/org/openjdk/jmh/runner/options/TestOptions.j } } -@@ -337,7 +337,7 @@ +@@ -337,7 +337,7 @@ public class TestOptions { new CommandLineOptions("-tg", "-1,-2"); Assert.fail(); } catch (CommandLineOptionException e) { @@ -80,7 +83,7 @@ diff --git a/jmh-core/src/test/java/org/openjdk/jmh/runner/options/TestOptions.j } } -@@ -395,7 +395,7 @@ +@@ -395,7 +395,7 @@ public class TestOptions { new CommandLineOptions("-wi", "-1"); Assert.fail(); } catch (CommandLineOptionException e) { @@ -89,7 +92,7 @@ diff --git a/jmh-core/src/test/java/org/openjdk/jmh/runner/options/TestOptions.j } } -@@ -439,7 +439,7 @@ +@@ -439,7 +439,7 @@ public class TestOptions { new CommandLineOptions("-i", "0"); Assert.fail(); } catch (CommandLineOptionException e) { @@ -98,7 +101,7 @@ diff --git a/jmh-core/src/test/java/org/openjdk/jmh/runner/options/TestOptions.j } } -@@ -515,7 +515,7 @@ +@@ -515,7 +515,7 @@ public class TestOptions { new CommandLineOptions("-opi", "0"); Assert.fail(); } catch (CommandLineOptionException e) { @@ -107,7 +110,7 @@ diff --git a/jmh-core/src/test/java/org/openjdk/jmh/runner/options/TestOptions.j } } -@@ -559,7 +559,7 @@ +@@ -559,7 +559,7 @@ public class TestOptions { new CommandLineOptions("-f", "-1"); Assert.fail(); } catch (CommandLineOptionException e) { @@ -116,7 +119,7 @@ diff --git a/jmh-core/src/test/java/org/openjdk/jmh/runner/options/TestOptions.j } } -@@ -598,7 +598,7 @@ +@@ -598,7 +598,7 @@ public class TestOptions { new CommandLineOptions("-wf", "-1"); Assert.fail(); } catch (CommandLineOptionException e) { @@ -125,7 +128,7 @@ diff --git a/jmh-core/src/test/java/org/openjdk/jmh/runner/options/TestOptions.j } } -@@ -678,7 +678,7 @@ +@@ -678,7 +678,7 @@ public class TestOptions { new CommandLineOptions("-bs", "0"); Assert.fail(); } catch (CommandLineOptionException e) { @@ -134,7 +137,7 @@ diff --git a/jmh-core/src/test/java/org/openjdk/jmh/runner/options/TestOptions.j } } -@@ -710,7 +710,7 @@ +@@ -710,7 +710,7 @@ public class TestOptions { new CommandLineOptions("-wbs", "0"); Assert.fail(); } catch (CommandLineOptionException e) { @@ -143,3 +146,6 @@ diff --git a/jmh-core/src/test/java/org/openjdk/jmh/runner/options/TestOptions.j } } +-- +2.33.0 +