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] authored Aug 16, 2024
1 parent 170af45 commit 9d0499c
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 60 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# renovate: datasource=github-releases depName=microsoft/ApplicationInsights-Java
ARG APP_INSIGHTS_AGENT_VERSION=3.4.13
ARG APP_INSIGHTS_AGENT_VERSION=3.5.4

FROM openjdk:17-jdk-slim as builder
FROM openjdk:17.0.2-jdk-slim as builder

ARG JAR_FILE=build/libs/ccd-case-document-am-api.jar
COPY ${JAR_FILE} application.jar
Expand Down
82 changes: 41 additions & 41 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ plugins {
id 'checkstyle'
id 'pmd'
id 'jacoco'
id 'io.spring.dependency-management' version '1.1.5'
id 'info.solidsoft.pitest' version '1.5.0'
id 'io.spring.dependency-management' version '1.1.6'
id 'info.solidsoft.pitest' version '1.15.0'
id 'org.springframework.boot' version '2.7.18'
id 'uk.gov.hmcts.java' version '0.12.62'
id 'uk.gov.hmcts.java' version '0.12.63'
id 'com.github.ben-manes.versions' version '0.51.0'
id 'org.sonarqube' version '4.2.0.3129'
id 'com.github.spacialcircumstances.gradle-cucumber-reporting' version '0.1.23'
id 'au.com.dius.pact' version '4.1.7'
id 'net.serenity-bdd.serenity-gradle-plugin' version '3.0.0'
id 'org.sonarqube' version '4.4.1.3373'
id 'com.github.spacialcircumstances.gradle-cucumber-reporting' version '0.1.25'
id 'au.com.dius.pact' version '4.6.13'
id 'net.serenity-bdd.serenity-gradle-plugin' version '3.9.8'
}

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

def versions = [
junit : '5.6.2',
lombok : '1.18.20',
reformLogging : '6.0.1',
junit : '5.11.0',
lombok : '1.18.34',
reformLogging : '6.1.6',
serenity : '3.7.0',
springFramework : '5.3.27',
springFramework : '5.3.39',
springBoot : springBoot.class.package.implementationVersion,
springCloud : '3.1.3',
springCloud : '3.1.9',
springRetry : '1.3.4',
springfoxSwagger : '3.0.0',
restAssured : '4.3.1',
restAssured : '4.5.1',
cucumber : '5.5.0',
tomcatEmbedded : '9.0.82',
tomcatEmbedded : '9.0.93',
serviceAuthVersion : '3.1.4',
pact_version : '4.1.7',
pact_version : '4.6.13',
]

pmd {
toolVersion = '6.21.0'
toolVersion = '6.55.0'
sourceSets = []
}

Expand Down Expand Up @@ -188,7 +188,7 @@ jacocoTestReport {
}

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

pitest {
Expand Down Expand Up @@ -252,8 +252,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.14.0'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.16.0'
implementation group: 'commons-io', name: 'commons-io', version: '2.16.1'

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

implementation group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '1.5.5'
implementation group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '1.5.6'

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 @@ -284,58 +284,58 @@ 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.security', name: 'spring-security-rsa', version: '1.1.1'
implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.6.1.202309021850-r';
implementation group: 'org.springframework.security', name: 'spring-security-rsa', version: '1.1.5'
implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.10.0.202406032230-r';
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-oauth2-client', version: '2.7.18'
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-oauth2-resource-server', version: '2.7.18'

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.jsonwebtoken', name: 'jjwt', version: '0.12.6'
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.5.1'

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.40'

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.5.7'
implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.5.7'

// 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'

implementation group: 'com.microsoft.azure', name: 'applicationinsights-spring-boot-starter', version: '2.6.4'

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.40.1'

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.22.2'
testImplementation group: 'com.github.hmcts', name: 'befta-fw', version: '9.0.2'
testImplementation group: 'com.github.hmcts', name: 'ccd-test-definitions', version: '7.23.0'
testImplementation group: 'com.github.hmcts', name: 'befta-fw', version: '9.1.0'
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

testCompile 'com.github.hmcts:fortify-client:1.4.2'
testCompile 'com.github.hmcts:fortify-client:1.4.4'

integrationTestImplementation sourceSets.main.runtimeClasspath
integrationTestImplementation sourceSets.test.runtimeClasspath
Expand Down Expand Up @@ -364,20 +364,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.22') {
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.14
version: 1.7.15
maintainers:
- name: CCD Team
dependencies:
- name: java
version: 5.2.0
version: 5.2.1
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
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-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 5 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
22 changes: 12 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down Expand Up @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
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.9.4
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.116.0"
}
}
}

0 comments on commit 9d0499c

Please sign in to comment.