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[bot] committed Jun 28, 2023
1 parent b02b759 commit 4ae1c7f
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG PLATFORM=""

FROM adoptopenjdk${PLATFORM}:11-jre-hotspot as builder
FROM adoptopenjdk${PLATFORM}:11.0.11_9-jre-hotspot as builder

ARG JAR_FILE=build/libs/ccd-case-document-am-api.jar
COPY ${JAR_FILE} application.jar
Expand Down
76 changes: 38 additions & 38 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
}
configurations.maybeCreate("pitest")
dependencies {
classpath("net.serenity-bdd:serenity-gradle-plugin:2.2.8")
classpath("net.serenity-bdd:serenity-gradle-plugin:2.4.34")
}
}

Expand All @@ -12,14 +12,14 @@ plugins {
id 'checkstyle'
id 'pmd'
id 'jacoco'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id 'info.solidsoft.pitest' version '1.5.0'
id 'org.springframework.boot' version '2.6.10'
id 'uk.gov.hmcts.java' version '0.12.40'
id 'com.github.ben-manes.versions' version '0.36.0'
id 'org.sonarqube' version '3.0'
id 'com.github.spacialcircumstances.gradle-cucumber-reporting' version '0.1.23'
id 'au.com.dius.pact' version '4.1.7'
id 'io.spring.dependency-management' version '1.1.0'
id 'info.solidsoft.pitest' version '1.9.11'
id 'org.springframework.boot' version '2.7.13'
id 'uk.gov.hmcts.java' version '0.12.43'
id 'com.github.ben-manes.versions' version '0.47.0'
id 'org.sonarqube' version '3.5.0.2730'
id 'com.github.spacialcircumstances.gradle-cucumber-reporting' version '0.1.25'
id 'au.com.dius.pact' version '4.6.1'
}

apply plugin: 'java'
Expand All @@ -29,24 +29,24 @@ apply plugin: 'idea'
apply plugin: 'io.spring.dependency-management'

def versions = [
junit : '5.6.2',
lombok : '1.18.20',
junit : '5.9.3',
lombok : '1.18.28',
reformLogging : '5.1.9',
serenity : '2.1.0',
springFramework : '5.3.26',
springFramework : '5.3.28',
springBoot : springBoot.class.package.implementationVersion,
springCloud : '3.1.3',
springCloud : '3.1.7',
springRetry : '1.3.4',
springfoxSwagger : '3.0.0',
restAssured : '4.3.1',
restAssured : '4.5.1',
cucumber : '5.5.0',
tomcatEmbedded : '9.0.73',
tomcatEmbedded : '9.0.76',
serviceAuthVersion : '3.1.4',
pact_version : '4.1.7',
pact_version : '4.6.1',
]

pmd {
toolVersion = '6.21.0'
toolVersion = '6.55.0'
sourceSets = []
}
ext['spring-framework.version'] = '5.3.26'
Expand Down Expand Up @@ -194,7 +194,7 @@ jacocoTestReport {
project.tasks['sonarqube'].dependsOn jacocoTestReport

jacoco {
toolVersion = "0.8.2"
toolVersion = "0.8.10"
}

pitest {
Expand Down Expand Up @@ -254,8 +254,8 @@ repositories {

dependencies {
implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.5'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
implementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation group: 'commons-io', name: 'commons-io', version: '2.13.0'

implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation'
Expand All @@ -266,7 +266,7 @@ dependencies {
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-cache'

implementation group: 'org.springframework', name: 'spring-context-support', version: versions.springFramework
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 group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
implementation group: 'org.json', name: 'json', version: '20200518'
Expand All @@ -285,52 +285,52 @@ dependencies {
implementation group: 'org.springframework.retry', name: 'spring-retry', version: versions.springRetry
implementation group: 'org.springframework.security', name: 'spring-security-web'
implementation group: 'org.springframework.security', name: 'spring-security-config'
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-oauth2-client', version: '2.5.14'
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-oauth2-resource-server', version: '2.5.14'
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-oauth2-client', version: '2.7.13'
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-oauth2-resource-server', version: '2.7.13'

implementation group: 'io.jsonwebtoken', name: 'jjwt', version: '0.9.1'
implementation group: 'io.github.openfeign', name: 'feign-httpclient', version: '11.0'
implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'
implementation group: 'io.github.openfeign', name: 'feign-httpclient', version: '11.10'
implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14'

implementation group: 'javax.inject', name: 'javax.inject', version: '1'
implementation group: 'io.springfox', name: 'springfox-boot-starter', version: versions.springfoxSwagger
implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign', version: versions.springCloud

implementation group: 'net.minidev', name: 'json-smart', version: '2.4.7'
implementation group: 'net.minidev', name: 'json-smart', version: '2.4.11'

implementation group: 'io.vavr', name: 'vavr', version: '0.10.4'

implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.21'
implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.31'

implementation "org.apache.tomcat.embed:tomcat-embed-core:${versions.tomcatEmbedded}"
implementation "org.apache.tomcat.embed:tomcat-embed-el:${versions.tomcatEmbedded}"
implementation "org.apache.tomcat.embed:tomcat-embed-websocket:${versions.tomcatEmbedded}"

//CVE-2021-42500
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'

// CVE-2021-28170
implementation group: 'org.glassfish', name: 'jakarta.el', version: '4.0.1'
implementation group: 'org.glassfish', name: 'jakarta.el', version: '4.0.2'

testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: versions.junit
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: versions.junit
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: versions.junit

testImplementation group: 'net.javacrumbs.json-unit', name: 'json-unit-assertj', version: '2.27.0'
testImplementation group: 'net.javacrumbs.json-unit', name: 'json-unit-assertj', version: '2.38.0'

testImplementation (group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: versions.springBoot) {
exclude group: 'junit', module: 'junit'
}
testImplementation (group: 'com.github.hmcts', name: 'ccd-test-definitions', version: '7.13.0') {
testImplementation (group: 'com.github.hmcts', name: 'ccd-test-definitions', version: '7.19.12') {
exclude group: 'io.rest-assured', module : 'rest-assured'
exclude group: 'com.github.hmcts.befta-fw', module: 'befta-fw'
}
testImplementation group: 'com.github.hmcts', name: 'befta-fw', version: '8.7.11'
testImplementation group: 'commons-lang', name: 'commons-lang', version: '2.6'
testImplementation group: 'org.assertj', name: 'assertj-vavr', version: '0.4.2'
testImplementation group: 'org.assertj', name: 'assertj-vavr', version: '0.4.3'

testImplementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-contract-stub-runner', version: '2.2.2.RELEASE'
testImplementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-contract-stub-runner', version: '2.2.6.RELEASE'
testImplementation group: 'io.rest-assured', name: 'rest-assured', version: versions.restAssured
testImplementation group: 'io.rest-assured', name: 'json-path', version: versions.restAssured
testImplementation group: 'io.rest-assured', name: 'xml-path', version: versions.restAssured
Expand Down Expand Up @@ -363,20 +363,20 @@ dependencyManagement {
dependencies {
dependency group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.70'
// Remove once BEFTA rest-assured is updated
dependencySet(group: 'io.rest-assured', version: '4.3.1') {
dependencySet(group: 'io.rest-assured', version: '4.5.1') {
entry 'json-path'
entry 'xml-path'
}

// Versions prior to 30.0 vulnerable to CVE-2020-8908
dependency 'com.google.guava:guava:30.1-jre'
dependency 'com.google.guava:guava:30.1.1-jre'

dependencySet(group: 'org.codehaus.groovy', version: '3.0.7') {
dependencySet(group: 'org.codehaus.groovy', version: '3.0.17') {
entry 'groovy'
entry 'groovy-xml'
entry 'groovy-json'
}
dependency "org.apache.httpcomponents:httpclient:4.5.13"
dependency "org.apache.httpcomponents:httpclient:4.5.14"

}
}
Expand Down
4 changes: 2 additions & 2 deletions charts/ccd-case-document-am-api/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ appVersion: "1.0"
description: A Helm chart for CCD Case Document AM API
name: ccd-case-document-am-api
home: https://github.com/hmcts/ccd-case-document-am-api
version: 1.7.11
version: 1.7.12
maintainers:
- name: CCD Team
dependencies:
- name: java
version: 4.0.13
version: 4.1.4
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion infrastructure/.terraform-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.9
1.5.1
2 changes: 1 addition & 1 deletion infrastructure/state.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.45.0"
version = "~> 3.62.0"
}
}
}

0 comments on commit 4ae1c7f

Please sign in to comment.