This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 f05baec build.gradle.kts in core,functions,components,protocol: Fix
dependencies for pom generation and remove version
f05baec is described below
commit f05baec58fa278479108c2929e622a5b8cfe2157
Author: pmouawad <[email protected]>
AuthorDate: Sat Nov 9 22:17:22 2019 +0100
build.gradle.kts in core,functions,components,protocol: Fix dependencies
for pom generation and remove version
---
src/components/build.gradle.kts | 5 ++++-
src/core/build.gradle.kts | 2 ++
src/functions/build.gradle.kts | 6 +++---
src/protocol/build.gradle.kts | 24 +++++++++++++-----------
4 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/src/components/build.gradle.kts b/src/components/build.gradle.kts
index 9e67360..dc1a3c8 100644
--- a/src/components/build.gradle.kts
+++ b/src/components/build.gradle.kts
@@ -36,8 +36,9 @@ dependencies {
// This is an API-only jar. javax.activation is present in Java 8,
// however it is not there in Java 9
compileOnly("javax.activation:javax.activation-api")
-
implementation("com.github.ben-manes.caffeine:caffeine")
+ implementation("com.miglayout:miglayout-core")
+ implementation("com.miglayout:miglayout-swing")
implementation("io.burt:jmespath-core")
implementation("io.burt:jmespath-jackson")
implementation("jcharts:jcharts")
@@ -53,6 +54,7 @@ dependencies {
implementation("org.apache.httpcomponents:httpcore-nio")
implementation("org.jsoup:jsoup")
implementation("org.apache.commons:commons-lang3")
+ implementation("org.ow2.asm:asm")
implementation("net.sf.jtidy:jtidy")
implementation("commons-collections:commons-collections")
implementation("org.apache.commons:commons-math3")
@@ -62,6 +64,7 @@ dependencies {
implementation("org.apache.commons:commons-text") {
because("StringEscapeUtils")
}
+ implementation("xalan:serializer:xalan")
// we use bcmail for compilation only, and bcmail is not shipped in the
release
compileOnly("org.bouncycastle:bcmail-jdk15on")
compileOnly("org.bouncycastle:bcpkix-jdk15on")
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 9e578a8..f41b96e 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -79,6 +79,8 @@ dependencies {
implementation("org.apache.commons:commons-math3") {
because("Mean, DescriptiveStatistics")
}
+ implementation("xmlpull:xmlpull")
+ implementation("xpp3:xpp3_min")
// For some reason JMeter bundles just tika-core and tika-parsers without
transitive
// dependencies. So we exclude those
implementation("org.apache.tika:tika-core") {
diff --git a/src/functions/build.gradle.kts b/src/functions/build.gradle.kts
index b5b588c..1c345ef 100644
--- a/src/functions/build.gradle.kts
+++ b/src/functions/build.gradle.kts
@@ -22,8 +22,8 @@ dependencies {
implementation("org.mozilla:rhino")
implementation("commons-codec:commons-codec")
- implementation("org.apache.commons:commons-jexl:2.1.1")
- implementation("org.apache.commons:commons-jexl3:3.1")
+ implementation("org.apache.commons:commons-jexl")
+ implementation("org.apache.commons:commons-jexl3")
implementation("org.apache.commons:commons-lang3") {
because("StringUtils")
}
@@ -36,5 +36,5 @@ dependencies {
implementation("com.github.ben-manes.caffeine:caffeine")
implementation("oro:oro")
testImplementation("org.hamcrest:hamcrest-core:1.3")
- testImplementation("org.exparity:hamcrest-date:2.0.4")
+ testImplementation("org.exparity:hamcrest-date")
}
diff --git a/src/protocol/build.gradle.kts b/src/protocol/build.gradle.kts
index 959d26d..90d60dd 100644
--- a/src/protocol/build.gradle.kts
+++ b/src/protocol/build.gradle.kts
@@ -34,7 +34,7 @@ project("bolt") {
project("ftp") {
dependencies {
- implementation("commons-net:commons-net:3.6")
+ implementation("commons-net:commons-net")
implementation("commons-io:commons-io") {
because("IOUtils")
}
@@ -72,18 +72,20 @@ project("http") {
implementation("org.jsoup:jsoup")
implementation("oro:oro")
implementation("commons-collections:commons-collections")
- implementation("commons-net:commons-net:3.6")
- implementation("com.helger:ph-commons:9.2.1") {
+ implementation("commons-net:commons-net")
+ implementation("com.helger:ph-commons") {
// We don't really need to use/distribute jsr305
exclude("com.google.code.findbugs", "jsr305")
}
- implementation("com.helger:ph-css:6.1.1") {
+ implementation("com.helger:ph-css") {
// We don't really need to use/distribute jsr305
exclude("com.google.code.findbugs", "jsr305")
}
- implementation("dnsjava:dnsjava:2.1.8")
- implementation("org.apache.httpcomponents:httpmime:4.5.8")
- implementation("org.brotli:dec:0.1.2")
+ implementation("dnsjava:dnsjava")
+ implementation("org.apache.httpcomponents:httpclient")
+ implementation("org.apache.httpcomponents:httpcore")
+ implementation("org.apache.httpcomponents:httpmime")
+ implementation("org.brotli:dec")
testImplementation(testFixtures(project(":src:testkit-wiremock")))
testImplementation("com.github.tomakehurst:wiremock-jre8")
}
@@ -102,7 +104,7 @@ project("java") {
project("jdbc") {
dependencies {
- implementation("org.apache.commons:commons-dbcp2:2.5.0")
+ implementation("org.apache.commons:commons-dbcp2")
implementation("org.apache.commons:commons-lang3") {
because("StringUtils, ObjectUtils")
}
@@ -120,7 +122,7 @@ project("jms") {
}
// TODO: technically speaking, jms_1.1_spec should be compileOnly
// since we either include a JMS implementation or we can't use JMS at
all
- implementation("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1")
+ implementation("org.apache.geronimo.specs:geronimo-jms_1.1_spec")
implementation("org.apache.commons:commons-lang3") {
because("StringUtils")
}
@@ -161,7 +163,7 @@ project("ldap") {
project("mail") {
dependencies {
- api("javax.mail:mail:1.5.0-b01") {
+ api("javax.mail:mail") {
exclude("javax.activation", "activation")
}
// There's no javax.activation:activation:1.2.0, so we use com.sun...
@@ -180,7 +182,7 @@ project("mail") {
project("mongodb") {
dependencies {
- api("org.mongodb:mongo-java-driver:2.11.3")
+ api("org.mongodb:mongo-java-driver")
implementation("org.apache.commons:commons-lang3") {
because("StringUtils")
}
