This is an automated email from the ASF dual-hosted git repository.
fschumacher 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 da402ca Update Groovy to 3.0.3 and switch from groovy-all to single
jars
da402ca is described below
commit da402cab01797ffb09733550beb3d4103eebacaf
Author: Felix Schumacher <[email protected]>
AuthorDate: Thu May 7 19:53:30 2020 +0200
Update Groovy to 3.0.3 and switch from groovy-all to single jars
As a side-effect, we have to update Spock to 2.0-M2
Closes #590
---
checksum.xml | 2 ++
gradle.properties | 4 ++--
lib/aareadme.txt | 2 +-
src/bom/build.gradle.kts | 7 ++++++-
src/core/build.gradle.kts | 7 ++++++-
xdocs/changes.xml | 1 +
6 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/checksum.xml b/checksum.xml
index 392bb9c..a713c08 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -75,6 +75,7 @@
<trusted-key id='411063a3a0ffd119' group='org.apache-extras.beanshell' />
<trusted-key id='87a7f75a6a8ba5fc' group='org.apache.activemq' />
<trusted-key id='bff2ee42c8282e76' group='org.apache.activemq' />
+ <trusted-key id='ddbcc1270a29d081' group='org.apache.ant' />
<trusted-key id='86fdc7e2a11262cb' group='org.apache.bcel' />
<trusted-key id='3faad2cd5ecbb314' group='org.apache.commons' />
<trusted-key id='64a16faaec16a4be' group='org.apache.commons' />
@@ -140,6 +141,7 @@
<trusted-key id='cfca4a29d26468de' group='org.sonarsource.scanner.api' />
<trusted-key id='cfca4a29d26468de' group='org.sonarsource.scanner.gradle'
/>
<trusted-key id='72fefd1572eb75e1' group='org.spockframework' />
+ <trusted-key id='af0a94402ea0a67f' group='org.spockframework' />
<trusted-key id='9a2c7a98e457c53d' group='org.springframework' />
<trusted-key id='e4b53844e02b191b' group='org.swinglabs' />
<trusted-key id='a2115ae15f6b8b72' group='org.xmlunit' />
diff --git a/gradle.properties b/gradle.properties
index 9f00c21..27532dd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -74,7 +74,7 @@ freemarker.version=2.3.30
ftplet-api.version=1.1.1
ftpserver-core.version=1.1.1
geronimo-jms_1.1_spec.version=1.1.1
-groovy-all.version=2.4.18
+groovy.version=3.0.3
hamcrest.version=2.2
hamcrest-date.version=2.0.7
hsqldb.version=2.5.0
@@ -111,7 +111,7 @@ rhino.version=1.7.12
rsyntaxtextarea.version=3.1.0
Saxon-HE.version=9.9.1-7
slf4j.version=1.7.30
-spock-core.version=1.2-groovy-2.4
+spock-core.version=2.0-M2-groovy-3.0
springframework.version=4.3.17.RELEASE
svgSalamander.version=1.1.2.1
tika.version=1.24.1
diff --git a/lib/aareadme.txt b/lib/aareadme.txt
index 0235b29..924c4c8 100644
--- a/lib/aareadme.txt
+++ b/lib/aareadme.txt
@@ -102,7 +102,7 @@ dnsjava-2.1.9
https://github.com/dnsjava/dnsjava
- DNSCacheManager
-groovy-all-2.4.16
+groovy-3.0.3
----------------------
Advised scripting language for JSR223 Test Elements
diff --git a/src/bom/build.gradle.kts b/src/bom/build.gradle.kts
index a64e3a2..8b5695b 100644
--- a/src/bom/build.gradle.kts
+++ b/src/bom/build.gradle.kts
@@ -39,7 +39,13 @@ fun DependencyConstraintHandlerScope.runtimev(
) =
"runtime"(notation + ":" + versionProp.v)
+javaPlatform {
+ allowDependencies()
+}
+
dependencies {
+ api(platform("org.codehaus.groovy:groovy-bom:${"groovy".v}"))
+
// Parenthesis are needed here:
https://github.com/gradle/gradle/issues/9248
(constraints) {
// api means "the dependency is for both compilation and runtime"
@@ -87,7 +93,6 @@ dependencies {
apiv("javax.mail:mail")
apiv("jcharts:jcharts")
apiv("junit:junit", "junit4")
- apiv("org.codehaus.groovy:groovy-all")
apiv("org.junit.jupiter:junit-jupiter-api", "junit5")
apiv("org.junit.jupiter:junit-jupiter-params", "junit5")
runtimev("org.junit.jupiter:junit-jupiter-engine", "junit5")
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 1ced45e..0ea301f 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -57,9 +57,14 @@ dependencies {
because("XPathUtil: throws SaxonApiException")
}
- runtimeOnly("org.codehaus.groovy:groovy-all") {
+ runtimeOnly("org.codehaus.groovy:groovy") {
because("Groovy is a default JSR232 engine")
}
+ arrayOf("datetime", "jmx", "json", "jsr223", "sql", "templates").forEach {
+ runtimeOnly("org.codehaus.groovy:groovy-$it") {
+ because("Groovy is a default JSR232 engine")
+ }
+ }
implementation("com.fasterxml.jackson.core:jackson-annotations")
implementation("com.fasterxml.jackson.core:jackson-core")
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 54c3b0e..ac3a2ac 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -186,6 +186,7 @@ Counter Config, XPath2 Extractor, Function Helper Dialog,
Search popup, JMS Elem
<li><bug>64276</bug>Search popup: Improve UX</li>
<li><pr>573</pr>Improve the startup time: skip test plan UI
initialization</li>
<li><pr>585</pr>Added JEXL3 as a syntax alias for JSyntaxTextArea.
Contributed by drivera-armedia (https://github.com/drivera-armedia)</li>
+ <li><pr>590</pr>Update Groovy to 3.0.3.</li>
</ul>
<ch_section>Non-functional changes</ch_section>
