This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new 455fc7b500 chore: remove Checkerframework buildscript configuration
455fc7b500 is described below
commit 455fc7b500ffc99f47a8e82f952be6f76efca16a
Author: Vladimir Sitnikov <[email protected]>
AuthorDate: Mon Nov 17 13:41:37 2025 +0300
chore: remove Checkerframework buildscript configuration
---
build-logic/build-parameters/build.gradle.kts | 4 --
build-logic/verification/build.gradle.kts | 1 -
.../kotlin/build-logic.checkerframework.gradle.kts | 61 ----------------------
.../src/main/kotlin/build-logic.style.gradle.kts | 3 --
renovate.json | 6 ---
src/bom-thirdparty/build.gradle.kts | 1 -
6 files changed, 76 deletions(-)
diff --git a/build-logic/build-parameters/build.gradle.kts
b/build-logic/build-parameters/build.gradle.kts
index 945caebbc5..64fee6d0a2 100644
--- a/build-logic/build-parameters/build.gradle.kts
+++ b/build-logic/build-parameters/build.gradle.kts
@@ -74,10 +74,6 @@ buildParameters {
defaultValue.set(false)
description.set("Ignore SpotBugs failures")
}
- bool("enableCheckerframework") {
- defaultValue.set(false)
- description.set("Run CheckerFramework (nullness) verifications")
- }
bool("skipAutostyle") {
defaultValue.set(false)
description.set("Skip AutoStyle verifications")
diff --git a/build-logic/verification/build.gradle.kts
b/build-logic/verification/build.gradle.kts
index bbb4fd062d..2963cab63c 100644
--- a/build-logic/verification/build.gradle.kts
+++ b/build-logic/verification/build.gradle.kts
@@ -28,7 +28,6 @@ dependencies {
api("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:2.0.0")
api("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.10")
api("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:4.3.0")
- api("org.checkerframework:org.checkerframework.gradle.plugin:0.6.61")
api("org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.3")
api("org.sonarqube:org.sonarqube.gradle.plugin:4.4.1.3373")
}
diff --git
a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
deleted file mode 100644
index ca364483d9..0000000000
---
a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.gradle.kotlin.dsl.dependencies
-
-plugins {
- id("build-logic.build-params")
- id("org.checkerframework")
-}
-
-dependencies {
- providers.gradleProperty("checkerframework.version")
- .takeIf { it.isPresent }
- ?.let {
- val checkerframeworkVersion = it.get()
-
"checkerFramework"("org.checkerframework:checker:$checkerframeworkVersion")
- if (buildParameters.buildJdkVersion == 8) {
- // only needed for JDK 8
-
"checkerFrameworkAnnotatedJDK"("org.checkerframework:jdk8:$checkerframeworkVersion")
- }
- } ?: run {
- val checkerframeworkVersion = "3.52.0"
-
"checkerFramework"("org.checkerframework:checker:$checkerframeworkVersion")
- if (buildParameters.buildJdkVersion == 8) {
- // only needed for JDK 8
-
"checkerFrameworkAnnotatedJDK"("org.checkerframework:jdk8:$checkerframeworkVersion")
- }
- }
-}
-
-checkerFramework {
- skipVersionCheck = true
- excludeTests = true
- // See https://checkerframework.org/manual/#introduction
- checkers.add("org.checkerframework.checker.nullness.NullnessChecker")
- checkers.add("org.checkerframework.checker.optional.OptionalChecker")
- // checkers.add("org.checkerframework.checker.index.IndexChecker")
- checkers.add("org.checkerframework.checker.regex.RegexChecker")
- extraJavacArgs.add(
- "-Astubs=" +
- fileTree("$rootDir/config/checkerframework") {
- include("*.astub")
- }.asPath
- )
- // The below produces too many warnings :(
- // extraJavacArgs.add("-Alint=redundantNullComparison")
-}
diff --git
a/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
b/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
index fa56eaa38f..34248aa07b 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.style.gradle.kts
@@ -39,9 +39,6 @@ plugins.withId("java-base") {
if (!buildParameters.skipForbiddenApis) {
apply(plugin = "build-logic.forbidden-apis")
}
- if (buildParameters.enableCheckerframework) {
- apply(plugin = "build-logic.checkerframework")
- }
if (buildParameters.enableErrorprone) {
apply(plugin = "build-logic.errorprone")
}
diff --git a/renovate.json b/renovate.json
index cadad96d66..9b90c00d5d 100644
--- a/renovate.json
+++ b/renovate.json
@@ -122,12 +122,6 @@
"org.apache.tika{/,}**"
]
},
- {
- "groupName": "org.checkerframework",
- "matchPackageNames": [
- "org.checkerframework{/,}**"
- ]
- },
{
"groupName": "org.eclipse.jetty",
"matchPackageNames": [
diff --git a/src/bom-thirdparty/build.gradle.kts
b/src/bom-thirdparty/build.gradle.kts
index 588ddd8966..10ac56b290 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -79,7 +79,6 @@ dependencies {
api("junit:junit:4.13.2") {
because("ApacheJMeter_junit depends on junit4")
}
- api("org.checkerframework:checker-qual:3.52.0")
api("org.hamcrest:hamcrest-core:3.0") {
because("ApacheJMeter_junit depends on junit4")
}
