Use version catalog

Simplify dependency management/updates.

Signed-off-by: thc202 <thc202@gmail.com>

Author: thc202

build.gradle.kts

@@ -1,10 +1,10 @@
 import net.ltgt.gradle.errorprone.errorprone
 
 plugins {
-    id("com.diffplug.spotless")
-    id("org.sonarqube") version "6.0.1.5171"
-    id("com.github.ben-manes.versions") version "0.52.0"
-    id("net.ltgt.errorprone") version "4.1.0"
+    alias(libs.plugins.spotless)
+    alias(libs.plugins.sonarqube)
+    alias(libs.plugins.dependencyUpdates)
+    alias(libs.plugins.errorprone)
 }
 
 apply(from = "$rootDir/gradle/ci.gradle.kts")
@@ -22,7 +22,7 @@ subprojects {
 
     project.plugins.withType(JavaPlugin::class) {
         dependencies {
-            "errorprone"("com.google.errorprone:error_prone_core:2.36.0")
+            "errorprone"(libs.errorprone.core)
         }
     }
 

gradle/libs.versions.toml

@@ -0,0 +1,56 @@
+[versions]
+errorprone = "2.36.0"
+flatlaf = "3.7"
+log4j = "2.25.3"
+
+[libraries]
+bndAnnotation = "biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0"
+bytebuddy = "net.bytebuddy:byte-buddy:1.18.0"
+commons-beanutils = "commons-beanutils:commons-beanutils:1.11.0"
+commons-codec = "commons-codec:commons-codec:1.20.0"
+commons-collections = "commons-collections:commons-collections:3.2.2"
+commons-configuration = "commons-configuration:commons-configuration:1.10"
+commons-csv = "org.apache.commons:commons-csv:1.14.1"
+commons-httpclient = "commons-httpclient:commons-httpclient:3.1"
+commons-io = "commons-io:commons-io:2.21.0"
+commons-lang = "commons-lang:commons-lang:2.6"
+commons-lang3 = "org.apache.commons:commons-lang3:3.19.0"
+commons-logging = "commons-logging:commons-logging:1.3.5"
+commons-text = "org.apache.commons:commons-text:1.14.0"
+errorprone-core = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" }
+findbugsAnnotations = "com.google.code.findbugs:findbugs-annotations:3.0.1"
+flatlaf = { module = "com.formdev:flatlaf", version.ref = "flatlaf" }
+flatlaf-swingx = { module = "com.formdev:flatlaf-swingx", version.ref = "flatlaf" }
+harlib = "edu.umass.cs.benchlab:harlib:1.1.3"
+hsqldb = "org.hsqldb:hsqldb:2.7.4"
+javahelp = "javax.help:javahelp:2.0.05"
+javaSemver = "com.github.zafarkhaja:java-semver:0.10.2"
+jerichoHtml = "net.htmlparser.jericho:jericho-html:3.4"
+jfreechart = "org.jfree:jfreechart:1.5.6"
+jgraphtcore = "org.jgrapht:jgrapht-core:0.9.2"
+jsonlib = "net.sf.json-lib:json-lib:2.4"
+log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" }
+log4j-api12 = { module = "org.apache.logging.log4j:log4j-1.2-api", version.ref = "log4j" }
+log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
+log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
+log4j-slf4j = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version.ref = "log4j" }
+rsyntaxtextarea = "com.fifesoft:rsyntaxtextarea:3.6.0"
+swingx = "org.swinglabs.swingx:swingx-all:1.6.5-1"
+xom = "xom:xom:1.3.9"
+
+assertj-core = "org.assertj:assertj-core:3.27.6"
+assertj-swing = "org.assertj:assertj-swing:3.17.1"
+hamcrest-core = "org.hamcrest:hamcrest-core:3.0"
+junit-jupiter = "org.junit.jupiter:junit-jupiter:6.0.1"
+junit-platformLauncher = { module = "org.junit.platform:junit-platform-launcher" }
+mockito = "org.mockito:mockito-junit-jupiter:5.20.0"
+
+[plugins]
+crowdin = "org.zaproxy.crowdin:0.6.0"
+cyclonedx.id = "org.cyclonedx.bom"
+dependencyUpdates = "com.github.ben-manes.versions:0.52.0"
+errorprone = "net.ltgt.errorprone:4.1.0"
+japicmp.id = "me.champeau.gradle.japicmp"
+sonarqube = "org.sonarqube:6.0.1.5171"
+spotless.id = "com.diffplug.spotless"
+zaproxy-common.id = "org.zaproxy.common"

zap/zap.gradle.kts

@@ -10,11 +10,11 @@ import java.util.stream.Collectors
 plugins {
     `java-library`
     jacoco
-    id("com.diffplug.spotless")
-    id("me.champeau.gradle.japicmp")
-    id("org.cyclonedx.bom")
-    id("org.zaproxy.common")
-    id("org.zaproxy.crowdin") version "0.6.0"
+    alias(libs.plugins.spotless)
+    alias(libs.plugins.japicmp)
+    alias(libs.plugins.cyclonedx)
+    alias(libs.plugins.zaproxy.common)
+    alias(libs.plugins.crowdin)
     org.zaproxy.zap.distributions
     org.zaproxy.zap.installers
     org.zaproxy.zap.`github-releases`
@@ -89,57 +89,56 @@ tasks.withType<JavaCompile>().configureEach {
 }
 
 dependencies {
-    api("com.fifesoft:rsyntaxtextarea:3.6.0")
-    api("com.github.zafarkhaja:java-semver:0.10.2")
-    implementation("commons-beanutils:commons-beanutils:1.11.0")
-    implementation("commons-codec:commons-codec:1.20.0")
-    api("commons-collections:commons-collections:3.2.2")
-    api("commons-configuration:commons-configuration:1.10")
-    api("commons-httpclient:commons-httpclient:3.1")
-    api("commons-io:commons-io:2.21.0")
-    api("commons-lang:commons-lang:2.6")
-    api("org.apache.commons:commons-lang3:3.19.0")
-    api("org.apache.commons:commons-text:1.14.0")
-    implementation("edu.umass.cs.benchlab:harlib:1.1.3")
-    api("javax.help:javahelp:2.0.05")
-    val log4jVersion = "2.25.3"
-    api("org.apache.logging.log4j:log4j-api:$log4jVersion")
-    api("org.apache.logging.log4j:log4j-1.2-api:$log4jVersion")
-    implementation("org.apache.logging.log4j:log4j-core:$log4jVersion")
-    implementation("org.apache.logging.log4j:log4j-jul:$log4jVersion")
-    api("net.htmlparser.jericho:jericho-html:3.4")
-    api("net.sf.json-lib:json-lib:2.4:jdk15")
-    api("org.apache.commons:commons-csv:1.14.1")
-    api("org.hsqldb:hsqldb:2.7.4")
-    api("org.jfree:jfreechart:1.5.6")
-    api("org.jgrapht:jgrapht-core:0.9.2")
-    api("org.swinglabs.swingx:swingx-all:1.6.5-1")
-
-    implementation("com.formdev:flatlaf:3.7")
-    implementation("com.formdev:flatlaf-swingx:3.7")
-
-    runtimeOnly("commons-logging:commons-logging:1.3.5")
-    runtimeOnly("xom:xom:1.3.9") {
+    api(libs.rsyntaxtextarea)
+    api(libs.javaSemver)
+    implementation(libs.commons.beanutils)
+    implementation(libs.commons.codec)
+    api(libs.commons.collections)
+    api(libs.commons.configuration)
+    api(libs.commons.httpclient)
+    api(libs.commons.io)
+    api(libs.commons.lang)
+    api(libs.commons.lang3)
+    api(libs.commons.text)
+    implementation(libs.harlib)
+    api(libs.javahelp)
+    api(libs.log4j.api)
+    api(libs.log4j.api12)
+    implementation(libs.log4j.core)
+    implementation(libs.log4j.jul)
+    api(libs.jerichoHtml)
+    api(variantOf(libs.jsonlib) { classifier("jdk15") })
+    api(libs.commons.csv)
+    api(libs.hsqldb)
+    api(libs.jfreechart)
+    api(libs.jgraphtcore)
+    api(libs.swingx)
+
+    implementation(libs.flatlaf)
+    implementation(libs.flatlaf.swingx)
+
+    runtimeOnly(libs.commons.logging)
+    runtimeOnly(libs.xom) {
         setTransitive(false)
     }
 
     // Include annotations used by Log4j2 Core library to avoid compiler warnings.
-    compileOnly("biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0")
-    compileOnly("com.google.code.findbugs:findbugs-annotations:3.0.1")
-    testCompileOnly("biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0")
-    testCompileOnly("com.google.code.findbugs:findbugs-annotations:3.0.1")
-
-    testImplementation("net.bytebuddy:byte-buddy:1.18.0")
-    testImplementation("org.assertj:assertj-core:3.27.6")
-    testImplementation("org.hamcrest:hamcrest-core:3.0")
-    testImplementation("org.junit.jupiter:junit-jupiter:6.0.1")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-    testImplementation("org.mockito:mockito-junit-jupiter:5.20.0")
-    testImplementation("org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion")
+    compileOnly(libs.bndAnnotation)
+    compileOnly(libs.findbugsAnnotations)
+    testCompileOnly(libs.bndAnnotation)
+    testCompileOnly(libs.findbugsAnnotations)
+
+    testImplementation(libs.bytebuddy)
+    testImplementation(libs.assertj.core)
+    testImplementation(libs.hamcrest.core)
+    testImplementation(libs.junit.jupiter)
+    testRuntimeOnly(libs.junit.platformLauncher)
+    testImplementation(libs.mockito)
+    testImplementation(libs.log4j.slf4j)
 
     testRuntimeOnly(files(distDir))
 
-    testGuiImplementation("org.assertj:assertj-swing:3.17.1")
+    testGuiImplementation(libs.assertj.swing)
 }
 
 tasks.register<JavaExec>("run") {