This is an automated email from the ASF dual-hosted git repository. benw pushed a commit to branch gradle-improvements-javax in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit ed3dd34e2050f1922671ec13cba0bee99d90b459 Author: Ben Weidig <[email protected]> AuthorDate: Sat Sep 13 16:57:55 2025 +0200 TAP5-2809: Groovy 4 --- build.gradle | 2 ++ .../groovy/tapestry.junit5-spock-convention.gradle | 2 ++ gradle/libs.versions.toml | 35 +++++++++++++++------- tapestry-spock/build.gradle | 2 ++ 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 300c62ef3..fe00c0996 100755 --- a/build.gradle +++ b/build.gradle @@ -108,6 +108,8 @@ subprojects { dependencies { implementation libs.slf4j.api + implementation libs.bundles.groovy + } tasks.withType(GroovyCompile).configureEach { diff --git a/buildSrc/src/main/groovy/tapestry.junit5-spock-convention.gradle b/buildSrc/src/main/groovy/tapestry.junit5-spock-convention.gradle index 3f58f33c0..1570598ef 100644 --- a/buildSrc/src/main/groovy/tapestry.junit5-spock-convention.gradle +++ b/buildSrc/src/main/groovy/tapestry.junit5-spock-convention.gradle @@ -4,6 +4,8 @@ plugins { } dependencies { + testImplementation libs.bundles.groovy + testImplementation platform(libs.spock.bom) testImplementation libs.spock.core } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b0055439f..c3246addf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,13 +6,13 @@ slf4j = "1.7.25" # JAVAX/JAKARTA -javax-inject = "1" -javax-servlet-api = "3.0.1" -javax-validation-api = "1.0.0.GA" +javax-inject = "1" +javax-persistence-api = "2.2" +javax-servlet-api = "3.0.1" +javax-validation-api = "1.0.0.GA" -jakarta-annotation-api = "1.3.4" -jakarta-persistence-api = "3.0.0" -jakarta-xml-bind-api = "2.3.2" +jakarta-annotation-api = "1.3.4" +jakarta-xml-bind-api = "2.3.2" # APACHE COMMONS @@ -43,6 +43,7 @@ hamcrest-core = "1.3" json = "20140107" xml-apis = "1.4.01" guice = "3.0" +groovy = "4.0.27" ant-jsch = "1.8.2" guava = "27.0.1-jre" jackson = "2.13.1" @@ -56,7 +57,7 @@ junit5 = "5.10.2" junit4 = "4.13.2" testng = "7.5.1" easymock = "5.4.0" -spock = "2.3-groovy-3.0" +spock = "2.3-groovy-4.0" geb = "2.0" webdrivermanager = "5.3.1" selenium = "4.5.0" @@ -84,12 +85,12 @@ slf4j-log4j12 = { module = "org.slf4j:slf4j-log4j12", version.ref = "slf4j" } # JAVAX/JAKARTA -javax-inject = { module = "javax.inject:javax.inject", version.ref = "javax-inject" } -javax-servlet-api = { module = "javax.servlet:javax.servlet-api", version.ref = "javax-servlet-api" } -javax-validation-api = { module = "javax.validation:validation-api", version.ref = "javax-validation-api" } +javax-inject = { module = "javax.inject:javax.inject", version.ref = "javax-inject" } +javax-persistence-api = { module = "javax.persistence:javax.persistence-api", version.ref = "javax-persistence-api" } +javax-servlet-api = { module = "javax.servlet:javax.servlet-api", version.ref = "javax-servlet-api" } +javax-validation-api = { module = "javax.validation:validation-api", version.ref = "javax-validation-api" } jakarta-annotation-api = { module = "jakarta.annotation:jakarta.annotation-api", version.ref = "jakarta-annotation-api" } -jakarta-persistence-api = { module = "jakarta.persistence:jakarta.persistence-api", version.ref = "jakarta-persistence-api" } jakarta-xml-bind-api = { module = "jakarta.xml.bind:jakarta.xml.bind-api", version.ref = "jakarta-xml-bind-api" } # APACHE COMMONS @@ -127,6 +128,12 @@ guava = { module = "com.google.guava:guava", version.ref = "guava" } clojure = { module = "org.clojure:clojure", version.ref = "clojure" } httpcomponents-httpclient = { module = "org.apache.httpcomponents:httpclient", version.ref = "httpcomponents-httpclient" } +# GROOVY + +groovy-core = { module = "org.apache.groovy:groovy", version.ref = "groovy" } +groovy-json = { module = "org.apache.groovy:groovy-json", version.ref = "groovy" } +groovy-nio = { module = "org.apache.groovy:groovy-nio", version.ref = "groovy" } + # JACKSON jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" } @@ -162,6 +169,12 @@ webdrivermanager = { module = "io.github.bonigarcia:webdrivermanager", version.r [bundles] +groovy = [ + "groovy-core", + "groovy-json", + "groovy-nio" +] + junit-jupiter-essentials = [ "junit-jupiter-api", "junit-jupiter-params" diff --git a/tapestry-spock/build.gradle b/tapestry-spock/build.gradle index 50a9a60c8..d9c32a07d 100644 --- a/tapestry-spock/build.gradle +++ b/tapestry-spock/build.gradle @@ -9,6 +9,8 @@ dependencies { provided project(':commons') provided project(':tapestry-ioc') + api libs.bundles.groovy + api platform(libs.spock.bom) api libs.spock.core
