This is an automated email from the ASF dual-hosted git repository.
benw pushed a commit to branch gradle-improvements
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/gradle-improvements by this
push:
new ad47d3913 TAP5-2809: move module-specific deps to version catalogue
ad47d3913 is described below
commit ad47d39135dc240ab4256302ce66b2309e31cb3d
Author: Ben Weidig <[email protected]>
AuthorDate: Sun Nov 2 14:01:52 2025 +0100
TAP5-2809: move module-specific deps to version catalogue
Only tapestry-cdi has locally defined dependencies left
---
gradle/libs.versions.toml | 109 +++++++++++++++++++++++++++++------
tapestry-hibernate-core/build.gradle | 6 +-
tapestry-hibernate/build.gradle | 6 +-
tapestry-ioc-jcache/build.gradle | 18 ++----
tapestry-ioc/build.gradle | 1 -
tapestry-jpa/build.gradle | 15 ++---
tapestry-kaptcha/build.gradle | 6 +-
tapestry-mongodb/build.gradle | 12 +---
tapestry-runner/build.gradle | 21 +++----
tapestry-spring/build.gradle | 6 +-
tapestry-upload/build.gradle | 6 +-
tapestry-webresources/build.gradle | 15 ++---
12 files changed, 121 insertions(+), 100 deletions(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f800a706c..3dada68e0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,6 +4,8 @@
slf4j = "2.0.17"
+jboss-logging = "3.3.0.Final"
+
# JAKARTA
jakarta-annotation-api = "2.0.0"
@@ -12,23 +14,32 @@ jakarta-persistence-api = "3.0.0"
jakarta-servlet-api = "5.0.0"
jakarta-validation-api = "3.0.2"
jakarta-xml-bind-api = "2.3.2"
+jakarta-cdi-api = "3.0.1"
# APACHE COMMONS
-commons-cli = "1.10.0"
-commons-codec = "1.19.0"
-commons-httpclient = "4.5.14"
-commons-io = "2.20.0"
-commons-lang3 = "3.19.0"
-commons-logging = "1.3.5"
-commons-text = "1.14.0"
+commons-cli = "1.10.0"
+commons-codec = "1.19.0"
+commons-fileupload2 = "2.0.0-M1"
+commons-httpclient = "4.5.14"
+commons-io = "2.20.0"
+commons-lang3 = "3.19.0"
+commons-logging = "1.3.5"
+commons-text = "1.14.0"
-# DATABASE
+# DATABASE / PERSISTENCE
hibernate = "5.4.32.Final"
hibernate-validator = "8.0.1.Final"
hsqldb = "2.7.4"
+h2 = "2.1.3.175"
+dbcp = "6.0.32"
+eclipselink = "3.0.4"
+
+mongo-driver = "2.10.1"
+mongo-jongo = "0.3"
+mongo-embed = "1.28"
# ANTLR
@@ -42,6 +53,21 @@ ant-jsch = "1.10.15"
guava = "27.0.1-jre"
jackson = "2.20.0"
clojure = "1.12.2"
+jaxb-runtime = "2.3.2"
+kaptcha = "0.0.8"
+spring-websocket = "6.0.11"
+
+# IOC JCACHE
+
+javax-cache = "1.0.0"
+infinispan-jcache = "9.4.24.Final"
+
+# WEBRESOURCES
+
+closure-compiler = "v20220502"
+less4j = "1.12.0"
+auto-value-annotations = "1.9"
+rhino = "1.7.7.2"
# TESTING
@@ -66,9 +92,14 @@ quickstart-yasson = "2.0.4"
quickstart-maven-compiler = "3.8.1"
quickstart-maven-surefire = "3.1"
quickstart-maven-war = "3.3.1"
-quickstart-maven-jetty = "11.0.15"
+quickstart-maven-jetty = "11.0.16"
quickstart-gretty = "3.0.6"
+# RUNNER
+
+runner-jetty = "11.0.16"
+runner-tomcat = "10.1.13"
+
[libraries]
@@ -77,6 +108,9 @@ quickstart-gretty = "3.0.6"
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
slf4j-log4j12 = { module = "org.slf4j:slf4j-log4j12", version.ref = "slf4j" }
+jboss-logging = { module = "org.jboss.logging:jboss-logging", version.ref =
"jboss-logging" }
+
+
# JAKARTA
jakarta-annotation-api = { module =
"jakarta.annotation:jakarta.annotation-api", version.ref =
"jakarta-annotation-api" }
@@ -85,23 +119,32 @@ jakarta-persistence-api = { module =
"jakarta.persistence:jakarta.persistence-ap
jakarta-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api",
version.ref = "jakarta-servlet-api" }
jakarta-validation-api = { module =
"jakarta.validation:jakarta.validation-api", version.ref =
"jakarta-validation-api" }
jakarta-xml-bind-api = { module = "jakarta.xml.bind:jakarta.xml.bind-api",
version.ref = "jakarta-xml-bind-api" }
+jakarta-cdi-api = { module =
"jakarta.enterprise:jakarta.enterprise.cdi-api", version.ref =
"jakarta-cdi-api" }
# APACHE COMMONS
-commons-cli = { module = "commons-cli:commons-cli", version.ref =
"commons-cli" }
-commons-codec = { module = "commons-codec:commons-codec", version.ref =
"commons-codec" }
-commons-httpclient = { module = "org.apache.httpcomponents:httpclient",
version.ref = "commons-httpclient" }
-commons-io = { module = "commons-io:commons-io", version.ref =
"commons-io" }
-commons-lang3 = { module = "org.apache.commons:commons-lang3",
version.ref = "commons-lang3" }
-commons-logging = { module = "commons-logging:commons-logging", version.ref
= "commons-logging" }
-commons-text = { module = "org.apache.commons:commons-text", version.ref
= "commons-text" }
+commons-cli = { module = "commons-cli:commons-cli", version.ref =
"commons-cli" }
+commons-codec = { module = "commons-codec:commons-codec", version.ref =
"commons-codec" }
+commons-fileupload2 = { module =
"org.apache.commons:commons-fileupload2-jakarta", version.ref =
"commons-fileupload2" }
+commons-httpclient = { module = "org.apache.httpcomponents:httpclient",
version.ref = "commons-httpclient" }
+commons-io = { module = "commons-io:commons-io", version.ref =
"commons-io" }
+commons-lang3 = { module = "org.apache.commons:commons-lang3",
version.ref = "commons-lang3" }
+commons-logging = { module = "commons-logging:commons-logging",
version.ref = "commons-logging" }
+commons-text = { module = "org.apache.commons:commons-text",
version.ref = "commons-text" }
-# HIBERNATE
+# DATABASE/PERSISTENCE
hibernate-core = { module = "org.hibernate:hibernate-core", version.ref =
"hibernate" }
hibernate-validator = { module = "org.hibernate:hibernate-validator",
version.ref = "hibernate-validator" }
hsqldb = { module = "org.hsqldb:hsqldb", version.ref = "hsqldb" }
+h2 = { module = "com.h2database:h2", version.ref = "h2" }
+dbcp = { module = "org.apache.tomcat:dbcp", version.ref = "dbcp" }
+eclipselink = { module = "org.eclipse.persistence:eclipselink", version.ref =
"eclipselink" }
+
+mongo-driver = { module = "org.mongodb:mongo-java-driver", version.ref =
"mongo-driver" }
+mongo-jongo = { module = "org.jongo:jongo", version.ref = "mongo-jongo" }
+mongo-embed = { module = "de.flapdoodle.embed:de.flapdoodle.embed.mongo",
version.ref = "mongo-embed" }
# ANTLR
@@ -114,6 +157,24 @@ xml-apis = { module = "xml-apis:xml-apis", version.ref =
"xml-apis" }
ant-jsch = { module = "org.apache.ant:ant-jsch", version.ref = "ant-jsch" }
guava = { module = "com.google.guava:guava", version.ref = "guava" }
clojure = { module = "org.clojure:clojure", version.ref = "clojure" }
+jaxb-runtime = { module = "org.glassfish.jaxb:jaxb-runtime", version.ref =
"jaxb-runtime" }
+kaptcha = { module = "com.github.axet:kaptcha", version.ref = "kaptcha" }
+spring-websocket = { module = "org.springframework:spring-websocket",
version.ref = "spring-websocket" }
+
+# IOC JCACHE
+
+javax-cache-api = { module = "javax.cache:cache-api", version.ref =
"javax-cache" }
+javax-cache-tests = { module = "javax.cache:cache-tests", version.ref =
"javax-cache" }
+javax-cache-test-domain = { module = "javax.cache:test-domain", version.ref =
"javax-cache" }
+cache-annotations = { module = "org.jsr107.ri:cache-annotations-ri-common",
version.ref = "javax-cache" }
+infinispan-jcache = { module = "org.infinispan:infinispan-jcache", version.ref
= "infinispan-jcache" }
+
+# WEBRESOURCES
+
+closure-compiler = { module =
"com.google.javascript:closure-compiler-unshaded", version.ref =
"closure-compiler" }
+less4j = { module = "com.github.sommeri:less4j", version.ref =
"less4j" }
+auto-value-annotations = { module =
"com.google.auto.value:auto-value-annotations", version.ref =
"auto-value-annotations" }
+rhino = { module = "org.mozilla:rhino", version.ref = "rhino"
}
# GROOVY
@@ -151,6 +212,20 @@ selenium-java = { module =
"org.seleniumhq.selenium:selenium-java", version.r
selenium-legrc = { module = "org.seleniumhq.selenium:selenium-leg-rc",
version.ref = "selenium-legrc" }
webdrivermanager = { module = "io.github.bonigarcia:webdrivermanager",
version.ref = "webdrivermanager" }
+# RUNNER JETTY
+
+runner-jetty-server = { module = "org.eclipse.jetty:jettyserver", version.ref
= "runner-jetty" }
+runner-jetty-jndi = { module = "org.eclipse.jetty:jetty-jndi", version.ref =
"runner-jetty" }
+runner-jetty-plus = { module = "org.eclipse.jetty:jetty-plus", version.ref =
"runner-jetty" }
+runner-jetty-webapp = { module = "org.eclipse.jetty:jetty-webapp", version.ref
= "runner-jetty" }
+
+# RUNNER TOMCAT
+
+runner-tomcat-catalina = { module = "org.apache.tomcat:tomcat-catalina",
version.ref = "runner-tomcat" }
+runner-tomcat-coyote = { module = "org.apache.tomcat:tomcat-coyote",
version.ref = "runner-tomcat" }
+runner-tomcat-jasper = { module = "org.apache.tomcat:tomcat-jasper",
version.ref = "runner-tomcat" }
+runner-tomcat-dbcp = { module = "org.apache.tomcat:tomcat-dbcp",
version.ref = "runner-tomcat" }
+
[bundles]
diff --git a/tapestry-hibernate-core/build.gradle
b/tapestry-hibernate-core/build.gradle
index f89144f41..48aa01612 100644
--- a/tapestry-hibernate-core/build.gradle
+++ b/tapestry-hibernate-core/build.gradle
@@ -4,16 +4,12 @@ plugins {
description = 'Basic Hibernate services for Tapestry, useable outside of a
Tapestry web application'
-def moduleLibs = [
- jaxbRuntime: 'org.glassfish.jaxb:jaxb-runtime:2.3.2',
-]
-
dependencies {
implementation project(':tapestry-ioc')
api libs.hibernate.core
- implementation moduleLibs.jaxbRuntime
+ implementation libs.jaxb.runtime
testImplementation project(':tapestry-test')
testRuntimeOnly("${libs.hsqldb.get().module.group}:${libs.hsqldb.get().module.name}:${libs.hsqldb.get().version}:jdk8")
diff --git a/tapestry-hibernate/build.gradle b/tapestry-hibernate/build.gradle
index de74ab1cd..f6e08dd8b 100644
--- a/tapestry-hibernate/build.gradle
+++ b/tapestry-hibernate/build.gradle
@@ -4,15 +4,11 @@ plugins {
description = 'Provides support for simple CRUD applications built on top of
Tapestry and Hibernate'
-def moduleLibs = [
- jbossLogging: 'org.jboss.logging:jboss-logging:3.3.0.Final',
-]
-
dependencies {
api project(':tapestry-core')
api project(':tapestry-hibernate-core')
- implementation moduleLibs.jbossLogging
+ implementation libs.jboss.logging
testImplementation project(':tapestry-test')
testRuntimeOnly("${libs.hsqldb.get().module.group}:${libs.hsqldb.get().module.name}:${libs.hsqldb.get().version}:jdk8")
diff --git a/tapestry-ioc-jcache/build.gradle b/tapestry-ioc-jcache/build.gradle
index 0f8a8c7ef..81897ad15 100644
--- a/tapestry-ioc-jcache/build.gradle
+++ b/tapestry-ioc-jcache/build.gradle
@@ -4,23 +4,15 @@ plugins {
description = 'JCache (JSR 107) integration for Tapestry-IoC'
-def moduleLibs = [
- javaxCacheApi: 'javax.cache:cache-api:1.0.0',
- javaxCacheTests: 'javax.cache:cache-tests:1.0.0',
- javaxCacheDomain: 'javax.cache:test-domain:1.0.0',
- cacheAnnotations: 'org.jsr107.ri:cache-annotations-ri-common:1.0.0',
- infinispanJcache: 'org.infinispan:infinispan-jcache:9.4.24.Final',
-]
-
dependencies {
provided project(":tapestry-ioc")
- implementation moduleLibs.javaxCacheApi
- implementation moduleLibs.cacheAnnotations
+ implementation libs.javax.cache.api
+ implementation libs.cache.annotations
- testImplementation(moduleLibs.javaxCacheTests)
- testImplementation moduleLibs.javaxCacheDomain
- testRuntimeOnly moduleLibs.infinispanJcache /* Just to be able to run the
tests */
+ testImplementation libs.javax.cache.tests
+ testImplementation libs.javax.cache.test.domain
+ testRuntimeOnly libs.infinispan.jcache /* Just to be able to run the tests
*/
}
tasks.named('jar', Jar) {
diff --git a/tapestry-ioc/build.gradle b/tapestry-ioc/build.gradle
index e8a3e3ee6..722487afe 100644
--- a/tapestry-ioc/build.gradle
+++ b/tapestry-ioc/build.gradle
@@ -19,7 +19,6 @@ dependencies {
testImplementation libs.commons.lang3
testImplementation libs.hibernate.core
testRuntimeOnly("${libs.hsqldb.get().module.group}:${libs.hsqldb.get().module.name}:${libs.hsqldb.get().version}:jdk8")
-
}
tasks.named('test', Test) {
diff --git a/tapestry-jpa/build.gradle b/tapestry-jpa/build.gradle
index 309f5094d..d9ab3fa50 100644
--- a/tapestry-jpa/build.gradle
+++ b/tapestry-jpa/build.gradle
@@ -4,24 +4,17 @@ plugins {
description = 'Provides support for simple CRUD applications built on top of
Tapestry and JPA'
-def moduleLibs = [
- jakartaCdiApi: 'jakarta.enterprise:jakarta.enterprise.cdi-api:3.0.1',
- eclipselink: 'org.eclipse.persistence:eclipselink:3.0.4',
- dbcp: 'org.apache.tomcat:dbcp:6.0.32',
- h2: 'com.h2database:h2:1.3.175'
-]
-
dependencies {
implementation project(':tapestry-core')
api libs.jakarta.persistence.api
- implementation moduleLibs.jakartaCdiApi
+ implementation libs.jakarta.cdi.api
testImplementation project(':tapestry-test')
- testImplementation moduleLibs.eclipselink
+ testImplementation libs.eclipselink
- testRuntimeOnly moduleLibs.dbcp
- testRuntimeOnly moduleLibs.h2
+ testRuntimeOnly libs.dbcp
+ testRuntimeOnly libs.h2
}
(1..6).each {
diff --git a/tapestry-kaptcha/build.gradle b/tapestry-kaptcha/build.gradle
index 88c8a882c..355af5daa 100644
--- a/tapestry-kaptcha/build.gradle
+++ b/tapestry-kaptcha/build.gradle
@@ -4,14 +4,10 @@ plugins {
description = 'Kaptcha user verification support'
-def moduleLibs= [
- kaptcha: 'com.github.axet:kaptcha:0.0.8',
-]
-
dependencies {
implementation project(':tapestry-core')
- implementation moduleLibs.kaptcha
+ implementation libs.kaptcha
provided libs.jakarta.servlet.api
diff --git a/tapestry-mongodb/build.gradle b/tapestry-mongodb/build.gradle
index bd6e72126..0797dc2ee 100644
--- a/tapestry-mongodb/build.gradle
+++ b/tapestry-mongodb/build.gradle
@@ -6,20 +6,14 @@ import groovy.transform.AutoExternalize
description = 'Basic MongoDB services for Tapestry, useable outside of a
Tapestry web application'
-def moduleLibs = [
- mongoJavaDriver: 'org.mongodb:mongo-java-driver:2.10.1',
- jongo: 'org.jongo:jongo:0.3',
- embedMongo: 'de.flapdoodle.embed:de.flapdoodle.embed.mongo:1.28',
-]
-
dependencies {
implementation project(':tapestry-ioc')
- implementation moduleLibs.mongoJavaDriver
+ implementation libs.mongo.driver
testImplementation project(':tapestry-test')
- testImplementation moduleLibs.jongo
- testImplementation moduleLibs.embedMongo
+ testImplementation libs.mongo.jongo
+ testImplementation libs.mongo.embed
}
jar {
diff --git a/tapestry-runner/build.gradle b/tapestry-runner/build.gradle
index b597111c6..251b33767 100644
--- a/tapestry-runner/build.gradle
+++ b/tapestry-runner/build.gradle
@@ -1,22 +1,17 @@
description = 'Utilities for running a Tapestry application in Jetty or Tomcat
as part of test suite.'
-def moduleVersions = [
- jetty: '11.0.16',
- tomcat: '10.1.13',
-]
-
dependencies {
api project(':tapestry-test-constants')
- implementation "org.eclipse.jetty:jetty-server:${moduleVersions.jetty}"
- implementation "org.eclipse.jetty:jetty-jndi:${moduleVersions.jetty}"
- implementation "org.eclipse.jetty:jetty-plus:${moduleVersions.jetty}"
- implementation "org.eclipse.jetty:jetty-webapp:${moduleVersions.jetty}"
+ implementation libs.runner.jetty.server
+ implementation libs.runner.jetty.jndi
+ implementation libs.runner.jetty.plus
+ implementation libs.runner.jetty.webapp
- implementation "org.apache.tomcat:tomcat-catalina:${moduleVersions.tomcat}"
- implementation "org.apache.tomcat:tomcat-coyote:${moduleVersions.tomcat}"
- implementation "org.apache.tomcat:tomcat-jasper:${moduleVersions.tomcat}"
+ implementation libs.runner.tomcat.catalina
+ implementation libs.runner.tomcat.coyote
+ implementation libs.runner.tomcat.jasper
+ implementation libs.runner.tomcat.dbcp
- implementation "org.apache.tomcat:tomcat-dbcp:${moduleVersions.tomcat}"
implementation libs.commons.cli
}
diff --git a/tapestry-spring/build.gradle b/tapestry-spring/build.gradle
index 7385ee42c..9471f9d33 100644
--- a/tapestry-spring/build.gradle
+++ b/tapestry-spring/build.gradle
@@ -8,15 +8,11 @@ description = 'Integration of Tapestry with the Spring
Inversion Of Control Cont
sourceCompatibility = '17'
targetCompatibility = '17'
-def moduleLibs = [
- springWebsocket: 'org.springframework:spring-websocket:6.0.11',
-]
-
dependencies {
implementation project(':tapestry-core')
implementation project(':tapestry-ioc')
- implementation moduleLibs.springWebsocket
+ implementation libs.spring.websocket
provided libs.jakarta.servlet.api
diff --git a/tapestry-upload/build.gradle b/tapestry-upload/build.gradle
index 69a9e7443..fdd1458d1 100644
--- a/tapestry-upload/build.gradle
+++ b/tapestry-upload/build.gradle
@@ -4,16 +4,12 @@ plugins {
description = 'File Upload component, with supporting services'
-def moduleLibs = [
- commonsFileupload2:
'org.apache.commons:commons-fileupload2-jakarta:2.0.0-M1',
-]
-
dependencies {
implementation project(':tapestry-core')
implementation libs.commons.io
- api moduleLibs.commonsFileupload2
+ api libs.commons.fileupload2
provided libs.jakarta.servlet.api
diff --git a/tapestry-webresources/build.gradle
b/tapestry-webresources/build.gradle
index 943d36fdb..f7d063c8a 100644
--- a/tapestry-webresources/build.gradle
+++ b/tapestry-webresources/build.gradle
@@ -5,22 +5,15 @@ plugins {
description = 'Integration with WRO4J to perform runtime CoffeeScript
compilation, JavaScript minimization, and more.'
-def moduleLibs = [
- closureCompiler:
'com.google.javascript:closure-compiler-unshaded:v20220502',
- less4j: 'com.github.sommeri:less4j:1.12.0',
- autoValueAnnotations: 'com.google.auto.value:auto-value-annotations:1.9',
- rhino: 'org.mozilla:rhino:1.7.7.2',
-]
-
dependencies {
api project(':tapestry-core')
- api moduleLibs.closureCompiler
+ api libs.closure.compiler
- implementation moduleLibs.less4j
- implementation moduleLibs.rhino
+ implementation libs.less4j
+ implementation libs.rhino
- compileOnly moduleLibs.autoValueAnnotations
+ compileOnly libs.auto.value.annotations
testImplementation project(':tapestry-test')
testImplementation project(':tapestry-runner')
