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
The following commit(s) were added to refs/heads/gradle-improvements-javax by
this push:
new 1c278a254 TAP5-2809: move module-specific deps to version catalogue
1c278a254 is described below
commit 1c278a254c1a2b82f835e668807eafd36515bc98
Author: Ben Weidig <[email protected]>
AuthorDate: Sun Nov 2 14:32:26 2025 +0100
TAP5-2809: move module-specific deps to version catalogue
Only tapestry-cdi has locally defined dependencies left
---
build.gradle | 7 ++++
gradle/libs.versions.toml | 81 +++++++++++++++++++++++++++++++++++-
tapestry-hibernate-core/build.gradle | 6 +--
tapestry-hibernate/build.gradle | 6 +--
tapestry-ioc-jcache/build.gradle | 18 +++-----
tapestry-jpa/build.gradle | 18 +++-----
tapestry-kaptcha/build.gradle | 6 +--
tapestry-mongodb/build.gradle | 12 ++----
tapestry-runner/build.gradle | 21 ++++------
tapestry-spring/build.gradle | 5 +--
tapestry-upload/build.gradle | 6 +--
tapestry-webresources/build.gradle | 8 ++--
12 files changed, 116 insertions(+), 78 deletions(-)
diff --git a/build.gradle b/build.gradle
index fe00c0996..d2bbb7f2b 100755
--- a/build.gradle
+++ b/build.gradle
@@ -575,3 +575,10 @@ tasks.register('updateBootstrap') {
}
}
}
+
+
+tasks.register('depsAll') {
+ group = 'help'
+ description = 'Print dependency trees for every project (respects
--configuration)'
+ dependsOn allprojects.collect { "${it.path}:dependencies" }
+}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0a5d778ed..b302c0dcd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,8 +4,11 @@
slf4j = "2.0.17"
+jboss-logging = "3.3.0.Final"
+
# JAVAX/JAKARTA
+javax-cdi-api = "1.2"
javax-inject = "1"
javax-persistence-api = "2.2"
javax-servlet-api = "3.0.1"
@@ -18,18 +21,27 @@ jakarta-xml-bind-api = "2.3.2"
commons-cli = "1.10.0"
commons-codec = "1.19.0"
+commons-fileupload = "1.5"
commons-httpclient = "4.5.14"
commons-io = "2.20.0"
commons-lang3 = "3.19.0"
commons-logging = "1.3.5"
commons-text = "1.40.0"
-# DATABASE
+# DATABASE/PERSISTENCE
hibernate = "5.4.32.Final"
hibernate-validator = "4.3.2.Final"
hsqldb = "2.7.4"
+h2 = "2.1.3.175"
+dbcp = "6.0.32"
+eclipselink = "2.7.7"
+jpa-specs = "1.1"
+
+mongo-driver = "2.10.1"
+mongo-jongo = "0.3"
+mongo-embed = "1.28"
# ANTLR
@@ -43,6 +55,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-web = "3.2.9.RELEASE"
+
+# IOC JCACHE
+
+javax-cache = "1.0.0"
+infinispan-jcache = "7.0.0.Alpha4"
+
+# WEBRESOURCES
+
+closure-compiler = "v20220502"
+less4j = "1.12.0"
+auto-value-annotations = "1.9"
+rhino = "1.7.7.2"
# TESTING
@@ -70,6 +97,12 @@ quickstart-maven-war = "3.3.1"
quickstart-maven-jetty = "10.0.6"
quickstart-gretty = "3.0.6"
+# RUNNER
+
+runner-jetty = "8.1.19.v20160209"
+runner-tomcat = "7.0.70"
+
+
[libraries]
# LOGGING
@@ -77,8 +110,11 @@ 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" }
+
# JAVAX/JAKARTA
+javax-cdi-api = { module = "javax.enterprise:cdi-api", version.ref =
"javax-cdi-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" }
@@ -91,18 +127,27 @@ jakarta-xml-bind-api = { module =
"jakarta.xml.bind:jakarta.xml.bind-api", ve
commons-cli = { module = "commons-cli:commons-cli", version.ref =
"commons-cli" }
commons-codec = { module = "commons-codec:commons-codec", version.ref =
"commons-codec" }
+commons-fileupload = { module = "commons-fileupload:commons-fileupload",
version.ref = "commons-fileupload" }
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" }
+jpa-specs = { module = "org.apache.geronimo.specs:geronimo-jpa_2.0_spec",
version.ref = "jpa-specs" }
+
+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
@@ -115,6 +160,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-web = { module = "org.springframework:spring-web", version.ref =
"spring-web" }
+
+# 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
@@ -152,6 +215,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 6d10137f7..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:7.0.0.Alpha4',
-]
-
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-jpa/build.gradle b/tapestry-jpa/build.gradle
index 5e402d261..f7cd9e475 100644
--- a/tapestry-jpa/build.gradle
+++ b/tapestry-jpa/build.gradle
@@ -4,26 +4,18 @@ plugins {
description = 'Provides support for simple CRUD applications built on top of
Tapestry and JPA'
-def moduleLibs = [
- jpaSpecs: 'org.apache.geronimo.specs:geronimo-jpa_2.0_spec:1.1',
- javaxCdiApi: 'javax.enterprise:cdi-api:1.2',
- eclipselink: 'org.eclipse.persistence:eclipselink:2.7.7',
- dbcp: 'org.apache.tomcat:dbcp:6.0.32',
- h2: 'com.h2database:h2:1.3.175'
-]
-
dependencies {
implementation project(':tapestry-core')
api libs.javax.persistence.api
- implementation moduleLibs.jpaSpecs
- implementation moduleLibs.javaxCdiApi
+ implementation libs.jpa.specs
+ implementation libs.javax.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 8ccbd8a4a..bb011c385 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.javax.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 1391e5b0c..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: '8.1.19.v20160209',
- tomcat: '7.0.70',
-]
-
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 fd0346f6a..248e3d049 100644
--- a/tapestry-spring/build.gradle
+++ b/tapestry-spring/build.gradle
@@ -4,13 +4,10 @@ plugins {
description = 'Integration of Tapestry with the Spring Inversion Of Control
Container'
-def moduleLibs = [
- springWeb: 'org.springframework:spring-web:3.2.9.RELEASE',
-]
dependencies {
implementation project(':tapestry-core')
- implementation moduleLibs.springWeb
+ implementation libs.spring.web
provided libs.javax.servlet.api
diff --git a/tapestry-upload/build.gradle b/tapestry-upload/build.gradle
index 048f8e0a2..6873b19c6 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 = [
- commonsFileupload: 'commons-fileupload:commons-fileupload:1.5',
-]
-
dependencies {
implementation project(':tapestry-core')
implementation libs.commons.io
- api moduleLibs.commonsFileupload
+ api libs.commons.fileupload
provided libs.javax.servlet.api
diff --git a/tapestry-webresources/build.gradle
b/tapestry-webresources/build.gradle
index 943d36fdb..7be729f9d 100644
--- a/tapestry-webresources/build.gradle
+++ b/tapestry-webresources/build.gradle
@@ -15,12 +15,12 @@ def moduleLibs = [
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')
