This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_4_0_X by this push:
new df2b1611e2 GROOVY-11150: Bump JMH to 1.37 (performance test
dependency) plus minor refactor
df2b1611e2 is described below
commit df2b1611e243d96797e5e308cb49f64eee26758b
Author: Paul King <[email protected]>
AuthorDate: Mon Aug 7 14:53:58 2023 +1000
GROOVY-11150: Bump JMH to 1.37 (performance test dependency) plus minor
refactor
---
build-logic/build.gradle | 2 +-
.../main/groovy/org.apache.groovy-performance.gradle | 6 +++++-
.../groovy/gradle/PerformanceTestsExtension.groovy | 19 +++++++++----------
versions.properties | 2 +-
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/build-logic/build.gradle b/build-logic/build.gradle
index 63abf8f589..52b14f4b0d 100644
--- a/build-logic/build.gradle
+++ b/build-logic/build.gradle
@@ -32,7 +32,7 @@ dependencies {
implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.31.4'
implementation 'org.nosphere.apache:creadur-rat-gradle:0.8.0'
implementation 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.13'
- implementation 'me.champeau.jmh:jmh-gradle-plugin:0.6.8'
+ implementation 'me.champeau.jmh:jmh-gradle-plugin:0.7.1'
}
tasks.withType(Jar).configureEach {
diff --git a/build-logic/src/main/groovy/org.apache.groovy-performance.gradle
b/build-logic/src/main/groovy/org.apache.groovy-performance.gradle
index d33223acd4..95bcaccbb6 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-performance.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-performance.gradle
@@ -53,7 +53,11 @@ jmh {
includes = ['.*' + project.benchInclude + '.*']
}
includeTests = true
- duplicateClassesStrategy = DuplicatesStrategy.WARN
+}
+
+jmhJar {
+ exclude 'LICENSE'
+ exclude 'THIRD-PARTY'
}
tasks.named('jmhClasses') {
diff --git
a/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
b/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
index 91d792a2e1..176e95f94d 100644
---
a/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
+++
b/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
@@ -113,22 +113,21 @@ class PerformanceTestsExtension {
].each {conf.dependencies.add(dependencies.create(it)) }
}
def outputFile =
layout.buildDirectory.file("compilation-stats-${version}.csv")
- def perfTest = tasks.register("performanceTestGroovy${version}",
JavaExec) {
- it.group = "Performance tests"
- it.mainClass.set('org.apache.groovy.perf.CompilerPerformanceTest')
- it.classpath(groovyConf, sourceSets.getByName('test').output)
- it.jvmArgs = ['-Xms512m', '-Xmx512m']
- it.outputs.file(outputFile)
- def je = it
- it.doFirst {
+ def perfTest = tasks.register("performanceTestGroovy${version}",
JavaExec) { je ->
+ je.group = "Performance tests"
+ je.mainClass.set('org.apache.groovy.perf.CompilerPerformanceTest')
+ je.classpath(groovyConf, sourceSets.getByName('test').output)
+ je.jvmArgs = ['-Xms512m', '-Xmx512m']
+ je.outputs.file(outputFile)
+ je.doFirst {
def args = [outputFile.get().toString(), "-cp",
groovyConf.asPath]
args.addAll(testFiles.collect { it.toString() })
je.setArgs(args)
println je.args.asList()
}
}
- tasks.named("performanceTests", PerformanceTestSummary) {
- it.csvFiles.from(perfTest)
+ tasks.named("performanceTests", PerformanceTestSummary) { pts ->
+ pts.csvFiles.from(perfTest)
}
}
}
diff --git a/versions.properties b/versions.properties
index e93d56f8d1..9a04a7f636 100644
--- a/versions.properties
+++ b/versions.properties
@@ -34,7 +34,7 @@ jackson=2.15.2
jarjar=1.8.0
javaParser=3.25.4
jline=2.14.6
-jmh=1.35
+jmh=1.37
jmock=1.2.0
jruby=9.2.17.0
logback=1.3.9
