Skip to content

Commit e7d3d6b

Browse files
pboospboos
authored
changed: Use toml file for versions of dependencies (#54)
1 parent 46759a2 commit e7d3d6b

File tree

12 files changed

+79
-57
lines changed

12 files changed

+79
-57
lines changed

‎build.gradle

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'java'
3-
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
3+
alias(libs.plugins.nexus.publish)
44
}
55

66
def javaVersion = providers.environmentVariable("JAVA_BUILD_VERSION").getOrElse("17")
@@ -24,22 +24,22 @@ allprojects {
2424
}
2525

2626
subprojects {
27-
if(it.parent.name == 'examples') {
27+
if(it.parent.name == 'examples' || it.parent.name == 'test') {
2828
apply plugin: 'java'
2929
} else {
3030
apply plugin: 'java-library'
3131
apply plugin: 'jacoco'
3232

3333
dependencies {
3434
// Testing
35-
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
36-
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
37-
testImplementation "org.mockito:mockito-core:$mockitoVersion"
38-
testImplementation "org.mockito:mockito-junit-jupiter:$mockitoVersion"
35+
testImplementation(libs.junit.jupiter.api)
36+
testRuntimeOnly(libs.junit.jupiter.engine)
37+
testImplementation(libs.mockito.core)
38+
testImplementation(libs.mockito.junit.jupiter)
3939
}
4040

4141
jacoco {
42-
toolVersion = jacocoVersion
42+
toolVersion = libs.versions.jacoco.get()
4343
}
4444

4545
jacocoTestReport {
@@ -60,21 +60,21 @@ subprojects {
6060

6161
dependencies {
6262
// Lombok annotations to reduce boilerplate code
63-
compileOnly "org.projectlombok:lombok:$lombokVersion"
64-
annotationProcessor "org.projectlombok:lombok:$lombokVersion"
65-
testCompileOnly "org.projectlombok:lombok:$lombokVersion"
66-
testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion"
63+
compileOnly(libs.lombok)
64+
annotationProcessor(libs.lombok)
65+
testCompileOnly(libs.lombok)
66+
testAnnotationProcessor(libs.lombok)
6767
}
6868

6969
checkstyle {
70-
toolVersion = checkstyleVersion
70+
toolVersion = libs.versions.checkstyle.get()
7171
configDirectory.set(file("$rootProject.projectDir/config"))
7272
checkstyleMain.source = "src/main/java"
7373
}
7474

7575
pmd {
76+
toolVersion = libs.versions.pmd.get()
7677
consoleOutput = true
7778
ruleSets = ["$rootDir/ruleset.xml"]
78-
toolVersion = pmdVersion
7979
}
8080
}

‎examples/example-spring-boot-starter-web/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
22
id 'java'
3-
id 'org.springframework.boot' version "$springBootVersion"
4-
id 'io.spring.dependency-management' version "$springDependencyManagementVersion"
5-
id 'org.openapi.generator' version "$openApiGeneratorPluginVersion"
3+
alias(libs.plugins.spring.boot)
4+
alias(libs.plugins.spring.dependency.management)
5+
alias(libs.plugins.openapi.generator)
66
}
77

88

@@ -12,9 +12,9 @@ dependencies {
1212
implementation 'org.springframework.boot:spring-boot-starter-web'
1313

1414
implementation 'org.springframework.boot:spring-boot-starter-validation'
15-
implementation "org.openapitools:jackson-databind-nullable:$openApiJacksonDatabindNullableVersion"
16-
implementation "jakarta.validation:jakarta.validation-api:$jakartaValidationApiVersion"
17-
implementation "io.swagger.core.v3:swagger-annotations:$swaggerAnnotationsVersion"
15+
implementation(libs.openapi.tools.jacksonDatabindNullable)
16+
implementation(libs.jakarta.validation.api)
17+
implementation(libs.swagger.annotations)
1818
}
1919

2020
test {

‎examples/example-spring-boot-starter-webflux/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
22
id 'java'
3-
id 'org.springframework.boot' version "$springBootVersion"
4-
id 'io.spring.dependency-management' version "$springDependencyManagementVersion"
5-
id 'org.openapi.generator' version "$openApiGeneratorPluginVersion"
3+
alias(libs.plugins.spring.boot)
4+
alias(libs.plugins.spring.dependency.management)
5+
alias(libs.plugins.openapi.generator)
66
}
77

88
dependencies {
@@ -12,9 +12,9 @@ dependencies {
1212
implementation 'org.springframework.boot:spring-boot-starter-webflux'
1313

1414
implementation 'org.springframework.boot:spring-boot-starter-validation'
15-
implementation "org.openapitools:jackson-databind-nullable:$openApiJacksonDatabindNullableVersion"
16-
implementation "jakarta.validation:jakarta.validation-api:$jakartaValidationApiVersion"
17-
implementation "io.swagger.core.v3:swagger-annotations:$swaggerAnnotationsVersion"
15+
implementation(libs.openapi.tools.jacksonDatabindNullable)
16+
implementation(libs.jakarta.validation.api)
17+
implementation(libs.swagger.annotations)
1818
}
1919

2020
test {

‎examples/examples-common/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin
22

33
plugins {
44
id 'java-library'
5-
id 'org.springframework.boot' version "$springBootVersion"
5+
alias(libs.plugins.spring.boot)
66
}
77

88
dependencies {

‎gradle.properties

-20
This file was deleted.

‎gradle/libs.versions.toml

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
[versions]
2+
spring-boot = "3.0.2"
3+
spring-dependency-management = "1.1.0"
4+
openapi-generator = "6.2.1"
5+
openapi-tools = "0.2.4"
6+
swagger = "2.2.8"
7+
swagger-request-validator = "2.39.0"
8+
jakarta-validation = "3.0.2"
9+
lombok = "1.18.24"
10+
commons-codec = "1.16.0"
11+
find-bugs = "3.0.2"
12+
gradle-nexus-publish-plugin = "1.3.0"
13+
datadog-statsd = "2.13.0"
14+
# Verify
15+
checkstyle = "8.44"
16+
pmd = "6.55.0"
17+
jacoco = "0.8.7"
18+
# Testing
19+
mockito = "4.11.0"
20+
junit-jupiter = "5.9.1"
21+
22+
[libraries]
23+
openapi-tools-jacksonDatabindNullable = { group = "org.openapitools", name = "jackson-databind-nullable", version.ref = "openapi-tools" }
24+
swagger-annotations = { group = "io.swagger.core.v3", name = "swagger-annotations", version.ref = "swagger" }
25+
swagger-request-validator-core = { group = "com.atlassian.oai", name = "swagger-request-validator-core", version.ref = "swagger-request-validator" }
26+
jakarta-validation-api = { group = "jakarta.validation", name = "jakarta.validation-api", version.ref = "jakarta-validation" }
27+
lombok = { group = "org.projectlombok", name = "lombok", version.ref = "lombok" }
28+
datadog-statsdclient = { group = "com.datadoghq", name = "java-dogstatsd-client", version.ref = "datadog-statsd" }
29+
commons-codec = { group = "commons-codec", name = "commons-codec", version.ref = "commons-codec" }
30+
find-bugs = { group = "com.google.code.findbugs", name = "jsr305", version.ref = "find-bugs" }
31+
# Testing
32+
mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
33+
mockito-junit-jupiter = { group = "org.mockito", name = "mockito-junit-jupiter", version.ref = "mockito" }
34+
junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit-jupiter" }
35+
junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit-jupiter" }
36+
37+
38+
[plugins]
39+
spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot" }
40+
spring-dependency-management = { id = "io.spring.dependency-management", version.ref = "spring-dependency-management" }
41+
openapi-generator = { id = "org.openapi.generator", version.ref = "openapi-generator" }
42+
nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "gradle-nexus-publish-plugin" }

‎metrics-reporter/metrics-reporter-datadog-spring-boot/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.springframework.boot.gradle.plugin.SpringBootPlugin
22

33
plugins {
4-
id 'org.springframework.boot' version "$springBootVersion" apply false
4+
alias(libs.plugins.spring.boot) apply false
55
}
66

77
apply from: "${rootDir}/gradle/publish-module.gradle"
@@ -12,7 +12,7 @@ dependencies {
1212
testImplementation 'org.springframework.boot:spring-boot-test'
1313

1414
api project(':metrics-reporter:metrics-reporter-datadog')
15-
implementation "com.datadoghq:java-dogstatsd-client:$datadogStatsdVersion"
15+
implementation(libs.datadog.statsdclient)
1616

1717
implementation 'org.assertj:assertj-core'
1818
}

‎metrics-reporter/metrics-reporter-datadog/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ apply from: "${rootDir}/gradle/publish-module.gradle"
33
dependencies {
44
api project(':openapi-validation-api')
55

6-
implementation "com.datadoghq:java-dogstatsd-client:$datadogStatsdVersion"
6+
implementation(libs.datadog.statsdclient)
77
}

‎openapi-validation-core/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ apply from: "${rootDir}/gradle/publish-module.gradle"
33
dependencies {
44
api project(':openapi-validation-api')
55

6-
implementation 'com.atlassian.oai:swagger-request-validator-core:2.39.0'
6+
implementation(libs.swagger.request.validator.core)
77
constraints {
8-
implementation('commons-codec:commons-codec:1.16.0') {
8+
implementation(libs.commons.codec) {
99
because 'Apache commons-codec before 1.13 is vulnerable to information exposure. See https://devhub.checkmarx.com/cve-details/Cxeb68d52e-5509/'
1010
}
1111
// implementation('org.yaml:snakeyaml:1.33') {

‎spring-boot-starter/spring-boot-starter-core/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.springframework.boot.gradle.plugin.SpringBootPlugin
22

33
plugins {
4-
id 'org.springframework.boot' version "$springBootVersion" apply false
4+
alias(libs.plugins.spring.boot) apply false
55
}
66

77
apply from: "${rootDir}/gradle/publish-module.gradle"
@@ -16,7 +16,7 @@ dependencies {
1616
compileOnly 'org.springframework.boot:spring-boot-autoconfigure'
1717

1818
// TODO use spotbugs instead and also apply to all modules?
19-
implementation "com.google.code.findbugs:jsr305:$findBugsVersion"
19+
implementation(libs.find.bugs)
2020

2121
testImplementation platform(SpringBootPlugin.BOM_COORDINATES)
2222
testImplementation 'org.springframework.boot:spring-boot-starter-test'

‎spring-boot-starter/spring-boot-starter-web/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.springframework.boot.gradle.plugin.SpringBootPlugin
22

33
plugins {
4-
id 'org.springframework.boot' version "$springBootVersion" apply false
4+
alias(libs.plugins.spring.boot) apply false
55
}
66

77
apply from: "${rootDir}/gradle/publish-module.gradle"
@@ -18,7 +18,7 @@ dependencies {
1818
implementation 'org.springframework.boot:spring-boot-autoconfigure'
1919

2020
// TODO use spotbugs instead and also apply to all modules?
21-
implementation "com.google.code.findbugs:jsr305:$findBugsVersion"
21+
implementation(libs.find.bugs)
2222

2323
testImplementation 'org.springframework.boot:spring-boot-starter-test'
2424
testImplementation 'org.springframework:spring-web'

‎spring-boot-starter/spring-boot-starter-webflux/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.springframework.boot.gradle.plugin.SpringBootPlugin
22

33
plugins {
4-
id 'org.springframework.boot' version "$springBootVersion" apply false
4+
alias(libs.plugins.spring.boot) apply false
55
}
66

77
apply from: "${rootDir}/gradle/publish-module.gradle"
@@ -18,7 +18,7 @@ dependencies {
1818
implementation 'org.springframework.boot:spring-boot-autoconfigure'
1919

2020
// TODO use spotbugs instead and also apply to all modules?
21-
implementation "com.google.code.findbugs:jsr305:$findBugsVersion"
21+
implementation(libs.find.bugs)
2222

2323
testImplementation 'org.springframework.boot:spring-boot-starter-test'
2424
testImplementation 'org.springframework:spring-webflux'

0 commit comments

Comments
 (0)