Skip to content

Commit 2842874

Browse files
jzheauxjzheaux
committed
Use libs.versions.toml
Closes gh-1728 Signed-off-by: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
1 parent 1d8cb6b commit 2842874

9 files changed

Lines changed: 119 additions & 50 deletions

File tree

‎buildSrc/build.gradle‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,30 +80,30 @@ dependencies {
8080
implementation localGroovy()
8181

8282
implementation 'io.projectreactor:reactor-core:3.8.7'
83-
implementation ('org.gretty:gretty:5.0.2') {
83+
implementation (libs.org.gretty.gretty) {
8484
exclude group: 'org.springframework.boot', module: 'spring-boot-loader-tools'
8585
}
8686
implementation 'com.apollographql.apollo:apollo-runtime:5.2.0'
8787
implementation 'com.github.ben-manes:gradle-versions-plugin:0.54.0'
8888
implementation 'com.github.spullara.mustache.java:compiler:0.9.14'
89-
implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.48'
89+
implementation libs.io.spring.javaformat.spring.javaformat.gradle.plugin
9090
implementation 'io.spring.nullability:io.spring.nullability.gradle.plugin:0.0.16'
91-
implementation 'io.spring.gradle:spring-security-project-plugin:1.0.19'
92-
implementation 'io.spring.nohttp:nohttp-gradle:0.0.11'
91+
implementation libs.io.spring.gradle.spring.security.project.plugin
92+
implementation libs.io.spring.nohttp.nohttp.gradle
9393
implementation 'net.sourceforge.htmlunit:htmlunit:2.70.0'
9494
implementation 'org.asciidoctor:asciidoctor-gradle-jvm:4.0.5'
9595
implementation 'org.hidetake:gradle-ssh-plugin:2.10.1'
96-
implementation 'org.springframework:spring-core:7.0.9'
97-
implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:7.5.0.8588'
96+
implementation libs.org.springframework.spring.core
97+
implementation libs.org.sonarsource.scanner.gradle.sonarqube.gradle.plugin
9898

99-
testImplementation platform('org.junit:junit-bom:6.1.3')
99+
testImplementation platform(libs.org.junit.junit.bom)
100100
testImplementation "org.junit.jupiter:junit-jupiter-api"
101101
testImplementation "org.junit.jupiter:junit-jupiter-params"
102102
testImplementation "org.junit.jupiter:junit-jupiter-engine"
103-
testImplementation 'org.apache.commons:commons-io:1.3.2'
104-
testImplementation 'org.assertj:assertj-core:3.27.7'
105-
testImplementation 'org.mockito:mockito-core:5.23.0'
106-
testImplementation 'org.mockito:mockito-junit-jupiter:5.23.0'
103+
testImplementation libs.org.apache.commons.commons.io
104+
testImplementation libs.org.assertj.assertj.core
105+
testImplementation libs.org.mockito.mockito.core
106+
testImplementation libs.org.mockito.mockito.junit.jupiter
107107
testImplementation "com.squareup.okhttp3:mockwebserver:5.5.0"
108108
}
109109

‎buildSrc/settings.gradle‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
dependencyResolutionManagement {
2+
versionCatalogs {
3+
libs {
4+
from(files("../gradle/libs.versions.toml"))
5+
}
6+
}
7+
}

‎core/build.gradle‎

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

1414
implementation "org.slf4j:slf4j-api"
1515

16-
provided "com.sun:ldapbp:1.0"
16+
provided "com.sun:ldapbp"
1717

1818
optional "org.springframework:spring-context"
1919
optional "org.springframework:spring-jdbc"

‎dependencies/build.gradle‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,59 +11,58 @@ repositories {
1111
mavenCentral()
1212
}
1313

14-
ext.queryDslVersion = '5.1.0'
15-
1614
dependencies {
1715
if (project.hasProperty("isOverrideVersionCatalog")) {
1816
def springFrameworkVersion = project.property("springFrameworkVersion")
1917
api platform("org.springframework:spring-framework-bom:$springFrameworkVersion")
2018
} else if (project.hasProperty("snapshot")) {
2119
api platform("org.springframework:spring-framework-bom:7.1.+")
2220
} else {
23-
api platform("org.springframework:spring-framework-bom:7.1.0-M2")
21+
api platform(libs.org.springframework.spring.framework.bom)
2422
}
2523
if (project.hasProperty("snapshot")) {
2624
api platform("io.micrometer:micrometer-bom:1.18.+")
2725
api platform("io.micrometer:micrometer-tracing-bom:1.8.+")
2826
} else {
29-
api platform("io.micrometer:micrometer-bom:1.18.0-M2")
30-
api platform("io.micrometer:micrometer-tracing-bom:1.8.0-M2")
27+
api platform(libs.io.micrometer.micrometer.bom)
28+
api platform(libs.io.micrometer.micrometer.tracing.bom)
3129
}
32-
api platform("org.junit:junit-bom:6.1.3")
33-
api platform("org.mockito:mockito-bom:5.23.0")
34-
api platform("org.slf4j:slf4j-bom:2.0.19")
30+
api platform(libs.org.junit.junit.bom)
31+
api platform(libs.org.mockito.mockito.bom)
32+
api platform(libs.org.slf4j.slf4j.bom)
3533
constraints {
36-
api "com.querydsl:querydsl-core:$queryDslVersion"
37-
api "com.querydsl:querydsl-apt:$queryDslVersion"
38-
api "commons-pool:commons-pool:1.6"
39-
api "org.apache.commons:commons-pool2:2.13.1"
40-
api "com.google.code.typica:typica:1.7.2"
41-
api "com.unboundid:unboundid-ldapsdk:7.0.5"
42-
api "commons-codec:commons-codec:1.22.1"
43-
api "commons-cli:commons-cli:1.10.0"
44-
api "commons-lang:commons-lang:2.6"
45-
api "commons-logging:commons-logging:1.4.0"
46-
api "gsbase:gsbase:2.0.1"
47-
api "jdepend:jdepend:2.9.1"
48-
api "ldapsdk:ldapsdk:4.1"
49-
api "org.apache.directory.server:apacheds-core-entry:1.5.5"
50-
api "org.apache.directory.server:apacheds-core:1.5.5"
51-
api "org.apache.directory.server:apacheds-protocol-ldap:1.5.5"
52-
api "org.apache.directory.server:apacheds-protocol-shared:1.5.5"
53-
api "org.apache.directory.server:apacheds-server-jndi:1.5.5"
54-
api "org.apache.directory.shared:shared-ldap:0.9.15"
55-
api "org.aspectj:aspectjrt:1.9.25.1"
56-
api "org.aspectj:aspectjweaver:1.9.25.1"
57-
api "org.assertj:assertj-core:3.27.7"
58-
api "org.freemarker:freemarker:2.3.35"
59-
api "org.hibernate:hibernate-core-jakarta:5.6.15.Final"
60-
api "org.hsqldb:hsqldb:2.7.4"
34+
api libs.com.querydsl.querydsl.core
35+
api libs.com.querydsl.querydsl.apt
36+
api libs.commons.pool.commons.pool
37+
api libs.org.apache.commons.commons.pool2
38+
api libs.com.google.code.typica.typica
39+
api libs.com.unboundid.unboundid.ldapsdk
40+
api libs.commons.codec.commons.codec
41+
api libs.commons.cli.commons.cli
42+
api libs.commons.lang.commons.lang
43+
api libs.commons.logging.commons.logging
44+
api libs.gsbase.gsbase
45+
api libs.jdepend.jdepend
46+
api libs.ldapsdk.ldapsdk
47+
api libs.org.apache.directory.server.apacheds.core.entry
48+
api libs.org.apache.directory.server.apacheds.core
49+
api libs.org.apache.directory.server.apacheds.protocol.ldap
50+
api libs.org.apache.directory.server.apacheds.protocol.shared
51+
api libs.org.apache.directory.server.apacheds.server.jndi
52+
api libs.org.apache.directory.shared.shared.ldap
53+
api libs.org.aspectj.aspectjrt
54+
api libs.org.aspectj.aspectjweaver
55+
api libs.org.assertj.assertj.core
56+
api libs.org.freemarker.freemarker
57+
api libs.org.hibernate.hibernate.core.jakarta
58+
api libs.org.hsqldb.hsqldb
6159
api "org.mockito:mockito-core"
6260
api "org.mockito:mockito-junit-jupiter"
6361
api "org.slf4j:jcl-over-slf4j"
6462
api "org.slf4j:log4j-over-slf4j"
6563
api "org.slf4j:slf4j-api"
6664
api "org.slf4j:slf4j-log4j12"
65+
api libs.log4j.log4j
66+
api libs.com.sun.ldapbp
6767
}
6868
}
69-

‎gradle/libs.versions.toml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
[versions]
2+
org-springframework = "7.1.0-M2"
3+
org-junit = "6.1.3"
4+
com-querydsl = "5.1.0"
5+
org-mockito = "5.23.0"
6+
org-aspectj = "1.9.25.1"
7+
org-slf4j = "2.0.19"
8+
org-apache-directory-server = "1.5.5"
9+
io-micrometer = "1.18.0-M2"
10+
io-micrometer-tracing = "1.8.0-M2"
11+
io-spring-javaformat = "0.0.48"
12+
13+
[libraries]
14+
org-springframework-spring-framework-bom = { module = "org.springframework:spring-framework-bom", version.ref = "org-springframework" }
15+
org-junit-junit-bom = { module = "org.junit:junit-bom", version.ref = "org-junit" }
16+
org-mockito-mockito-bom = { module = "org.mockito:mockito-bom", version.ref = "org-mockito" }
17+
org-slf4j-slf4j-bom = { module = "org.slf4j:slf4j-bom", version.ref = "org-slf4j" }
18+
io-micrometer-micrometer-bom = { module = "io.micrometer:micrometer-bom", version.ref = "io-micrometer" }
19+
io-micrometer-micrometer-tracing-bom = { module = "io.micrometer:micrometer-tracing-bom", version.ref = "io-micrometer-tracing" }
20+
21+
com-querydsl-querydsl-core = { module = "com.querydsl:querydsl-core", version.ref = "com-querydsl" }
22+
com-querydsl-querydsl-apt = { module = "com.querydsl:querydsl-apt", version.ref = "com-querydsl" }
23+
commons-pool-commons-pool = "commons-pool:commons-pool:1.6"
24+
org-apache-commons-commons-pool2 = "org.apache.commons:commons-pool2:2.13.1"
25+
com-google-code-typica-typica = "com.google.code.typica:typica:1.7.2"
26+
com-unboundid-unboundid-ldapsdk = "com.unboundid:unboundid-ldapsdk:7.0.5"
27+
commons-codec-commons-codec = "commons-codec:commons-codec:1.22.1"
28+
commons-cli-commons-cli = "commons-cli:commons-cli:1.10.0"
29+
commons-lang-commons-lang = "commons-lang:commons-lang:2.6"
30+
commons-logging-commons-logging = "commons-logging:commons-logging:1.4.0"
31+
gsbase-gsbase = "gsbase:gsbase:2.0.1"
32+
jdepend-jdepend = "jdepend:jdepend:2.9.1"
33+
ldapsdk-ldapsdk = "ldapsdk:ldapsdk:4.1"
34+
org-apache-directory-server-apacheds-core-entry = { module = "org.apache.directory.server:apacheds-core-entry", version.ref = "org-apache-directory-server" }
35+
org-apache-directory-server-apacheds-core = { module = "org.apache.directory.server:apacheds-core", version.ref = "org-apache-directory-server" }
36+
org-apache-directory-server-apacheds-protocol-ldap = { module = "org.apache.directory.server:apacheds-protocol-ldap", version.ref = "org-apache-directory-server" }
37+
org-apache-directory-server-apacheds-protocol-shared = { module = "org.apache.directory.server:apacheds-protocol-shared", version.ref = "org-apache-directory-server" }
38+
org-apache-directory-server-apacheds-server-jndi = { module = "org.apache.directory.server:apacheds-server-jndi", version.ref = "org-apache-directory-server" }
39+
org-apache-directory-shared-shared-ldap = "org.apache.directory.shared:shared-ldap:0.9.15"
40+
org-aspectj-aspectjrt = { module = "org.aspectj:aspectjrt", version.ref = "org-aspectj" }
41+
org-aspectj-aspectjweaver = { module = "org.aspectj:aspectjweaver", version.ref = "org-aspectj" }
42+
org-assertj-assertj-core = "org.assertj:assertj-core:3.27.7"
43+
org-freemarker-freemarker = "org.freemarker:freemarker:2.3.35"
44+
org-hibernate-hibernate-core-jakarta = "org.hibernate:hibernate-core-jakarta:5.6.15.Final"
45+
org-hsqldb-hsqldb = "org.hsqldb:hsqldb:2.7.4"
46+
junit-junit = "junit:junit:4.13.2"
47+
org-mockito-mockito-core = { module = "org.mockito:mockito-core", version.ref = "org-mockito" }
48+
org-mockito-mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "org-mockito" }
49+
org-slf4j-jcl-over-slf4j = { module = "org.slf4j:jcl-over-slf4j", version.ref = "org-slf4j" }
50+
org-slf4j-log4j-over-slf4j = { module = "org.slf4j:log4j-over-slf4j", version.ref = "org-slf4j" }
51+
org-slf4j-slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "org-slf4j" }
52+
org-slf4j-slf4j-log4j12 = { module = "org.slf4j:slf4j-log4j12", version.ref = "org-slf4j" }
53+
log4j-log4j = "log4j:log4j:1.2.17"
54+
com-sun-ldapbp = "com.sun:ldapbp:1.0"
55+
56+
# buildSrc dependencies
57+
org-gretty-gretty = "org.gretty:gretty:5.0.2"
58+
io-spring-javaformat-spring-javaformat-gradle-plugin = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version.ref = "io-spring-javaformat" }
59+
io-spring-gradle-spring-security-project-plugin = "io.spring.gradle:spring-security-project-plugin:1.0.19"
60+
io-spring-nohttp-nohttp-gradle = "io.spring.nohttp:nohttp-gradle:0.0.11"
61+
org-sonarsource-scanner-gradle-sonarqube-gradle-plugin = "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:7.5.0.8588"
62+
org-springframework-spring-core = "org.springframework:spring-core:7.0.9"
63+
org-apache-commons-commons-io = "org.apache.commons:commons-io:1.3.2"

‎ldif/ldif-core/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies {
1414
testImplementation "org.junit.jupiter:junit-jupiter-engine"
1515
testImplementation "org.junit.jupiter:junit-jupiter-params"
1616
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
17-
testImplementation ("log4j:log4j:1.2.17") {
17+
testImplementation ("log4j:log4j") {
1818
exclude group: 'javax.jms'
1919
exclude group: 'com.sun.jdmk'
2020
exclude group: 'com.sun.jmx'

‎sandbox/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies {
77
management platform(project(":spring-ldap-dependencies"))
88
api project(":spring-ldap-core")
99

10-
provided "com.sun:ldapbp:1.0"
10+
provided "com.sun:ldapbp"
1111

1212
testImplementation platform('org.junit:junit-bom')
1313
testImplementation "org.junit.jupiter:junit-jupiter-api"

‎test/integration-tests-openldap/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
testImplementation "org.springframework:spring-aop"
1414
testImplementation "org.springframework:spring-test"
1515
testImplementation "gsbase:gsbase"
16-
testImplementation "com.sun:ldapbp:1.0"
16+
testImplementation "com.sun:ldapbp"
1717
testImplementation "org.slf4j:slf4j-log4j12"
1818
testImplementation "org.assertj:assertj-core"
1919
testImplementation "org.junit.jupiter:junit-jupiter-engine"

‎test/integration-tests-sunone/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99
implementation "commons-pool:commons-pool"
1010

1111
provided "org.springframework:spring-jdbc"
12-
provided "com.sun:ldapbp:1.0"
12+
provided "com.sun:ldapbp"
1313

1414
testImplementation "org.springframework:spring-aop"
1515
testImplementation "gsbase:gsbase"

0 commit comments

Comments
 (0)