Skip to content

Commit 5de941e

Browse files
duncancrawfordduncancrawford
authored
chore(deps): migrate Gradle versions to libs.versions.toml for Dependabot (#112)
* chore(deps): migrate Gradle versions to libs.versions.toml for Dependabot * chore(deps): migrate Gradle versions to libs.versions.toml for Dependabot
1 parent 935fd73 commit 5de941e

7 files changed

Lines changed: 105 additions & 55 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
gradle
2+
!gradle/
3+
!gradle/libs.versions.toml
24
bin/*
35
!bin/run-in-docker.sh
46
.gradle
@@ -30,4 +32,4 @@ applicationinsights-agent-*.jar
3032
.env
3133

3234
.DS_Store
33-
*/.DS_Store
35+
*/.DS_Store

‎build.gradle‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
plugins {
22
id 'application'
33
id 'java'
4-
id 'org.springframework.boot' version '4.0.0'
5-
id 'io.spring.dependency-management' version '1.1.7'
4+
alias(libs.plugins.spring.boot)
5+
alias(libs.plugins.spring.dependency.management)
66
id 'jacoco'
77
id 'maven-publish'
8-
id 'com.github.ben-manes.versions' version '0.53.0'
9-
id 'org.cyclonedx.bom' version '2.4.1'
10-
id 'com.gorylenko.gradle-git-properties' version '2.5.3'
11-
id 'com.avast.gradle.docker-compose' version '0.17.12'
8+
alias(libs.plugins.ben.manes.versions)
9+
alias(libs.plugins.cyclonedx.bom)
10+
alias(libs.plugins.gradle.git.properties)
11+
alias(libs.plugins.avast.docker.compose)
1212
}
1313

1414
group = 'uk.gov.hmcts.cp'
@@ -39,18 +39,18 @@ springBoot {
3939
}
4040

4141
dependencies {
42-
implementation("uk.gov.hmcts.cp:api-hmcts-crime-template:2.0.2")
42+
implementation libs.hmcts.crime.template
4343

4444
// --- Observability / Actuator / OTEL / Prometheus ---
45-
implementation 'org.springframework.boot:spring-boot-starter-actuator'
46-
implementation 'org.hibernate.validator:hibernate-validator'
47-
implementation 'org.springframework.boot:spring-boot-starter-opentelemetry'
48-
implementation 'io.jsonwebtoken:jjwt:0.13.0'
49-
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
45+
implementation libs.spring.boot.starter.actuator
46+
implementation libs.hibernate.validator
47+
implementation libs.spring.boot.starter.opentelemetry
48+
implementation libs.jjwt
49+
testRuntimeOnly libs.junit.platform.launcher
5050

5151
// Should come in with the api
52-
implementation 'io.swagger.core.v3:swagger-core:2.2.36'
52+
implementation libs.swagger.core
5353

54-
testImplementation(platform('org.junit:junit-bom:5.13.4'))
55-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
54+
testImplementation(platform(libs.junit.bom))
55+
testRuntimeOnly libs.junit.jupiter.engine
5656
}

‎gradle/dependencies/java-core.gradle‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
1-
ext {
2-
log4JVersion = "2.24.3"
3-
logbackVersion = "1.5.18"
4-
lombokVersion = "1.18.38"
5-
mapstructVersion = "1.5.5.Final"
6-
}
7-
81
dependencies {
9-
implementation 'net.logstash.logback:logstash-logback-encoder:8.1'
10-
implementation 'org.apache.logging.log4j:log4j-to-slf4j'
11-
implementation 'ch.qos.logback:logback-classic'
12-
implementation 'ch.qos.logback:logback-core'
13-
implementation "org.owasp.encoder:encoder:1.2.3"
2+
implementation libs.logstash.logback.encoder
3+
implementation libs.log4j.to.slf4j
4+
implementation libs.logback.classic
5+
implementation libs.logback.core
6+
implementation libs.owasp.encoder
147

15-
compileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion
16-
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion
17-
testCompileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion
18-
testAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion
8+
compileOnly libs.lombok
9+
annotationProcessor libs.lombok
10+
testCompileOnly libs.lombok
11+
testAnnotationProcessor libs.lombok
1912

20-
implementation "org.mapstruct:mapstruct:$mapstructVersion"
21-
annotationProcessor "org.mapstruct:mapstruct-processor:$mapstructVersion"
13+
implementation libs.mapstruct
14+
annotationProcessor libs.mapstruct.processor
2215
}
2316

2417
tasks.named('wrapper') {
2518
delete "${projectDir}/gradlew.bat"
26-
}
19+
}

‎gradle/dependencies/spring-core.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
dependencies {
2-
implementation 'org.springframework.boot:spring-boot-starter-web'
3-
implementation 'org.springframework.boot:spring-boot-starter-aspectj'
2+
implementation libs.spring.boot.starter.web
3+
implementation libs.spring.boot.starter.aspectj
44

5-
testImplementation "org.springframework.boot:spring-boot-starter-webmvc-test"
5+
testImplementation libs.spring.boot.starter.webmvc.test
66

7-
testImplementation('org.springframework.boot:spring-boot-starter-test') {
7+
testImplementation(libs.spring.boot.starter.test) {
88
exclude group: 'junit', module: 'junit'
99
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
1010
}
11-
}
11+
}

‎gradle/dependencies/spring-db.gradle‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
dependencies {
2-
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
3-
implementation 'org.postgresql:postgresql'
4-
implementation 'org.springframework.boot:spring-boot-starter-flyway'
5-
implementation 'org.flywaydb:flyway-core'
6-
implementation 'org.flywaydb:flyway-database-postgresql'
7-
testImplementation("org.springframework.boot:spring-boot-testcontainers:4.0.0")
8-
testImplementation 'org.testcontainers:postgresql:1.21.3'
9-
testImplementation 'org.testcontainers:junit-jupiter:1.21.3'
10-
}
2+
implementation libs.spring.boot.starter.data.jpa
3+
implementation libs.postgresql
4+
implementation libs.spring.boot.starter.flyway
5+
implementation libs.flyway.core
6+
implementation libs.flyway.database.postgresql
7+
testImplementation libs.spring.boot.testcontainers
8+
testImplementation libs.testcontainers.postgresql
9+
testImplementation libs.testcontainers.junit.jupiter
10+
}

‎gradle/libs.versions.toml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
[versions]
2+
spring-boot = "4.0.0"
3+
spring-dependency-management = "1.1.7"
4+
ben-manes-versions = "0.53.0"
5+
cyclonedx-bom = "2.4.1"
6+
gradle-git-properties = "2.5.3"
7+
avast-docker-compose = "0.17.12"
8+
hmcts-crime-template = "2.0.2"
9+
jjwt = "0.13.0"
10+
swagger-core = "2.2.36"
11+
junit-bom = "5.13.4"
12+
logstash-logback-encoder = "8.1"
13+
owasp-encoder = "1.2.3"
14+
lombok = "1.18.38"
15+
mapstruct = "1.5.5.Final"
16+
testcontainers = "1.21.3"
17+
18+
[libraries]
19+
hmcts-crime-template = { module = "uk.gov.hmcts.cp:api-hmcts-crime-template", version.ref = "hmcts-crime-template" }
20+
spring-boot-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator" }
21+
hibernate-validator = { module = "org.hibernate.validator:hibernate-validator" }
22+
spring-boot-starter-opentelemetry = { module = "org.springframework.boot:spring-boot-starter-opentelemetry" }
23+
jjwt = { module = "io.jsonwebtoken:jjwt", version.ref = "jjwt" }
24+
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
25+
swagger-core = { module = "io.swagger.core.v3:swagger-core", version.ref = "swagger-core" }
26+
junit-bom = { module = "org.junit:junit-bom", version.ref = "junit-bom" }
27+
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
28+
logstash-logback-encoder = { module = "net.logstash.logback:logstash-logback-encoder", version.ref = "logstash-logback-encoder" }
29+
log4j-to-slf4j = { module = "org.apache.logging.log4j:log4j-to-slf4j" }
30+
logback-classic = { module = "ch.qos.logback:logback-classic" }
31+
logback-core = { module = "ch.qos.logback:logback-core" }
32+
owasp-encoder = { module = "org.owasp.encoder:encoder", version.ref = "owasp-encoder" }
33+
lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" }
34+
mapstruct = { module = "org.mapstruct:mapstruct", version.ref = "mapstruct" }
35+
mapstruct-processor = { module = "org.mapstruct:mapstruct-processor", version.ref = "mapstruct" }
36+
spring-boot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web" }
37+
spring-boot-starter-aspectj = { module = "org.springframework.boot:spring-boot-starter-aspectj" }
38+
spring-boot-starter-webmvc-test = { module = "org.springframework.boot:spring-boot-starter-webmvc-test" }
39+
spring-boot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test" }
40+
spring-boot-starter-data-jpa = { module = "org.springframework.boot:spring-boot-starter-data-jpa" }
41+
postgresql = { module = "org.postgresql:postgresql" }
42+
spring-boot-starter-flyway = { module = "org.springframework.boot:spring-boot-starter-flyway" }
43+
flyway-core = { module = "org.flywaydb:flyway-core" }
44+
flyway-database-postgresql = { module = "org.flywaydb:flyway-database-postgresql" }
45+
spring-boot-testcontainers = { module = "org.springframework.boot:spring-boot-testcontainers", version.ref = "spring-boot" }
46+
testcontainers-postgresql = { module = "org.testcontainers:postgresql", version.ref = "testcontainers" }
47+
testcontainers-junit-jupiter = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }
48+
49+
[plugins]
50+
spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot" }
51+
spring-dependency-management = { id = "io.spring.dependency-management", version.ref = "spring-dependency-management" }
52+
ben-manes-versions = { id = "com.github.ben-manes.versions", version.ref = "ben-manes-versions" }
53+
cyclonedx-bom = { id = "org.cyclonedx.bom", version.ref = "cyclonedx-bom" }
54+
gradle-git-properties = { id = "com.gorylenko.gradle-git-properties", version.ref = "gradle-git-properties" }
55+
avast-docker-compose = { id = "com.avast.gradle.docker-compose", version.ref = "avast-docker-compose" }

‎gradle/tasks/api-test.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ configurations {
5050
}
5151

5252
dependencies {
53-
apiTestImplementation platform('org.junit:junit-bom:5.13.4')
54-
apiTestRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
53+
apiTestImplementation platform(libs.junit.bom)
54+
apiTestRuntimeOnly libs.junit.jupiter.engine
5555

56-
apiTestImplementation('org.springframework.boot:spring-boot-starter-test') {
56+
apiTestImplementation(libs.spring.boot.starter.test) {
5757
exclude group: 'junit', module: 'junit'
5858
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
5959
}
60-
apiTestRuntimeOnly 'org.junit.platform:junit-platform-launcher'
61-
apiTestCompileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion
62-
apiTestAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion
60+
apiTestRuntimeOnly libs.junit.platform.launcher
61+
apiTestCompileOnly libs.lombok
62+
apiTestAnnotationProcessor libs.lombok
6363
}
6464

6565
dockerCompose {

0 commit comments

Comments
 (0)