Skip to content

Commit

Permalink
Update All patch-minor dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@renovate
renovate[bot] authored Jul 26, 2023
1 parent 79bb52e commit 0714ba7
Show file tree
Hide file tree
Showing 15 changed files with 250 additions and 187 deletions.
2 changes: 1 addition & 1 deletion aat/build.gradle
View file
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
View file
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.5.1'
runtimeOnly group: 'org.postgresql', name: 'postgresql', version: '42.6.0'

testImplementation project(":app-insights").sourceSets.main.output
testImplementation project(":commons").sourceSets.main.output
Expand Down
104 changes: 52 additions & 52 deletions build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
buildscript {
ext {
springBootVersion = '2.7.11'
springBootVersion = '2.7.14'
}
dependencies {
classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.0.1622"
classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8.0.1969"
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
}
}

plugins {
id 'application'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id 'se.patrikerdes.use-latest-versions' version '0.2.7'
id 'com.github.ben-manes.versions' version '0.20.0'
id 'org.sonarqube' version '2.7'
id 'io.spring.dependency-management' version '1.1.2'
id 'se.patrikerdes.use-latest-versions' version '0.2.18'
id 'com.github.ben-manes.versions' version '0.47.0'
id 'org.sonarqube' version '2.8'
id 'jacoco'
id "com.github.kt3k.coveralls" version "2.8.2"
id 'io.franzbecker.gradle-lombok' version '2.0'
id 'com.github.spacialcircumstances.gradle-cucumber-reporting' version '0.1.23'
id "info.solidsoft.pitest" version '1.5.1' apply(false)
id "org.jetbrains.gradle.plugin.idea-ext" version "0.7"
id 'uk.gov.hmcts.java' version '0.12.40'
id "com.github.kt3k.coveralls" version "2.12.2"
id 'io.franzbecker.gradle-lombok' version '2.2'
id 'com.github.spacialcircumstances.gradle-cucumber-reporting' version '0.1.25'
id "info.solidsoft.pitest" version '1.9.11' apply(false)
id "org.jetbrains.gradle.plugin.idea-ext" version "0.10"
id 'uk.gov.hmcts.java' version '0.12.43'
}

apply plugin: 'java'
Expand Down Expand Up @@ -55,17 +55,17 @@ ext['log4j2.version'] = '2.17.1'
// end

ext {
junitJupiterVersion = '5.7.0'
junitVintageVersion = '5.7.0'
springCloudVersion = '2021.0.3'
junitJupiterVersion = '5.10.0'
junitVintageVersion = '5.10.0'
springCloudVersion = '2021.0.8'
springfoxSwaggerVersion = '3.0.0'
hamcrestVersion = '1.3'
powermockVersion = '2.0.0-beta.5'
powermockVersion = '2.0.9'
reformLogging= '5.1.9'
restAssuredVersion = '4.3.0!!'
groovyVersion = '3.0.17!!'
tomcatVersion = '9.0.73!!'
feignJackson = '11.6'
feignJackson = '11.10'
limits = [
'instruction': 99,
'branch' : 99,
Expand Down Expand Up @@ -97,30 +97,30 @@ allprojects {
apply plugin: 'java'

ext {
elasticSearchVersion = '7.17.1'
elasticSearchVersion = '7.17.12'
}

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.7'
implementation 'net.minidev:json-smart:2.5.0'
}

// Global constraints
dependencies {
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.21"
implementation "org.apache.commons:commons-compress:1.23.0"
// 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.10'
implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.10'
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.8'
implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.4.8'
testImplementation "io.rest-assured:xml-path:${restAssuredVersion}"
testImplementation "io.rest-assured:json-path:${restAssuredVersion}"
testImplementation "org.codehaus.groovy:groovy:${groovyVersion}"
Expand Down Expand Up @@ -189,21 +189,21 @@ subprojects { subproject ->
}

dependencies {
implementation group: 'org.apache.poi', name: 'poi', version: '5.2.2'
implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '5.2.2'
implementation group: 'org.apache.poi', name: 'poi-scratchpad', version: '5.2.2'
implementation group: 'org.apache.poi', name: 'poi', version: '5.2.3'
implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '5.2.3'
implementation group: 'org.apache.poi', name: 'poi-scratchpad', version: '5.2.3'
implementation group: 'org.apache.commons', name: 'commons-collections4', version: '4.4'
implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.21'
implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.31'

implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0'
implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: reformLogging
implementation group: 'com.github.hmcts.java-logging', name: 'logging-appinsights', version: reformLogging

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: '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'
}

Expand All @@ -217,58 +217,58 @@ 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-jdk15on', version: '1.70'

// CVE-2021-29425
implementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-bootstrap', version: '3.1.3'
implementation group: 'commons-io', name: 'commons-io', version: '2.13.0'
implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-bootstrap', version: '3.1.7'
implementation "org.springframework.cloud:spring-cloud-starter-bootstrap"
implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign', version: '3.1.3'
implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign', version: '3.1.8'

// To avoid compiler warnings about @API annotations in JUnit5 code.
testImplementation 'org.apiguardian:apiguardian-api:1.0.0'
testImplementation "org.postgresql:postgresql:42.5.1"
testImplementation "org.testcontainers:postgresql:1.17.2"
testImplementation 'org.apiguardian:apiguardian-api:1.1.2'
testImplementation "org.postgresql:postgresql:42.6.0"
testImplementation "org.testcontainers:postgresql:1.18.3"
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.0')
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 @@ -280,13 +280,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.9.11'
implementation 'com.google.guava:guava:31.1-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.11'
implementation 'com.vladmihalcea:hibernate-types-52:2.21.1'
implementation group: 'commons-collections', name: 'commons-collections', version: '3.2.2'

}
Expand Down
4 changes: 2 additions & 2 deletions charts/ccd-definition-store-api/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ description: Helm chart for the HMCTS CCD Definition Store
name: ccd-definition-store-api
apiVersion: v2
home: https://github.com/hmcts/ccd-definition-store-api
version: 1.6.14
version: 1.6.15
maintainers:
- name: HMCTS CCD Dev Team
email: [email protected]
dependencies:
- name: java
version: 4.0.13
version: 4.1.5
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
2 changes: 1 addition & 1 deletion commons/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ bootJar {
}

def versions = [
jackson : '2.14.1'
jackson : '2.15.2'
]

dependencies {
Expand Down
6 changes: 3 additions & 3 deletions domain/build.gradle
View file
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.5.5.Final'
}

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.12.0"
implementation (group: 'commons-validator', name: 'commons-validator', version: '1.7') {
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
View file
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.10.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.15.1"
testImplementation "org.testcontainers:junit-jupiter:1.15.1"
testImplementation group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.1'
testImplementation "org.testcontainers:elasticsearch:1.18.3"
testImplementation "org.testcontainers:junit-jupiter:1.18.3"
}

pitest {
Expand Down
6 changes: 3 additions & 3 deletions excel-importer/build.gradle
View file
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 "org.apache.poi:poi-ooxml:5.2.2"
implementation "org.apache.commons:commons-collections4:4.4"
implementation "org.apache.commons:commons-lang3:3.12.0"
implementation "org.apache.poi:poi-ooxml:5.2.3"
}

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

0 comments on commit 0714ba7

Please sign in to comment.