You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2023/04/29 13:42:31 UTC

[jmeter] branch master updated (a98091243a -> 5d18b2ce1e)

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


    from a98091243a chore: use hsqldb-jdk8 for compatibility with Java 8
     new e52305d6a4 chore: use proper junit5 dependencies so the jupiter engine is added to test runtime classpath
     new 5d18b2ce1e Revert "fix(deps): update dependency org.apache.commons:commons-jexl3 to v3.3 (#5851)"

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts | 3 +--
 src/bom-thirdparty/build.gradle.kts                                | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)


[jmeter] 02/02: Revert "fix(deps): update dependency org.apache.commons:commons-jexl3 to v3.3 (#5851)"

Posted by vl...@apache.org.
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

commit 5d18b2ce1ea56c638666ac8b543bc7dcd66fd513
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Sat Apr 29 16:42:00 2023 +0300

    Revert "fix(deps): update dependency org.apache.commons:commons-jexl3 to v3.3 (#5851)"
    
    This reverts commit 3188e93fab5cb138203fb43ed104667a081ab398.
---
 src/bom-thirdparty/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bom-thirdparty/build.gradle.kts b/src/bom-thirdparty/build.gradle.kts
index a7ef4f6a7f..ae5fab054d 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -93,7 +93,7 @@ dependencies {
         api("org.apache-extras.beanshell:bsh:2.0b6")
         api("org.apache.commons:commons-collections4:4.4")
         api("org.apache.commons:commons-dbcp2:2.9.0")
-        api("org.apache.commons:commons-jexl3:3.3")
+        api("org.apache.commons:commons-jexl3:3.2.1")
         api("org.apache.commons:commons-jexl:2.1.1")
         api("org.apache.commons:commons-lang3:3.12.0")
         api("org.apache.commons:commons-math3:3.6.1")


[jmeter] 01/02: chore: use proper junit5 dependencies so the jupiter engine is added to test runtime classpath

Posted by vl...@apache.org.
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

commit e52305d6a4a867ad96e374fadeffe0b67e514894
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Sat Apr 29 16:41:44 2023 +0300

    chore: use proper junit5 dependencies so the jupiter engine is added to test runtime classpath
---
 build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts b/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
index 135f4da52f..de1a35b40c 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts
@@ -24,8 +24,7 @@ plugins {
 
 dependencies {
     testImplementation("junit:junit")
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
-    testImplementation("org.junit.jupiter:junit-jupiter-params")
+    testImplementation("org.junit.jupiter:junit-jupiter")
     testImplementation("org.hamcrest:hamcrest")
     testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 }