Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
gradle
!gradle/
!gradle/libs.versions.toml
bin/*
!bin/run-in-docker.sh
.gradle
Expand Down Expand Up @@ -30,4 +32,4 @@ applicationinsights-agent-*.jar
.env

.DS_Store
*/.DS_Store
*/.DS_Store
30 changes: 15 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
plugins {
id 'application'
id 'java'
id 'org.springframework.boot' version '4.0.0'
id 'io.spring.dependency-management' version '1.1.7'
alias(libs.plugins.spring.boot)
alias(libs.plugins.spring.dependency.management)
id 'jacoco'
id 'maven-publish'
id 'com.github.ben-manes.versions' version '0.53.0'
id 'org.cyclonedx.bom' version '2.4.1'
id 'com.gorylenko.gradle-git-properties' version '2.5.3'
id 'com.avast.gradle.docker-compose' version '0.17.12'
alias(libs.plugins.ben.manes.versions)
alias(libs.plugins.cyclonedx.bom)
alias(libs.plugins.gradle.git.properties)
alias(libs.plugins.avast.docker.compose)
}

group = 'uk.gov.hmcts.cp'
Expand Down Expand Up @@ -39,18 +39,18 @@ springBoot {
}

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

// --- Observability / Actuator / OTEL / Prometheus ---
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'org.hibernate.validator:hibernate-validator'
implementation 'org.springframework.boot:spring-boot-starter-opentelemetry'
implementation 'io.jsonwebtoken:jjwt:0.13.0'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
implementation libs.spring.boot.starter.actuator
implementation libs.hibernate.validator
implementation libs.spring.boot.starter.opentelemetry
implementation libs.jjwt
testRuntimeOnly libs.junit.platform.launcher

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

testImplementation(platform('org.junit:junit-bom:5.13.4'))
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
testImplementation(platform(libs.junit.bom))
testRuntimeOnly libs.junit.jupiter.engine
}
31 changes: 12 additions & 19 deletions gradle/dependencies/java-core.gradle
Original file line number Diff line number Diff line change
@@ -1,26 +1,19 @@
ext {
log4JVersion = "2.24.3"
logbackVersion = "1.5.18"
lombokVersion = "1.18.38"
mapstructVersion = "1.5.5.Final"
}

dependencies {
implementation 'net.logstash.logback:logstash-logback-encoder:8.1'
implementation 'org.apache.logging.log4j:log4j-to-slf4j'
implementation 'ch.qos.logback:logback-classic'
implementation 'ch.qos.logback:logback-core'
implementation "org.owasp.encoder:encoder:1.2.3"
implementation libs.logstash.logback.encoder
implementation libs.log4j.to.slf4j
implementation libs.logback.classic
implementation libs.logback.core
implementation libs.owasp.encoder

compileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion
testCompileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion
testAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion
compileOnly libs.lombok
annotationProcessor libs.lombok
testCompileOnly libs.lombok
testAnnotationProcessor libs.lombok

implementation "org.mapstruct:mapstruct:$mapstructVersion"
annotationProcessor "org.mapstruct:mapstruct-processor:$mapstructVersion"
implementation libs.mapstruct
annotationProcessor libs.mapstruct.processor
}

tasks.named('wrapper') {
delete "${projectDir}/gradlew.bat"
}
}
10 changes: 5 additions & 5 deletions gradle/dependencies/spring-core.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-aspectj'
implementation libs.spring.boot.starter.web
implementation libs.spring.boot.starter.aspectj

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

testImplementation('org.springframework.boot:spring-boot-starter-test') {
testImplementation(libs.spring.boot.starter.test) {
exclude group: 'junit', module: 'junit'
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
}
}
}
18 changes: 9 additions & 9 deletions gradle/dependencies/spring-db.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
dependencies {
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.postgresql:postgresql'
implementation 'org.springframework.boot:spring-boot-starter-flyway'
implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'
testImplementation("org.springframework.boot:spring-boot-testcontainers:4.0.0")
testImplementation 'org.testcontainers:postgresql:1.21.3'
testImplementation 'org.testcontainers:junit-jupiter:1.21.3'
}
implementation libs.spring.boot.starter.data.jpa
implementation libs.postgresql
implementation libs.spring.boot.starter.flyway
implementation libs.flyway.core
implementation libs.flyway.database.postgresql
testImplementation libs.spring.boot.testcontainers
testImplementation libs.testcontainers.postgresql
testImplementation libs.testcontainers.junit.jupiter
}
55 changes: 55 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
[versions]
spring-boot = "4.0.0"
spring-dependency-management = "1.1.7"
ben-manes-versions = "0.53.0"
cyclonedx-bom = "2.4.1"
gradle-git-properties = "2.5.3"
avast-docker-compose = "0.17.12"
hmcts-crime-template = "2.0.2"
jjwt = "0.13.0"
swagger-core = "2.2.36"
junit-bom = "5.13.4"
logstash-logback-encoder = "8.1"
owasp-encoder = "1.2.3"
lombok = "1.18.38"
mapstruct = "1.5.5.Final"
testcontainers = "1.21.3"

[libraries]
hmcts-crime-template = { module = "uk.gov.hmcts.cp:api-hmcts-crime-template", version.ref = "hmcts-crime-template" }
spring-boot-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator" }
hibernate-validator = { module = "org.hibernate.validator:hibernate-validator" }
spring-boot-starter-opentelemetry = { module = "org.springframework.boot:spring-boot-starter-opentelemetry" }
jjwt = { module = "io.jsonwebtoken:jjwt", version.ref = "jjwt" }
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
swagger-core = { module = "io.swagger.core.v3:swagger-core", version.ref = "swagger-core" }
junit-bom = { module = "org.junit:junit-bom", version.ref = "junit-bom" }
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
logstash-logback-encoder = { module = "net.logstash.logback:logstash-logback-encoder", version.ref = "logstash-logback-encoder" }
log4j-to-slf4j = { module = "org.apache.logging.log4j:log4j-to-slf4j" }
logback-classic = { module = "ch.qos.logback:logback-classic" }
logback-core = { module = "ch.qos.logback:logback-core" }
owasp-encoder = { module = "org.owasp.encoder:encoder", version.ref = "owasp-encoder" }
lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" }
mapstruct = { module = "org.mapstruct:mapstruct", version.ref = "mapstruct" }
mapstruct-processor = { module = "org.mapstruct:mapstruct-processor", version.ref = "mapstruct" }
spring-boot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web" }
spring-boot-starter-aspectj = { module = "org.springframework.boot:spring-boot-starter-aspectj" }
spring-boot-starter-webmvc-test = { module = "org.springframework.boot:spring-boot-starter-webmvc-test" }
spring-boot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test" }
spring-boot-starter-data-jpa = { module = "org.springframework.boot:spring-boot-starter-data-jpa" }
postgresql = { module = "org.postgresql:postgresql" }
spring-boot-starter-flyway = { module = "org.springframework.boot:spring-boot-starter-flyway" }
flyway-core = { module = "org.flywaydb:flyway-core" }
flyway-database-postgresql = { module = "org.flywaydb:flyway-database-postgresql" }
spring-boot-testcontainers = { module = "org.springframework.boot:spring-boot-testcontainers", version.ref = "spring-boot" }
testcontainers-postgresql = { module = "org.testcontainers:postgresql", version.ref = "testcontainers" }
testcontainers-junit-jupiter = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }

[plugins]
spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot" }
spring-dependency-management = { id = "io.spring.dependency-management", version.ref = "spring-dependency-management" }
ben-manes-versions = { id = "com.github.ben-manes.versions", version.ref = "ben-manes-versions" }
cyclonedx-bom = { id = "org.cyclonedx.bom", version.ref = "cyclonedx-bom" }
gradle-git-properties = { id = "com.gorylenko.gradle-git-properties", version.ref = "gradle-git-properties" }
avast-docker-compose = { id = "com.avast.gradle.docker-compose", version.ref = "avast-docker-compose" }
12 changes: 6 additions & 6 deletions gradle/tasks/api-test.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@ configurations {
}

dependencies {
apiTestImplementation platform('org.junit:junit-bom:5.13.4')
apiTestRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
apiTestImplementation platform(libs.junit.bom)
apiTestRuntimeOnly libs.junit.jupiter.engine

apiTestImplementation('org.springframework.boot:spring-boot-starter-test') {
apiTestImplementation(libs.spring.boot.starter.test) {
exclude group: 'junit', module: 'junit'
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
}
apiTestRuntimeOnly 'org.junit.platform:junit-platform-launcher'
apiTestCompileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion
apiTestAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion
apiTestRuntimeOnly libs.junit.platform.launcher
apiTestCompileOnly libs.lombok
apiTestAnnotationProcessor libs.lombok
}

dockerCompose {
Expand Down
Loading