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 169412ebc TAP5-2809: audit, align, and prune dependencies
169412ebc is described below
commit 169412ebcad5334735e008367effc40d909c674e
Author: Ben Weidig <[email protected]>
AuthorDate: Fri Oct 3 15:23:04 2025 +0200
TAP5-2809: audit, align, and prune dependencies
Several dependencies were updated to their latest compatible version:
- Slf4j
- Apache Commons
- org.json (only used as constraint)
- Groovy
- Hsqldb
- Clojure
- ...
Others were removed, as they either weren't in use anymore, or only
served as a constraint that's no longer necessary:
- cglib
- Guice
- snakeyaml
- harmcrest
commons-httpclient was replaced with the Apache commons variant.
---
.../main/groovy/tapestry.java-convention.gradle | 4 --
.../tapestry.junit4-legacy-convention.gradle | 1 -
.../main/groovy/tapestry.junit5-convention.gradle | 1 +
.../main/groovy/tapestry.testng-convention.gradle | 1 -
gradle/libs.versions.toml | 78 +++++++++-------------
quickstart/build.gradle | 1 -
.../archetype-resources/pom-spring-boot.xml | 1 -
.../resources-filtered/archetype-resources/pom.xml | 1 -
tapestry-core/build.gradle | 3 +-
tapestry-http/build.gradle | 1 -
10 files changed, 34 insertions(+), 58 deletions(-)
diff --git a/buildSrc/src/main/groovy/tapestry.java-convention.gradle
b/buildSrc/src/main/groovy/tapestry.java-convention.gradle
index b94a82142..d06cbb6ca 100644
--- a/buildSrc/src/main/groovy/tapestry.java-convention.gradle
+++ b/buildSrc/src/main/groovy/tapestry.java-convention.gradle
@@ -38,14 +38,10 @@ eclipse.classpath.plusConfigurations +=
[configurations.provided]
// The versions themselves are defined in `gradle/libs.versions.toml`.
dependencies {
constraints {
- implementation libs.cglib.nodep
implementation libs.commons.codec
implementation libs.commons.io
implementation libs.commons.logging
implementation("${libs.hsqldb.get().module.group}:${libs.hsqldb.get().module.name}:${libs.hsqldb.get().version}:jdk8")
- implementation libs.hamcrest.core
- implementation libs.json
- implementation libs.snakeyaml
implementation libs.xml.apis
}
}
diff --git a/buildSrc/src/main/groovy/tapestry.junit4-legacy-convention.gradle
b/buildSrc/src/main/groovy/tapestry.junit4-legacy-convention.gradle
index 436efdc53..54b2d6577 100644
--- a/buildSrc/src/main/groovy/tapestry.junit4-legacy-convention.gradle
+++ b/buildSrc/src/main/groovy/tapestry.junit4-legacy-convention.gradle
@@ -4,7 +4,6 @@ plugins {
dependencies {
testImplementation libs.junit4
- testImplementation libs.hamcrest.core
}
tasks.withType(Test).configureEach {
diff --git a/buildSrc/src/main/groovy/tapestry.junit5-convention.gradle
b/buildSrc/src/main/groovy/tapestry.junit5-convention.gradle
index 0d2bf88de..59c163eb6 100644
--- a/buildSrc/src/main/groovy/tapestry.junit5-convention.gradle
+++ b/buildSrc/src/main/groovy/tapestry.junit5-convention.gradle
@@ -6,6 +6,7 @@ dependencies {
testImplementation platform(libs.junit.bom)
testImplementation libs.bundles.junit.jupiter.essentials
testRuntimeOnly libs.junit.jupiter.engine
+ testRuntimeOnly libs.junit.platform.launcher
}
tasks.withType(Test).configureEach {
diff --git a/buildSrc/src/main/groovy/tapestry.testng-convention.gradle
b/buildSrc/src/main/groovy/tapestry.testng-convention.gradle
index 90dac3640..da6dc9d17 100644
--- a/buildSrc/src/main/groovy/tapestry.testng-convention.gradle
+++ b/buildSrc/src/main/groovy/tapestry.testng-convention.gradle
@@ -5,7 +5,6 @@ plugins {
dependencies {
testImplementation libs.testng
testImplementation libs.easymock
- testImplementation libs.hamcrest.core
}
tasks.withType(Test).configureEach { testTask ->
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c3246addf..0a5d778ed 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
# LOGGING
-slf4j = "1.7.25"
+slf4j = "2.0.17"
# JAVAX/JAKARTA
@@ -16,20 +16,20 @@ jakarta-xml-bind-api = "2.3.2"
# APACHE COMMONS
-commons-cli = "1.2"
-commons-codec = "1.18.0"
-commons-httpclient = "4.1"
-commons-io = "2.19.0"
-commons-lang3 = "3.17.0"
+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.13.1"
+commons-text = "1.40.0"
-# HIBERNATE
+# DATABASE
hibernate = "5.4.32.Final"
hibernate-validator = "4.3.2.Final"
-hsqldb = "2.7.3"
+hsqldb = "2.7.4"
# ANTLR
@@ -37,37 +37,31 @@ antlr = "3.5.3"
# MISC
-snakeyaml = "2.3"
-cglib = "2.2"
-hamcrest-core = "1.3"
-json = "20140107"
xml-apis = "1.4.01"
-guice = "3.0"
-groovy = "4.0.27"
-ant-jsch = "1.8.2"
+groovy = "4.0.28"
+ant-jsch = "1.10.15"
guava = "27.0.1-jre"
-jackson = "2.13.1"
-clojure = "1.6.0"
-httpcomponents-httpclient = "4.5.14"
+jackson = "2.20.0"
+clojure = "1.12.2"
# TESTING
-slf4j-simple = "2.0.17"
-junit5 = "5.10.2"
+junit5 = "5.14.0"
junit4 = "4.13.2"
-testng = "7.5.1"
+
+testng = "7.5.1"
easymock = "5.4.0"
+
spock = "2.3-groovy-4.0"
-geb = "2.0"
-webdrivermanager = "5.3.1"
-selenium = "4.5.0"
-selenium-java = "4.12.1"
-selenium-server = "4.12.1"
+geb = "2.0"
+
+selenium-java = "4.12.1"
+selenium-legrc = "4.5.0"
+webdrivermanager = "5.5.2"
# QUICKSTART
quickstart-spring-boot = "2.5.4"
-quickstart-json = "1.1.4"
quickstart-log4j = "2.17.2"
quickstart-yasson = "2.0.4"
quickstart-maven-compiler = "3.8.1"
@@ -97,7 +91,7 @@ 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-httpclient = { module = "commons-httpclient:commons-httpclient",
version.ref = "commons-httpclient" }
+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" }
@@ -117,16 +111,10 @@ antlr-runtime = { module = "org.antlr:antlr-runtime",
version.ref = "antlr" }
# MISC
-snakeyaml = { module = "org.yaml:snakeyaml", version.ref = "snakeyaml" }
-cglib-nodep = { module = "cglib:cglib-nodep", version.ref = "cglib" }
-hamcrest-core = { module = "org.hamcrest:hamcrest-core", version.ref =
"hamcrest-core" }
-json = { module = "org.json:json", version.ref = "json" }
xml-apis = { module = "xml-apis:xml-apis", version.ref = "xml-apis" }
-guice = { module = "com.google.inject:guice", version.ref = "guice" }
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" }
-httpcomponents-httpclient = { module = "org.apache.httpcomponents:httpclient",
version.ref = "httpcomponents-httpclient" }
# GROOVY
@@ -140,13 +128,14 @@ jackson-databind = { module =
"com.fasterxml.jackson.core:jackson-databind", ver
# TESTING
-slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref =
"slf4j-simple" }
+slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
-junit-bom = { module = "org.junit:junit-bom", version.ref =
"junit5" }
-junit-jupiter = { module = "org.junit.jupiter:junit-jupiter"}
-junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api" }
-junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params" }
-junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
+junit-bom = { module = "org.junit:junit-bom", version.ref =
"junit5" }
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter"}
+junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api" }
+junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params" }
+junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
+junit-platform-launcher = { module =
"org.junit.platform:junit-platform-launcher" }
junit4 = { module = "junit:junit", version.ref = "junit4" }
@@ -159,11 +148,8 @@ spock-core = { module = "org.spockframework:spock-core" }
geb-spock = { module = "org.gebish:geb-spock", version.ref = "geb" }
-selenium-legrc = { module = "org.seleniumhq.selenium:selenium-leg-rc",
version.ref = "selenium" }
-selenium-api = { module = "org.seleniumhq.selenium:selenium-api",
version.ref = "selenium" }
-selenium-java = { module = "org.seleniumhq.selenium:selenium-java",
version.ref = "selenium-java" }
-selenium-server = { module = "org.seleniumhq.selenium:selenium-server",
version.ref = "selenium-server" }
-
+selenium-java = { module = "org.seleniumhq.selenium:selenium-java",
version.ref = "selenium-java" }
+selenium-legrc = { module = "org.seleniumhq.selenium:selenium-leg-rc",
version.ref = "selenium-legrc" }
webdrivermanager = { module = "io.github.bonigarcia:webdrivermanager",
version.ref = "webdrivermanager" }
diff --git a/quickstart/build.gradle b/quickstart/build.gradle
index a88fe8054..ad2136526 100644
--- a/quickstart/build.gradle
+++ b/quickstart/build.gradle
@@ -53,7 +53,6 @@ task processFiltered(type: Copy) {
springBootVersion: libs.versions.quickstart.spring.boot.get(),
junitVersion: libs.versions.junit5.get(),
jacksonVersion: libs.versions.jackson.get(),
- jsonVersion: libs.versions.quickstart.json.get(),
log4jVersion: libs.versions.quickstart.log4j.get(),
yassonVersion: libs.versions.quickstart.yasson.get(),
servletVersion: libs.versions.javax.servlet.api.get(),
diff --git
a/quickstart/src/main/resources-filtered/archetype-resources/pom-spring-boot.xml
b/quickstart/src/main/resources-filtered/archetype-resources/pom-spring-boot.xml
index d7b74a6e4..6a59ad7a3 100644
---
a/quickstart/src/main/resources-filtered/archetype-resources/pom-spring-boot.xml
+++
b/quickstart/src/main/resources-filtered/archetype-resources/pom-spring-boot.xml
@@ -19,7 +19,6 @@
<tapestry-version>@tapestryVersion@</tapestry-version>
<jackson-version>@jacksonVersion@</jackson-version>
<log4j-version>@log4jVersion@</log4j-version>
- <json-version>@jsonVersion@</json-version>
<junit-version>@junitVersion@</junit-version>
<yasson-version>@yassonVersion@</yasson-version>
<servlet-version>@servletVersion@</servlet-version>
diff --git a/quickstart/src/main/resources-filtered/archetype-resources/pom.xml
b/quickstart/src/main/resources-filtered/archetype-resources/pom.xml
index a1214b5ef..0d5cf095c 100644
--- a/quickstart/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/quickstart/src/main/resources-filtered/archetype-resources/pom.xml
@@ -12,7 +12,6 @@
<tapestry-version>@tapestryVersion@</tapestry-version>
<jackson-version>@jacksonVersion@</jackson-version>
<log4j-version>@log4jVersion@</log4j-version>
- <json-version>@jsonVersion@</json-version>
<junit-version>@junitVersion@</junit-version>
<yasson-version>@yassonVersion@</yasson-version>
<servlet-version>@servletVersion@</servlet-version>
diff --git a/tapestry-core/build.gradle b/tapestry-core/build.gradle
index c5ed7c95e..42ea624cd 100644
--- a/tapestry-core/build.gradle
+++ b/tapestry-core/build.gradle
@@ -28,11 +28,10 @@ dependencies {
provided libs.javax.servlet.api
- testImplementation libs.httpcomponents.httpclient
+ testImplementation libs.commons.httpclient
testImplementation project(":tapestry-spock")
testRuntimeOnly("${libs.hsqldb.get().module.group}:${libs.hsqldb.get().module.name}:${libs.hsqldb.get().version}:jdk8")
- testRuntimeOnly libs.guice
}
tasks.register('npmInstall', Exec) {
diff --git a/tapestry-http/build.gradle b/tapestry-http/build.gradle
index f6cbd76da..49c4bea43 100644
--- a/tapestry-http/build.gradle
+++ b/tapestry-http/build.gradle
@@ -20,7 +20,6 @@ dependencies {
testImplementation project(':tapestry-test-constants')
testRuntimeOnly("${libs.hsqldb.get().module.group}:${libs.hsqldb.get().module.name}:${libs.hsqldb.get().version}:jdk8")
- testRuntimeOnly libs.guice
testRuntimeOnly libs.slf4j.simple
}
