Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update All patch-minor dependencies #1384

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion aat/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencyCheck {
}

dependencies {
implementation (group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '4.0.3') {
implementation (group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '4.1.2') {
exclude group: 'com.google.guava', module: 'guava'
}
implementation group: 'org.awaitility', name: 'awaitility', version: '3.1.6'
Expand Down
2 changes: 1 addition & 1 deletion application/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies {
exclude group: 'com.google.guava', module: 'guava'
}
implementation "org.flywaydb:flyway-core:6.5.7"
runtimeOnly group: 'org.postgresql', name: 'postgresql', version: '42.7.3'
runtimeOnly group: 'org.postgresql', name: 'postgresql', version: '42.7.5'

testImplementation project(":app-insights").sourceSets.main.output
testImplementation project(":commons").sourceSets.main.output
Expand Down
114 changes: 57 additions & 57 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ buildscript {
plugins {
id 'application'
id "org.springframework.boot" version '2.7.18'
id 'io.spring.dependency-management' version '1.1.5'
id 'se.patrikerdes.use-latest-versions' version '0.2.7'
id 'com.github.ben-manes.versions' version '0.51.0'
id 'org.sonarqube' version '5.0.0.4638'
id 'io.spring.dependency-management' version '1.1.7'
id 'se.patrikerdes.use-latest-versions' version '0.2.18'
id 'com.github.ben-manes.versions' version '0.52.0'
id 'org.sonarqube' version '5.1.0.4882'
id 'jacoco'
id 'idea'
id 'eclipse'
id 'com.github.kt3k.coveralls' version "2.8.2"
id 'com.github.kt3k.coveralls' version "2.12.2"
id 'com.github.spacialcircumstances.gradle-cucumber-reporting' version '0.1.25'
id 'info.solidsoft.pitest' version '1.15.0' apply(false)
id 'org.jetbrains.gradle.plugin.idea-ext' version "0.7"
id 'uk.gov.hmcts.java' version '0.12.57'
id 'org.jetbrains.gradle.plugin.idea-ext' version "0.10"
id 'uk.gov.hmcts.java' version '0.12.65'
}

application {
Expand All @@ -47,22 +47,22 @@ ext['postgresql.version'] = '42.7.3'
ext['log4j2.version'] = '2.17.1'
//overriding for easy access to the version for FT testing
ext['beftaFwVersion'] = '9.2.3'
ext['ccdTestDefinitionVersion'] = '7.25.1'
ext['ccdTestDefinitionVersion'] = '7.26.1'
// end

ext {
junitJupiterVersion = '5.7.0'
junitVintageVersion = '5.7.0'
springCloudVersion = '2021.0.3'
junitJupiterVersion = '5.12.0'
junitVintageVersion = '5.12.0'
springCloudVersion = '2021.0.9'
springfoxSwaggerVersion = '3.0.0'
hamcrestVersion = '1.3'
powermockVersion = '2.0.9'
reformLogging= '6.0.1'
appInsightsVersion = '2.4.1'
reformLogging= '6.1.8'
appInsightsVersion = '2.6.4'
restAssuredVersion = '4.3.0!!'
groovyVersion = '3.0.19!!'
tomcatVersion = '9.0.91'
feignJackson = '11.6'
tomcatVersion = '9.0.100'
feignJackson = '11.10'
limits = [
'instruction': 99,
'branch' : 99,
Expand Down Expand Up @@ -96,14 +96,14 @@ allprojects {
apply plugin: 'java'

ext {
elasticSearchVersion = '7.17.1'
elasticSearchVersion = '7.17.28'
}

dependencies {
testImplementation ("org.springframework.boot:spring-boot-starter-test:${springBootVersion}"){
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
}
implementation 'net.minidev:json-smart:2.4.9'
implementation 'net.minidev:json-smart:2.5.2'
}

// Global constraints
Expand Down Expand Up @@ -135,20 +135,20 @@ allprojects {
}
}

implementation group: 'org.postgresql', name: 'postgresql', version: '42.5.5'
implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.5'
implementation "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}"
implementation "org.apache.tomcat.embed:tomcat-embed-el:${tomcatVersion}"
implementation "org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}"
implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'
implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14'
implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.5'
// Overriding transitive dependency commons-compress due to CVE failures
implementation "org.apache.commons:commons-compress:1.26.0"
implementation "org.apache.commons:commons-compress:1.27.1"
// CVE-2021-28170
implementation "org.glassfish:jakarta.el:4.0.1"
implementation "org.glassfish:jakarta.el:4.0.2"

// CVE-2021-42550
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.13'
implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.13'
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.17'
implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.5.17'

implementation group: 'org.json', name: 'json', version: '20240303'

Expand All @@ -157,7 +157,7 @@ allprojects {
testImplementation "org.codehaus.groovy:groovy:${groovyVersion}"
testImplementation "org.codehaus.groovy:groovy-xml:${groovyVersion}"
testImplementation "org.codehaus.groovy:groovy-json:${groovyVersion}"
testImplementation 'com.github.hmcts:fortify-client:1.4.3:all'
testImplementation 'com.github.hmcts:fortify-client:1.4.7:all'
}

configurations.all {
Expand Down Expand Up @@ -194,7 +194,7 @@ java {
}

jacoco {
toolVersion = "0.8.8"
toolVersion = "0.8.12"
}


Expand Down Expand Up @@ -248,30 +248,30 @@ subprojects { subproject ->

dependencies {

implementation group: 'org.apache.poi', name: 'poi', version: '5.2.5'
implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '5.2.5'
implementation group: 'org.apache.poi', name: 'poi-scratchpad', version: '5.2.5'
implementation group: 'org.apache.poi', name: 'poi', version: '5.4.0'
implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '5.4.0'
implementation group: 'org.apache.poi', name: 'poi-scratchpad', version: '5.4.0'
implementation group: 'org.apache.commons', name: 'commons-collections4', version: '4.4'
implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.37.2'
implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.48'

implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0'
implementation group: 'com.google.code.gson', name: 'gson', version: '2.12.1'
implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: reformLogging
implementation group: 'com.microsoft.azure', name: 'applicationinsights-logging-logback', version: appInsightsVersion
implementation group: 'com.microsoft.azure', name: 'applicationinsights-spring-boot-starter', version: appInsightsVersion

implementation group: 'io.jsonwebtoken', name: 'jjwt', version:'0.9.1'
implementation (group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '4.0.3') {
implementation group: 'io.jsonwebtoken', name: 'jjwt', version:'0.12.6'
implementation (group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '4.1.2') {
exclude group: 'com.google.guava', module: 'guava'
}
implementation (group: 'com.github.hmcts', name: 'idam-java-client', version: '2.0.1') {
implementation (group: 'com.github.hmcts', name: 'idam-java-client', version: '2.1.1') {
exclude group: 'com.google.guava', module: 'guava'
}

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

testCompileOnly 'org.projectlombok:lombok:1.18.34'
testAnnotationProcessor 'org.projectlombok:lombok:1.18.34'
testCompileOnly 'org.projectlombok:lombok:1.18.36'
testAnnotationProcessor 'org.projectlombok:lombok:1.18.36'

implementation "org.springframework.security:spring-security-web"
implementation "org.springframework.security:spring-security-config"
Expand All @@ -283,56 +283,56 @@ subprojects { subproject ->
implementation('org.springframework.boot:spring-boot-starter-web')
implementation('org.springframework.boot:spring-boot-starter-data-jpa')

implementation group: 'com.zaxxer', name: 'HikariCP', version: '4.0.2'
implementation group: 'org.jooq', name: 'jool-java-8', version: '0.9.14'
implementation group: 'com.zaxxer', name: 'HikariCP', version: '4.0.3'
implementation group: 'org.jooq', name: 'jool-java-8', version: '0.9.15'
implementation "org.elasticsearch:elasticsearch:${elasticSearchVersion}"
implementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:${elasticSearchVersion}"
implementation group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '2.7.0'
implementation group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '2.9.3'
implementation('org.springframework.boot:spring-boot-starter-cache')

implementation 'org.flywaydb:flyway-core:6.5.7'

implementation group: 'javax.inject', name: 'javax.inject', version: '1'

implementation (group: 'com.microsoft.azure', name: 'azure-storage', version: '8.0.0') {
implementation (group: 'com.microsoft.azure', name: 'azure-storage', version: '8.6.6') {
exclude group: 'com.google.guava', module: 'guava'
}
implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15to18', version: '1.77'
implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15to18', version: '1.80'

testImplementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-bootstrap'
implementation group: 'commons-io', name: 'commons-io', version: '2.16.1'
implementation group: 'commons-io', name: 'commons-io', version: '2.18.0'
implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign'

// To avoid compiler warnings about @API annotations in JUnit5 code.
testImplementation 'org.apiguardian:apiguardian-api:1.0.0'
testImplementation "org.postgresql:postgresql:42.7.3"
testImplementation "org.testcontainers:postgresql:1.20.2"
testImplementation 'org.apiguardian:apiguardian-api:1.1.2'
testImplementation "org.postgresql:postgresql:42.7.5"
testImplementation "org.testcontainers:postgresql:1.20.5"
testImplementation "org.hamcrest:hamcrest-core:${hamcrestVersion}"
testImplementation "org.hamcrest:hamcrest-library:${hamcrestVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}"
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junitVintageVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}"
testImplementation('org.springframework.boot:spring-boot-starter-test')
testImplementation('org.springframework.cloud:spring-cloud-starter-contract-stub-runner:2.1.0.RELEASE') {
testImplementation('org.springframework.cloud:spring-cloud-starter-contract-stub-runner:2.2.6.RELEASE') {
exclude group: 'com.github.tomakehurst', module: 'wiremock-standalone'
exclude group: 'commons-beanutils', module: 'commons-beanutils'
}
testImplementation ('com.github.tomakehurst:wiremock-jre8:2.25.1')
testImplementation ('org.springframework.cloud:spring-cloud-contract-wiremock:2.2.1.RELEASE') {
testImplementation ('com.github.tomakehurst:wiremock-jre8:2.35.2')
testImplementation ('org.springframework.cloud:spring-cloud-contract-wiremock:2.2.6.RELEASE') {
exclude group: 'commons-beanutils', module: 'commons-beanutils'
}
testImplementation ("org.mockito:mockito-core:3.6.0") {
testImplementation ("org.mockito:mockito-core:3.12.4") {
exclude group: 'org.hamcrest'
}

testImplementation "org.mockito:mockito-all:1.10.19"
testImplementation 'org.mockito:mockito-junit-jupiter:3.6.0'
testImplementation 'org.mockito:mockito-junit-jupiter:3.12.4'
testImplementation 'com.github.npathai:hamcrest-optional:2.0.0'
testImplementation group: 'org.hamcrest', name: 'hamcrest-junit', version: '2.0.0.0'
testImplementation "io.github.openfeign:feign-jackson:${feignJackson}"
testImplementation 'io.github.openfeign.form:feign-form:3.8.0'
testImplementation "org.exparity:hamcrest-date:2.0.4"
testImplementation "org.exparity:hamcrest-date:2.0.8"
testImplementation "io.rest-assured:rest-assured:${restAssuredVersion}"
testImplementation group: 'org.powermock', name: 'powermock-api-mockito2', version: powermockVersion
testImplementation group: 'org.powermock', name: 'powermock-module-junit4', version: powermockVersion
Expand All @@ -344,13 +344,13 @@ subprojects { subproject ->
testImplementation group: 'commons-lang', name: 'commons-lang', version: '2.6'

// https://mvnrepository.com/artifact/junit/junit
implementation group: 'junit', name: 'junit', version: '4.13.1'
testImplementation group: 'junit', name: 'junit', version: '4.13.1'
testImplementation 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.4.0'
implementation group: 'junit', name: 'junit', version: '4.13.2'
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
testImplementation 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.15.0'
implementation group: 'com.google.guava', name: 'guava', version: '32.1.3-jre'
implementation 'javax.validation:validation-api:2.0.1.Final'
implementation 'io.swagger:swagger-annotations:1.6.6'
implementation 'com.vladmihalcea:hibernate-types-52:2.16.3'
implementation 'io.swagger:swagger-annotations:1.6.15'
implementation 'com.vladmihalcea:hibernate-types-52:2.21.1'
implementation group: 'commons-collections', name: 'commons-collections', version: '3.2.2'

}
Expand Down
2 changes: 1 addition & 1 deletion commons/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ bootJar {
}

def versions = [
jackson : '2.16.0'
jackson : '2.18.3'
]

dependencies {
Expand Down
6 changes: 3 additions & 3 deletions domain/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ bootJar {

ext {
mapstructGenSourceDir = 'build/classes/java/main'
orgMapstructVersion='1.3.0.Final'
orgMapstructVersion='1.6.3'
}

dependencies {
implementation project(':app-insights')
implementation (project(':repository')) {
exclude group: 'org.mapstruct', module: 'mapstruct'
}
implementation "org.apache.commons:commons-lang3:3.11"
implementation (group: 'commons-validator', name: 'commons-validator', version: '1.6') {
implementation "org.apache.commons:commons-lang3:3.17.0"
implementation (group: 'commons-validator', name: 'commons-validator', version: '1.9.0') {
exclude group: 'commons-beanutils', module: 'commons-beanutils'
}
implementation "org.mapstruct:mapstruct-jdk8:${orgMapstructVersion}"
Expand Down
8 changes: 4 additions & 4 deletions elastic-search-support/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ dependencies {
implementation project(':domain')
implementation project(':repository')
implementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:${elasticSearchVersion}"
implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0'
implementation group: 'com.google.code.gson', name: 'gson', version: '2.12.1'

// need these for command line to pass in the gradle version,
// intellij does not need the next 2 lines though
testImplementation project(path: ':domain', configuration: 'testOutput')
testImplementation project(":domain").sourceSets.main.output
testImplementation project(":repository").sourceSets.test.output
testImplementation group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.0'
testImplementation "org.testcontainers:elasticsearch:1.19.3"
testImplementation "org.testcontainers:junit-jupiter:1.19.3"
testImplementation group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.3'
testImplementation "org.testcontainers:elasticsearch:1.20.5"
testImplementation "org.testcontainers:junit-jupiter:1.20.5"
}

pitest {
Expand Down
6 changes: 3 additions & 3 deletions excel-importer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ dependencies {
testImplementation project(":repository").sourceSets.test.output

implementation "org.springframework.boot:spring-boot-starter-web"
implementation "org.apache.commons:commons-collections4:4.1"
implementation "org.apache.commons:commons-lang3:3.11"
implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '5.2.5'
implementation "org.apache.commons:commons-collections4:4.4"
implementation "org.apache.commons:commons-lang3:3.17.0"
implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '5.4.0'
}

bootJar {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading