Skip to content

Commit bf973db

Browse files
authored
Merge pull request zaproxy#6791 from ricekot/use-version-catalog
Use gradle version catalog for dependencies
2 parents a5ccc45 + ff00d3b commit bf973db

40 files changed

+242
-133
lines changed

addOns/addOns.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import org.zaproxy.gradle.crowdin.CrowdinExtension
1818
plugins {
1919
eclipse
2020
jacoco
21-
id("org.cyclonedx.bom") version "2.2.0" apply false
22-
id("org.rm3l.datanucleus-gradle-plugin") version "2.0.0" apply false
23-
id("org.zaproxy.add-on") version "0.13.1" apply false
24-
id("org.zaproxy.crowdin") version "0.6.0" apply false
25-
id("me.champeau.gradle.japicmp") version "0.4.6" apply false
21+
alias(libs.plugins.cyclonedx) apply false
22+
alias(libs.plugins.datanucleus) apply false
23+
alias(libs.plugins.zaproxy.addon) apply false
24+
alias(libs.plugins.zaproxy.crowdin) apply false
25+
alias(libs.plugins.japicmp) apply false
2626
}
2727

2828
description = "Common configuration of the add-ons."

addOns/ascanrules/ascanrules.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ dependencies {
5151
zapAddOn("network")
5252
zapAddOn("oast")
5353

54-
implementation("org.bitbucket.mstrobel:procyon-compilertools:0.6.0")
54+
implementation(libs.ascanrules.procyonCompilerTools)
5555

5656
testImplementation(parent!!.childProjects.get("commonlib")!!.sourceSets.test.get().output)
5757
testImplementation(project(":testutils"))

addOns/ascanrulesBeta/ascanrulesBeta.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ dependencies {
3939
zapAddOn("network")
4040
zapAddOn("oast")
4141

42-
implementation("com.googlecode.java-diff-utils:diffutils:1.3.0")
43-
implementation("org.jsoup:jsoup:1.17.2")
42+
implementation(libs.ascanrulesBeta.diffutils)
43+
implementation(libs.ascanrulesBeta.jsoup)
4444

4545
testImplementation(parent!!.childProjects.get("commonlib")!!.sourceSets.test.get().output)
4646
testImplementation(project(":testutils"))

addOns/authhelper/authhelper.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,11 @@ dependencies {
117117

118118
compileOnly(libs.log4j.core)
119119

120-
implementation("com.github.bastiaanjansen:otp-java:2.1.0") {
120+
implementation(libs.authhelper.otpJava) {
121121
// Provided by ZAP.
122122
exclude(group = "commons-codec", module = "commons-codec")
123123
}
124124

125-
testImplementation("io.github.bonigarcia:selenium-jupiter:5.1.1")
125+
testImplementation(libs.test.selenium.jupiter)
126126
testImplementation(project(":testutils"))
127127
}

addOns/beanshell/beanshell.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ zapAddOn {
1313
}
1414

1515
dependencies {
16-
implementation("org.beanshell:bsh:2.0b5")
16+
implementation(libs.beanshell.beanshell)
1717
}
1818

1919
spotless {

addOns/bugtracker/bugtracker.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ zapAddOn {
1010
}
1111

1212
dependencies {
13-
compileOnly("com.infradna.tool:bridge-method-annotation:1.18") {
13+
compileOnly(libs.bugtracker.bridgeMethodAnnotations) {
1414
exclude(group = "org.jenkins-ci")
1515
}
16-
compileOnly("com.github.spotbugs:spotbugs-annotations:3.1.12")
17-
implementation("com.j2bugzilla:j2bugzilla:2.2.1") {
16+
compileOnly(libs.bugtracker.spotBugsAnnotations)
17+
implementation(libs.bugtracker.j2bugzilla) {
1818
// Not needed.
1919
exclude(group = "junit")
2020
}
21-
implementation("org.kohsuke:github-api:1.303") {
21+
implementation(libs.bugtracker.githubApi) {
2222
// Not needed.
2323
exclude(group = "com.infradna.tool")
2424
// Provided by ZAP.

addOns/callgraph/callgraph.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ crowdin {
2121
}
2222

2323
dependencies {
24-
implementation("org.tinyjee.jgraphx:jgraphx:3.4.1.3")
24+
implementation(libs.callgraph.jgraphx)
2525
}

addOns/commonlib/commonlib.gradle.kts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ crowdin {
2525
}
2626

2727
dependencies {
28-
api(platform("com.fasterxml.jackson:jackson-bom:2.19.1"))
29-
api("com.fasterxml.jackson.core:jackson-databind")
30-
api("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
31-
api("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
32-
api("com.fasterxml.jackson.datatype:jackson-datatype-jdk8")
33-
api("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
34-
35-
implementation("commons-io:commons-io:2.16.1")
36-
implementation("org.apache.commons:commons-csv:1.10.0")
37-
implementation("org.apache.commons:commons-collections4:4.4")
28+
api(platform(libs.commonlib.jackson.bom))
29+
api(libs.commonlib.jackson.databind)
30+
api(libs.commonlib.jackson.dataformat.xml)
31+
api(libs.commonlib.jackson.dataformat.yaml)
32+
api(libs.commonlib.jackson.datatype.jdk8)
33+
api(libs.commonlib.jackson.datatype.jsr310)
34+
35+
implementation(libs.commonlib.apache.commons.io)
36+
implementation(libs.commonlib.apache.commons.csv)
37+
implementation(libs.commonlib.apache.commons.collections4)
3838

3939
testImplementation(project(":testutils"))
4040
}

addOns/database/database.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ spotless {
5050
dependencies {
5151
compileOnly(libs.log4j.core)
5252

53-
datanucleus("org.datanucleus:datanucleus-accessplatform-jdo-rdbms:6.0.7")
54-
sqlite("org.xerial:sqlite-jdbc:3.45.3.0")
53+
datanucleus(libs.database.datanucleusJdo)
54+
sqlite(libs.database.sqliteJdbc)
5555

56-
api("org.flywaydb:flyway-core:9.22.3")
56+
api(libs.database.flywayCore)
5757

5858
testImplementation(libs.log4j.core)
5959
testImplementation(project(":testutils"))

addOns/diff/diff.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ zapAddOn {
2121

2222
dependencies {
2323
zapAddOn("commonlib")
24-
implementation("com.googlecode.java-diff-utils:diffutils:1.3.0")
24+
implementation(libs.diff.diffutils)
2525
}
2626

2727
spotless {

0 commit comments

Comments
 (0)