Skip to content

Commit ceed9b1

Browse files
Update All patch-minor dependencies
1 parent 61b45a8 commit ceed9b1

File tree

7 files changed

+37
-32
lines changed

7 files changed

+37
-32
lines changed

build.gradle

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
dependencies {
3-
classpath("org.springframework.boot:spring-boot-gradle-plugin:3.1.2")
3+
classpath("org.springframework.boot:spring-boot-gradle-plugin:3.1.4")
44
}
55
dependencies {
66
classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.3.0.3225"
@@ -13,16 +13,16 @@ plugins {
1313
id 'idea'
1414
id 'application'
1515
id 'io.spring.dependency-management' version '1.1.3'
16-
id 'org.springframework.boot' version '3.1.2'
17-
id 'org.owasp.dependencycheck' version '8.3.1'
16+
id 'org.springframework.boot' version '3.1.4'
17+
id 'org.owasp.dependencycheck' version '8.4.0'
1818
id 'se.patrikerdes.use-latest-versions' version '0.2.18'
19-
id 'com.github.ben-manes.versions' version '0.47.0'
20-
id 'org.sonarqube' version '4.3.0.3225'
19+
id 'com.github.ben-manes.versions' version '0.49.0'
20+
id 'org.sonarqube' version '4.4.1.3373'
2121
id 'jacoco'
2222
id "com.github.kt3k.coveralls" version "2.12.2"
23-
id 'com.github.spacialcircumstances.gradle-cucumber-reporting' version '0.1.23'
24-
id "info.solidsoft.pitest" version '1.9.11'
25-
id 'uk.gov.hmcts.java' version '0.12.43'
23+
id 'com.github.spacialcircumstances.gradle-cucumber-reporting' version '0.1.25'
24+
id "info.solidsoft.pitest" version '1.15.0'
25+
id 'uk.gov.hmcts.java' version '0.12.45'
2626
}
2727

2828
dependencyUpdates.resolutionStrategy {
@@ -98,11 +98,11 @@ java {
9898
}
9999

100100
ext {
101-
sl4jVersion = '2.0.7'
102-
lombokVersion = '1.18.28'
101+
sl4jVersion = '2.0.9'
102+
lombokVersion = '1.18.30'
103103
reformLogging = '6.0.1'
104-
springCloudVersion = '2022.0.3'
105-
springSecurity = '6.1.2'
104+
springCloudVersion = '2022.0.4'
105+
springSecurity = '6.1.4'
106106
limits = [
107107
'instruction': 6,
108108
'branch' : 8,
@@ -145,8 +145,8 @@ dependencies {
145145
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
146146

147147
implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: '2.2.0'
148-
implementation "org.flywaydb:flyway-core:9.21.1"
149-
implementation group: 'org.yaml', name: 'snakeyaml', version: '2.1'
148+
implementation "org.flywaydb:flyway-core:9.22.2"
149+
implementation group: 'org.yaml', name: 'snakeyaml', version: '2.2'
150150
implementation group: 'com.zaxxer', name: 'HikariCP', version: '5.0.1'
151151
runtimeOnly group: 'org.postgresql', name: 'postgresql', version: '42.6.0'
152152
implementation group: 'com.github.hmcts', name: 'auth-checker-lib', version: '2.1.5'
@@ -169,23 +169,23 @@ dependencies {
169169
// CVE-2021-28170
170170
implementation "org.glassfish:jakarta.el:4.0.2"
171171

172-
aatImplementation 'com.github.hmcts:service-auth-provider-java-client:5.1.0'
172+
aatImplementation 'com.github.hmcts:service-auth-provider-java-client:5.1.1'
173173
codacy 'com.github.codacy:codacy-coverage-reporter:13.13.7'
174174
testImplementation "org.junit.jupiter:junit-jupiter-api"
175175
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
176176
testRuntimeOnly "org.junit.vintage:junit-vintage-engine"
177177

178178
testImplementation "org.junit.jupiter:junit-jupiter:5.10.0"
179-
testImplementation "org.testcontainers:testcontainers:1.18.3"
180-
testImplementation "org.testcontainers:junit-jupiter:1.18.3"
179+
testImplementation "org.testcontainers:testcontainers:1.19.1"
180+
testImplementation "org.testcontainers:junit-jupiter:1.19.1"
181181
testImplementation 'org.testcontainers:postgresql'
182182

183183
testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
184184

185185
testImplementation group: 'com.github.hmcts', name: 'ccd-test-definitions', version: '7.19.12'
186186
testImplementation group: 'com.github.hmcts', name: 'befta-fw', version: '8.7.11'
187187
testImplementation 'com.github.hmcts:fortify-client:1.3.0:all'
188-
testImplementation 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.9.11'
188+
testImplementation 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.15.0'
189189
}
190190
// end::dependencies[]
191191

charts/ccd-user-profile-api/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ description: CCD User profile
22
name: ccd-user-profile-api
33
apiVersion: v2
44
home: https://github.com/hmcts/ccd-user-profile-api
5-
version: 1.6.11
5+
version: 1.6.12
66
maintainers:
77
- name: HMCTS CCD Dev Team
88
99
dependencies:
1010
- name: java
11-
version: 4.0.13
11+
version: 4.2.0
1212
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'

docker/database/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:11.1
1+
FROM postgres:11.16
22
USER postgres
33
LABEL maintainer="https://github.com/hmcts/ccd-user-profile-api"
44

gradle/wrapper/gradle-wrapper.jar

1.61 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
8788

8889
# Use the maximum available, or set MAX_FD != -1 to use that value.
8990
MAX_FD=maximum
@@ -130,26 +131,29 @@ location of your Java installation."
130131
fi
131132
else
132133
JAVACMD=java
133-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134+
if ! command -v java >/dev/null 2>&1
135+
then
136+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134137
135138
Please set the JAVA_HOME variable in your environment to match the
136139
location of your Java installation."
140+
fi
137141
fi
138142

139143
# Increase the maximum file descriptors if we can.
140144
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
141145
case $MAX_FD in #(
142146
max*)
143147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
144-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
145149
MAX_FD=$( ulimit -H -n ) ||
146150
warn "Could not query maximum file descriptor limit"
147151
esac
148152
case $MAX_FD in #(
149153
'' | soft) :;; #(
150154
*)
151155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
152-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
153157
ulimit -n "$MAX_FD" ||
154158
warn "Could not set maximum file descriptor limit to $MAX_FD"
155159
esac
@@ -198,11 +202,11 @@ fi
198202
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
199203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
200204

201-
# Collect all arguments for the java command;
202-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
203-
# shell script including quotes and variable substitutions, so put them in
204-
# double quotes to make sure that they get re-expanded; and
205-
# * put everything else in single quotes, so that it's not re-expanded.
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
206210

207211
set -- \
208212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

infrastructure/.terraform-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.9
1+
1.6.0

0 commit comments

Comments
 (0)