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 a4ca5a09e0 fix(deps): update dependency org.junit:junit-bom to v6
a4ca5a09e0 is described below
commit a4ca5a09e046c0059d18661dcfc5648caf5fb4be
Author: Mend Renovate <[email protected]>
AuthorDate: Tue Nov 18 23:16:32 2025 +0000
fix(deps): update dependency org.junit:junit-bom to v6
---
.../src/main/kotlin/build-logic.jacoco-aggregate.gradle.kts | 1 -
gradle/verification-metadata.xml | 5 +++++
src/bom-testing/build.gradle.kts | 2 +-
.../java/org/apache/jmeter/util/JSR223TestElementTest.java | 12 ------------
4 files changed, 6 insertions(+), 14 deletions(-)
diff --git
a/build-logic/verification/src/main/kotlin/build-logic.jacoco-aggregate.gradle.kts
b/build-logic/verification/src/main/kotlin/build-logic.jacoco-aggregate.gradle.kts
index 16a0961845..cf11a81cc6 100644
---
a/build-logic/verification/src/main/kotlin/build-logic.jacoco-aggregate.gradle.kts
+++
b/build-logic/verification/src/main/kotlin/build-logic.jacoco-aggregate.gradle.kts
@@ -26,7 +26,6 @@ plugins {
val jacocoAggregation by configurations.creating {
description = "Collects project dependencies for JaCoCo coverage report
aggregation"
- isVisible = false
isTransitive = true
isCanBeResolved = false
isCanBeConsumed = false
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index df901f52d7..37515ad0fd 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -931,6 +931,11 @@
<sha256
value="b3d9832f5c11bbb6b0e62851b93aa29d278c39fb1a751eb771b46d004a216219"
origin="Generated by Gradle"/>
</artifact>
</component>
+ <component group="org.junit" name="junit-bom" version="6.0.1">
+ <artifact name="junit-bom-6.0.1.pom">
+ <sha256
value="e315c5ccbb087216dce04ae70c32bf1762be2a0b8a43ef81e3ba78317a4cd5c8"
origin="Generated by Gradle"/>
+ </artifact>
+ </component>
<component group="org.mockito" name="mockito-bom" version="5.20.0">
<artifact name="mockito-bom-5.20.0.pom">
<pgp value="147B691A19097624902F4EA9689CBE64F4BC997F"/>
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index 3c41ee3025..ca8b4d5ae4 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -26,7 +26,7 @@ javaPlatform {
}
dependencies {
- api(platform("org.junit:junit-bom:5.14.1"))
+ api(platform("org.junit:junit-bom:6.0.1"))
api(platform("org.springframework:spring-framework-bom:7.0.0"))
api(platform("org.eclipse.jetty:jetty-bom:11.0.26"))
diff --git
a/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java
b/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java
index 1a3ca4da8f..0dec494299 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/JSR223TestElementTest.java
@@ -18,11 +18,8 @@
package org.apache.jmeter.util;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledForJreRange;
-import org.junit.jupiter.api.condition.JRE;
public class JSR223TestElementTest {
@@ -30,15 +27,6 @@ public class JSR223TestElementTest {
private JSR223TestElement element = new JSR223TestElement() {
};
- @Test
- @DisabledForJreRange(min = JRE.JAVA_15, max = JRE.OTHER, disabledReason =
"The default JavaScript engine has been removed in Java 15+")
- public void testGetScriptEngineJS() throws Exception {
- element.setScriptLanguage("JavaScript");
- String languageName =
element.getScriptEngine().getFactory().getLanguageName();
- assertTrue(languageName.contains("Script"),
- () -> "getFactory().getLanguageName() should contain Script,
got " + languageName);
- }
-
@Test
public void testGetScriptEngineDefault() throws Exception {
element.setScriptLanguage("");
