Test dependabot for Gradle with libs.version.toml

ricekot · ricekot · commit c2b698f45bc1 · 2025-10-02T02:14:33.000+05:30
Signed-off-by: ricekot &lt;git@ricekot.com&gt;
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,3 +9,12 @@ updates:
         applies-to: version-updates
         patterns:
         - "*"
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    groups:
+      gradle:
+        applies-to: version-updates
+        patterns:
+        - '*'
diff --git a/addOns/ascanrules/ascanrules.gradle.kts b/addOns/ascanrules/ascanrules.gradle.kts
@@ -51,7 +51,7 @@ dependencies {
     zapAddOn("network")
     zapAddOn("oast")
 
-    implementation("org.bitbucket.mstrobel:procyon-compilertools:0.6.0")
+    implementation(libs.procyon.compilerTools)
 
     testImplementation(parent!!.childProjects.get("commonlib")!!.sourceSets.test.get().output)
     testImplementation(project(":testutils"))
diff --git a/addOns/ascanrulesBeta/ascanrulesBeta.gradle.kts b/addOns/ascanrulesBeta/ascanrulesBeta.gradle.kts
@@ -39,8 +39,8 @@ dependencies {
     zapAddOn("network")
     zapAddOn("oast")
 
-    implementation("com.googlecode.java-diff-utils:diffutils:1.3.0")
-    implementation("org.jsoup:jsoup:1.17.2")
+    implementation(libs.diffutils)
+    implementation(libs.jsoup)
 
     testImplementation(parent!!.childProjects.get("commonlib")!!.sourceSets.test.get().output)
     testImplementation(project(":testutils"))
diff --git a/addOns/authhelper/authhelper.gradle.kts b/addOns/authhelper/authhelper.gradle.kts
@@ -117,11 +117,11 @@ dependencies {
 
     compileOnly(libs.log4j.core)
 
-    implementation("com.github.bastiaanjansen:otp-java:2.1.0") {
+    implementation(libs.otpJava) {
         // Provided by ZAP.
         exclude(group = "commons-codec", module = "commons-codec")
     }
 
-    testImplementation("io.github.bonigarcia:selenium-jupiter:5.1.1")
+    testImplementation(libs.selenium.jupiter)
     testImplementation(project(":testutils"))
 }
diff --git a/addOns/beanshell/beanshell.gradle.kts b/addOns/beanshell/beanshell.gradle.kts
@@ -13,7 +13,7 @@ zapAddOn {
 }
 
 dependencies {
-    implementation("org.beanshell:bsh:2.0b5")
+    implementation(libs.beanshell)
 }
 
 spotless {
diff --git a/addOns/bugtracker/bugtracker.gradle.kts b/addOns/bugtracker/bugtracker.gradle.kts
@@ -14,11 +14,11 @@ dependencies {
         exclude(group = "org.jenkins-ci")
     }
     compileOnly("com.github.spotbugs:spotbugs-annotations:3.1.12")
-    implementation("com.j2bugzilla:j2bugzilla:2.2.1") {
+    implementation(libs.j2bugzilla) {
         // Not needed.
         exclude(group = "junit")
     }
-    implementation("org.kohsuke:github-api:1.303") {
+    implementation(libs.githubApi) {
         // Not needed.
         exclude(group = "com.infradna.tool")
         // Provided by ZAP.
diff --git a/addOns/commonlib/commonlib.gradle.kts b/addOns/commonlib/commonlib.gradle.kts
@@ -25,16 +25,16 @@ crowdin {
 }
 
 dependencies {
-    api(platform("com.fasterxml.jackson:jackson-bom:2.19.1"))
-    api("com.fasterxml.jackson.core:jackson-databind")
-    api("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
-    api("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
-    api("com.fasterxml.jackson.datatype:jackson-datatype-jdk8")
-    api("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
-
-    implementation("commons-io:commons-io:2.16.1")
-    implementation("org.apache.commons:commons-csv:1.10.0")
-    implementation("org.apache.commons:commons-collections4:4.4")
+    api(platform(libs.jackson.bom))
+    api(libs.jackson.databind)
+    api(libs.jackson.dataformat.xml)
+    api(libs.jackson.dataformat.yaml)
+    api(libs.jackson.datatype.jdk8)
+    api(libs.jackson.datatype.jsr310)
+
+    implementation(libs.apache.commons.io)
+    implementation(libs.apache.commons.csv)
+    implementation(libs.apache.commons.collections4)
 
     testImplementation(project(":testutils"))
 }
diff --git a/addOns/scripts/scripts.gradle.kts b/addOns/scripts/scripts.gradle.kts
@@ -68,7 +68,7 @@ dependencies {
     zapAddOn("commonlib")
     zapAddOn("pscan")
 
-    implementation("net.bytebuddy:byte-buddy:1.14.13")
+    implementation(libs.byteBuddy)
 
     testImplementation(project(":testutils"))
 }
diff --git a/addOns/selenium/selenium.gradle.kts b/addOns/selenium/selenium.gradle.kts
@@ -55,7 +55,7 @@ dependencies {
         // Do not expose the newer version to dependents, exclude and change to implementation.
         exclude(group = "org.apache.commons", module = "commons-lang3")
     }
-    implementation("org.apache.commons:commons-lang3:3.18.0")
+    implementation(libs.apache.commons.lang3)
     implementation(libs.log4j.slf4j)
 
     zapAddOn("commonlib")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,86 @@
+[versions]
+graaljs = "25.0.0"
+kotlin = "1.3.72"
+log4j = "2.24.2"
+netty = "4.1.100.Final"
+slf4j = "1.7.32"
+
+[libraries]
+beanshell = { module = "org.beanshell:bsh", version = "2.0b5" }
+bridgeMethodAnnotations = { module = "com.infradna.tool:bridge-method-annotation", version = "1.18" }
+byteBuddy = { module = "net.bytebuddy:byte-buddy", version = "1.14.13" }
+commons-codec = { module = "commons-codec:commons-codec", version = "1.15" }
+apache-commons-collections4 = { module = "org.apache.commons:commons-collections4", version = "4.4" }
+apache-commons-csv = { module = "org.apache.commons:commons-csv", version = "1.10.0" }
+apache-commons-io = { module = "commons-io:commons-io", version = "2.16.1" }
+apache-commons-lang3 = { module = "org.apache.commons:commons-lang3", version = "3.18.0" }
+apache-commons-math = { module = "commons-math:commons-math", version = "1.2" }
+diffutils = { module = "com.googlecode.java-diff-utils:diffutils", version = "1.3.0" }
+flyingSaucer-pdf = { module = "org.xhtmlrenderer:flying-saucer-pdf", version = "9.3.1" }
+githubApi = { module = "org.kohsuke:github-api", version = "1.303" }
+graphqlJava = { module = "com.graphql-java:graphql-java", version = "22.3" }
+groovy-all = { module = "org.codehaus.groovy:groovy-all", version = "3.0.14" }
+grpc-protobuf = { module = "io.grpc:grpc-protobuf", version = "1.61.1" }
+guice-assistedinject = { module = "com.google.inject.extensions:guice-assistedinject", version = "5.0.1" }
+hamcrest-library = { module = "org.hamcrest:hamcrest-library", version = "2.2" }
+har-reader = { module = "de.sstoehr:har-reader", version = "3.1.4" }
+hektor-fsm = { module = "io.hektor:hektor-fsm", version = "0.0.5" }
+htmlunit-csp = { module = "org.htmlunit:htmlunit-csp", version = "4.0.0" }
+httpclient5 = { module = "org.apache.httpcomponents.client5:httpclient5", version = "5.2.1" }
+ice4j = { module = "org.jitsi:ice4j", version = "3.0-24-g34c2ce5" }
+jackson-bom = { module = "com.fasterxml.jackson:jackson-bom", version = "2.19.1" }
+jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind" }
+jackson-dataformat-xml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-xml" }
+jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml" }
+jackson-datatype-jdk8 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jdk8" }
+jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" }
+j2bugzilla = { module = "com.j2bugzilla:j2bugzilla", version = "2.2.1" }
+jakarta-xml-soap-api = { module = "jakarta.xml.soap:jakarta.xml.soap-api", version = "3.0.0" }
+jaxb-runtime = { module = "org.glassfish.jaxb:jaxb-runtime", version = "2.3.2" }
+jbrofuzz-core = { module = "org.owasp.jbrofuzz:jbrofuzz-core", version = "2.5.1" }
+jcip-annotations = { module = "net.jcip:jcip-annotations", version = "1.0" }
+jcl-over-slf4j = { module = "org.slf4j:jcl-over-slf4j", version.ref = "slf4j" }
+jdom = { module = "org.jdom:jdom", version = "2.0.2" }
+jgraphx = { module = "org.tinyjee.jgraphx:jgraphx", version = "3.4.1.3" }
+jruby-complete = { module = "org.jruby:jruby-complete", version = "1.7.4" }
+js-community = { module = "org.graalvm.js:js-community", version.ref = "graaljs" }
+js-scriptengine = { module = "org.graalvm.js:js-scriptengine", version.ref = "graaljs" }
+jsoup = { module = "org.jsoup:jsoup", version = "1.17.2" }
+jsr305 = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" }
+jsvg = { module = "com.github.weisj:jsvg", version = "1.4.0" }
+jul-to-slf4j = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version = "5.10.2" }
+jython-standalone = { module = "org.python:jython-standalone", version = "2.7.2" }
+kaitai-struct-runtime = { module = "io.kaitai:kaitai-struct-runtime", version = "0.10" }
+kotlin-compiler-embeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
+kotlin-scripting-jsr223-embeddable = { module = "org.jetbrains.kotlin:kotlin-scripting-jsr223-embeddable", version.ref = "kotlin" }
+langchain4j = { module = "dev.langchain4j:langchain4j", version = "0.35.0" }
+langchain4j-azure-open-ai = { module = "dev.langchain4j:langchain4j-azure-open-ai", version = "0.35.0" }
+langchain4j-ollama = { module = "dev.langchain4j:langchain4j-ollama", version = "0.35.0" }
+log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
+log4j-slf4j = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version.ref = "log4j" }
+log4j-slf4j2 = { module = "org.apache.logging.log4j:log4j-slf4j2-impl", version.ref = "log4j" }
+metadata-extractor = { module = "com.drewnoakes:metadata-extractor", version = "2.19.0" }
+metrics-core = { module = "com.codahale.metrics:metrics-core", version = "3.0.2" }
+mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version = "5.10.0" }
+nekohtml = { module = "net.sourceforge.nekohtml:nekohtml", version = "1.9.22" }
+netty-codec = { module = "io.netty:netty-codec", version.ref = "netty" }
+netty-codec-http2 = { module = "io.netty:netty-codec-http2", version.ref = "netty" }
+netty-handler = { module = "io.netty:netty-handler", version.ref = "netty" }
+otpJava = { module = "com.github.bastiaanjansen:otp-java", version = "2.1.0" }
+procyon-compilerTools = { module = "org.bitbucket.mstrobel:procyon-compilertools", version = "0.6.0" }
+re2j = { module = "com.google.re2j:re2j", version = "1.7" }
+rgxgen = { module = "com.github.curious-odd-man:rgxgen", version = "2.0" }
+saaj-impl = { module = "com.sun.xml.messaging.saaj:saaj-impl", version = "3.0.0" }
+selenium-jupiter = { module = "io.github.bonigarcia:selenium-jupiter", version = "5.1.1" }
+slf4j-log4j12 = { module = "org.slf4j:slf4j-log4j12", version.ref = "slf4j" }
+snodge = { module = "com.natpryce:snodge", version = "2.1.2.2" }
+soa-model-core = { module = "com.predic8:soa-model-core", version = "2.0.1" }
+swagger-compat-spec-parser = { module = "io.swagger:swagger-compat-spec-parser", version = "1.0.71" }
+swagger-parser = { module = "io.swagger.parser.v3:swagger-parser", version = "2.1.23" }
+thymeleaf = { module = "org.thymeleaf:thymeleaf", version = "3.1.2.RELEASE" }
+webdrivermanager = { module = "io.github.bonigarcia:webdrivermanager", version = "5.7.0" }
+xmlunit = { module = "xmlunit:xmlunit", version = "1.6" }
+
+[plugins]
+spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -6,17 +6,6 @@ pluginManagement {
     }
 }
 
-dependencyResolutionManagement {
-    versionCatalogs {
-        create("libs") {
-            version("log4j", "2.24.2")
-            library("log4j-core", "org.apache.logging.log4j", "log4j-core").versionRef("log4j")
-            library("log4j-slf4j", "org.apache.logging.log4j", "log4j-slf4j-impl").versionRef("log4j")
-            library("log4j-slf4j2", "org.apache.logging.log4j", "log4j-slf4j2-impl").versionRef("log4j")
-        }
-    }
-}
-
 rootProject.name = "zap-extensions"
 
 val addOnsProjectName = "addOns"

Original file line number	Diff line number	Diff line change
`@@ -117,11 +117,11 @@ dependencies {`
`117`	`117`
`118`	`118`	`compileOnly(libs.log4j.core)`
`119`	`119`
`120`		`- implementation("com.github.bastiaanjansen:otp-java:2.1.0") {`
	`120`	`+ implementation(libs.otpJava) {`
`121`	`121`	`// Provided by ZAP.`
`122`	`122`	`exclude(group = "commons-codec", module = "commons-codec")`
`123`	`123`	`}`
`124`	`124`
`125`		`- testImplementation("io.github.bonigarcia:selenium-jupiter:5.1.1")`
	`125`	`+ testImplementation(libs.selenium.jupiter)`
`126`	`126`	`testImplementation(project(":testutils"))`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ zapAddOn {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`dependencies {`
`16`		`- implementation("org.beanshell:bsh:2.0b5")`
	`16`	`+ implementation(libs.beanshell)`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`spotless {`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@ dependencies {`
`14`	`14`	`exclude(group = "org.jenkins-ci")`
`15`	`15`	`}`
`16`	`16`	`compileOnly("com.github.spotbugs:spotbugs-annotations:3.1.12")`
`17`		`- implementation("com.j2bugzilla:j2bugzilla:2.2.1") {`
	`17`	`+ implementation(libs.j2bugzilla) {`
`18`	`18`	`// Not needed.`
`19`	`19`	`exclude(group = "junit")`
`20`	`20`	`}`
`21`		`- implementation("org.kohsuke:github-api:1.303") {`
	`21`	`+ implementation(libs.githubApi) {`
`22`	`22`	`// Not needed.`
`23`	`23`	`exclude(group = "com.infradna.tool")`
`24`	`24`	`// Provided by ZAP.`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ dependencies {`
`68`	`68`	`zapAddOn("commonlib")`
`69`	`69`	`zapAddOn("pscan")`
`70`	`70`
`71`		`- implementation("net.bytebuddy:byte-buddy:1.14.13")`
	`71`	`+ implementation(libs.byteBuddy)`
`72`	`72`
`73`	`73`	`testImplementation(project(":testutils"))`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ dependencies {`
`55`	`55`	`// Do not expose the newer version to dependents, exclude and change to implementation.`
`56`	`56`	`exclude(group = "org.apache.commons", module = "commons-lang3")`
`57`	`57`	`}`
`58`		`- implementation("org.apache.commons:commons-lang3:3.18.0")`
	`58`	`+ implementation(libs.apache.commons.lang3)`
`59`	`59`	`implementation(libs.log4j.slf4j)`
`60`	`60`
`61`	`61`	`zapAddOn("commonlib")`