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 d05d6161cb chore: move more testing-specific constraints to bom-testing
d05d6161cb is described below
commit d05d6161cb5fb4707b37993962f67c826b90fb09
Author: Vladimir Sitnikov <[email protected]>
AuthorDate: Fri Apr 28 20:50:00 2023 +0300
chore: move more testing-specific constraints to bom-testing
---
renovate.json | 4 ++++
src/bom-testing/build.gradle.kts | 14 +++++++++++---
src/bom-thirdparty/build.gradle.kts | 11 -----------
src/dist-check/build.gradle.kts | 1 +
4 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/renovate.json b/renovate.json
index ee93eef621..ca09f37145 100644
--- a/renovate.json
+++ b/renovate.json
@@ -30,6 +30,10 @@
"matchPackagePrefixes": ["org.apache.activemq"],
"groupName": "org.apache.activemq"
},
+ {
+ "matchPackagePrefixes": ["org.apache.ftpserver"],
+ "groupName": "org.apache.ftpserver"
+ },
{
"matchPackagePrefixes": ["org.apache.httpcomponents"],
"groupName": "org.apache.httpcomponents"
diff --git a/src/bom-testing/build.gradle.kts b/src/bom-testing/build.gradle.kts
index eb0702f7bc..a28f643087 100644
--- a/src/bom-testing/build.gradle.kts
+++ b/src/bom-testing/build.gradle.kts
@@ -38,14 +38,22 @@ dependencies {
// then it should be declared as "api" here since we use
useCompileClasspathVersions
// to make runtime classpath consistent with the compile one.
api("com.github.tomakehurst:wiremock-jre8:2.35.0")
-
api("junit:junit:4.13.2")
-
api("nl.jqno.equalsverifier:equalsverifier:3.14.1")
- api("org.hamcrest:hamcrest:2.2")
+ // activemq-all should not be used as it provides secondary slf4j
binding
+ api("org.apache.activemq:activemq-broker:5.16.4")
+ api("org.apache.activemq:activemq-client:5.16.4")
+ api("org.apache.activemq:activemq-spring:5.16.4")
+ api("org.apache.ftpserver:ftplet-api:1.2.0")
+ api("org.apache.ftpserver:ftpserver-core:1.2.0")
+ api("org.apache.mina:mina-core:2.1.6")
api("org.hamcrest:hamcrest-core:2.2")
api("org.hamcrest:hamcrest-library:2.2")
+ api("org.hamcrest:hamcrest:2.2")
+ api("org.hsqldb:hsqldb:2.5.2")
api("org.objenesis:objenesis:3.3")
api("org.spockframework:spock-core:2.2-groovy-3.0")
+ api("org.springframework:spring-beans:4.3.17.RELEASE")
+ api("org.springframework:spring-context:4.3.17.RELEASE")
}
}
diff --git a/src/bom-thirdparty/build.gradle.kts
b/src/bom-thirdparty/build.gradle.kts
index 74f7ce9914..fea5e9c21a 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -40,13 +40,6 @@ dependencies {
// to make runtime classpath consistent with the compile one.
api("org.ow2.asm:asm:9.5")
- // activemq-all should not be used as it provides secondary slf4j
binding
- api("org.apache.activemq:activemq-broker:5.16.4")
- api("org.apache.activemq:activemq-client:5.16.4")
- api("org.apache.activemq:activemq-spring:5.16.4")
- api("org.springframework:spring-context:4.3.17.RELEASE")
- api("org.springframework:spring-beans:4.3.17.RELEASE")
-
api("bsf:bsf:2.4.0")
api("cglib:cglib-nodep:3.3.0")
api("com.fasterxml.jackson.core:jackson-annotations:2.13.4")
@@ -95,8 +88,6 @@ dependencies {
api("org.apache.commons:commons-math3:3.6.1")
api("org.apache.commons:commons-pool2:2.11.1")
api("org.apache.commons:commons-text:1.10.0")
- api("org.apache.ftpserver:ftplet-api:1.2.0")
- api("org.apache.ftpserver:ftpserver-core:1.2.0")
api("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1")
api("org.apache.httpcomponents:httpasyncclient:4.1.5")
api("org.apache.httpcomponents:httpclient:4.5.13")
@@ -107,7 +98,6 @@ dependencies {
api("org.apache.logging.log4j:log4j-api:2.17.2")
api("org.apache.logging.log4j:log4j-core:2.17.2")
api("org.apache.logging.log4j:log4j-slf4j-impl:2.17.2")
- api("org.apache.mina:mina-core:2.1.6")
api("org.apache.rat:apache-rat:0.15")
api("org.apache.tika:tika-core:1.28.5")
api("org.apache.tika:tika-parsers:1.28.5")
@@ -120,7 +110,6 @@ dependencies {
api("org.brotli:dec:0.1.2")
api("org.exparity:hamcrest-date:2.0.8")
api("org.freemarker:freemarker:2.3.32")
- api("org.hsqldb:hsqldb:2.5.2")
api("org.jdom:jdom:1.1.3")
api("org.jodd:jodd-core:5.1.5")
api("org.jodd:jodd-lagarto:5.1.5")
diff --git a/src/dist-check/build.gradle.kts b/src/dist-check/build.gradle.kts
index bbbb688d17..cd146f844d 100644
--- a/src/dist-check/build.gradle.kts
+++ b/src/dist-check/build.gradle.kts
@@ -43,6 +43,7 @@ dependencies {
}
extraTestDependencies(platform(projects.src.bomThirdparty))
+ extraTestDependencies(platform(projects.src.bomTesting))
extraTestDependencies("org.hsqldb:hsqldb")
extraTestDependencies("org.apache.mina:mina-core")
extraTestDependencies("org.apache.ftpserver:ftplet-api")
