Skip to content

Commit e5355de

Browse files
committed
chore: remove Groovy compilation from the build pipeline
1 parent dfe4649 commit e5355de

File tree

9 files changed

+1
-111
lines changed

9 files changed

+1
-111
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ Optionally you can generate an Eclipse project by running
5353
The steps to import the sources (based on Eclipse 2019-06) into Eclipse are as follows:
5454

5555
1. Install `Eclipse IDE for Java Developers`
56-
1. Install the Groovy Eclipse plugin and select Groovy Compiler 2.4 (some tests are written in Groovy)
57-
1. Install `Kotlin for Eclipse` plugin (builds scripts are written in Kotlin)
56+
1. Install `Kotlin for Eclipse` plugin (JMeter code uses Java and Kotlin)
5857
1. Make sure you have a Java 8 compatible JDK configured in your workspace
5958
1. Open `File->Import...`
6059
1. Select `Existing Gradle Project` and click `Next`

build-logic/jvm/src/main/kotlin/build-logic.groovy.gradle.kts

Lines changed: 0 additions & 34 deletions
This file was deleted.

build-logic/jvm/src/main/kotlin/build-logic.jvm-library.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ plugins {
1919
id("build-logic.java-library")
2020
}
2121

22-
if (file("src/main/groovy").isDirectory || file("src/test/groovy").isDirectory) {
23-
apply(plugin = "build-logic.groovy")
24-
}
25-
2622
if (file("src/main/kotlin").isDirectory || file("src/test/kotlin").isDirectory) {
2723
apply(plugin = "build-logic.kotlin")
2824
}

build-logic/jvm/src/main/kotlin/build-logic.test-base.gradle.kts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,4 @@ tasks.configureEach<Test> {
6161
passProperty("skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server")
6262
// Enable testing ByteBuddy with EA Java versions
6363
passProperty("net.bytebuddy.experimental", "true")
64-
// Spock tests use cglib proxies that access ClassLoader.defineClass reflectively,
65-
// So we pass --add-opens
66-
// See https://github.com/apache/jmeter/pull/5763
67-
jvmArgumentProviders += AddOpensArgumentsProvider(javaLauncher.map { it.metadata.languageVersion })
68-
}
69-
70-
class AddOpensArgumentsProvider(
71-
@Input val javaLanguageVersion: Provider<JavaLanguageVersion>
72-
): CommandLineArgumentProvider {
73-
override fun asArguments(): Iterable<String> =
74-
if (javaLanguageVersion.get().asInt() <= 8) {
75-
// Jave 1.8 does not need add-opens, so we omit it
76-
listOf()
77-
} else {
78-
listOf("--add-opens=java.base/java.lang=ALL-UNNAMED")
79-
}
8064
}

build-logic/jvm/src/main/kotlin/build-logic.test-spock.gradle.kts

Lines changed: 0 additions & 46 deletions
This file was deleted.

checksum.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@
211211
<trusted-key id='60200ac4ae761f1614d6c46766d68daa073be985' group='org.slf4j' />
212212
<trusted-key id='2b1042677fd8190c7b9fc0dc2161d72e7dcd4258' group='org.sonarsource.scanner.api' />
213213
<trusted-key id='f1182e81c792928921dbcab4cfca4a29d26468de' group='org.sonarsource.scanner.api' />
214-
<trusted-key id='76e94e8ff0ab5af3b6f8366972fefd1572eb75e1' group='org.spockframework' />
215214
<trusted-key id='8756c4f765c9ac3cb6b85d62379ce192d401ab61' group='org.springframework' />
216215
<trusted-key id='e2acb037933cdeaab7bf77d49a2c7a98e457c53d' group='org.springframework' />
217216
<trusted-key id='7cd52b5a8295137c88fb5748dddafa7674e54418' group='org.testng' />

renovate.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,6 @@
113113
"groupName": "org.slf4j",
114114
"allowedVersions": "< 2.0.0"
115115
},
116-
{
117-
"matchPackagePrefixes": ["org.spockframework"],
118-
"groupName": "org.spockframework",
119-
"description": "TODO: change when we upgrade to Groovy 4.0",
120-
"allowedVersions": "/.*-groovy-3.0/"
121-
},
122116
{
123117
"matchPackagePatterns": ["^src:protocol"],
124118
"enabled": false

src/bom-testing/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ dependencies {
5656
api("org.objenesis:objenesis:3.3")
5757
api("org.openjdk.jmh:jmh-core:1.37")
5858
api("org.openjdk.jmh:jmh-generator-annprocess:1.37")
59-
api("org.spockframework:spock-core:2.3-groovy-3.0")
6059
api("org.springframework:spring-beans:4.3.30.RELEASE")
6160
api("org.springframework:spring-context:4.3.30.RELEASE")
6261
}

src/components/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ dependencies {
9191
testFixturesImplementation(testFixtures(projects.src.core))
9292
testFixturesImplementation("junit:junit")
9393
testImplementation("io.mockk:mockk")
94-
testFixturesImplementation("org.spockframework:spock-core")
9594
}
9695

9796
if (!buildParameters.enableJavaFx) {

0 commit comments

Comments
 (0)