Skip to content

Commit

Permalink
Merge branch 'main' into story/ccmspui-453_get_notifications_endpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
JamieBriggs-MoJ committed Dec 18, 2024
2 parents c9b4646 + 339f6ed commit aad8c5a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'net.researchgate.release' version '3.0.2'
id 'uk.gov.laa.ccms.springboot.laa-ccms-spring-boot-gradle-plugin' version '0.0.8' apply false
id 'uk.gov.laa.ccms.springboot.laa-ccms-spring-boot-gradle-plugin' version '0.0.17' apply false
}

subprojects {
Expand Down
4 changes: 2 additions & 2 deletions data-api/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
plugins {
id 'org.openapi.generator' version '7.0.1'
id 'org.openapi.generator' version '7.10.0'
}

apply plugin: 'uk.gov.laa.ccms.springboot.laa-ccms-spring-boot-gradle-plugin'

dependencies {

implementation 'io.swagger.core.v3:swagger-annotations:2.2.22'
implementation 'io.swagger.core.v3:swagger-annotations:2.2.27'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.data:spring-data-commons'
implementation 'com.google.code.findbugs:jsr305:3.0.2'
Expand Down
16 changes: 8 additions & 8 deletions data-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,29 @@ dependencies {
implementation 'uk.gov.laa.ccms.springboot:laa-ccms-spring-boot-starter-auth'

//Enable Swagger UI
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0'

implementation files('lib/ojdbc8.jar')

compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'

implementation 'org.mapstruct:mapstruct:1.5.5.Final'
annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
implementation 'org.mapstruct:mapstruct:1.6.3'
annotationProcessor 'org.mapstruct:mapstruct-processor:1.6.3'

implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'

testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.mockito:mockito-core:5.8.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
testImplementation 'org.mockito:mockito-core:5.14.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'

//Used for integration tests
implementation platform('org.testcontainers:testcontainers-bom:1.19.1')
implementation platform('org.testcontainers:testcontainers-bom:1.20.4')
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'org.testcontainers:junit-jupiter'
testImplementation 'org.testcontainers:oracle-xe'
testImplementation 'org.hibernate:hibernate-core:6.3.1.Final'
testImplementation 'com.h2database:h2:2.2.224'
testImplementation 'org.hibernate:hibernate-core:6.6.3.Final'
testImplementation 'com.h2database:h2:2.3.232'
}

test {
Expand Down

0 comments on commit aad8c5a

Please sign in to comment.