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 Oct 1, 2024
1 parent f1363d6 commit cd052fc
Show file tree
Hide file tree
Showing 10 changed files with 301 additions and 247 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# renovate: datasource=github-releases depName=microsoft/ApplicationInsights-Java
ARG APP_INSIGHTS_AGENT_VERSION=3.4.13
ARG APP_INSIGHTS_AGENT_VERSION=3.5.4
ARG PLATFORM=""

FROM hmctspublic.azurecr.io/base/java${PLATFORM}:17-distroless
Expand Down
72 changes: 36 additions & 36 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ plugins {
id 'application'
id 'java'
id 'jacoco'
id 'io.spring.dependency-management' version '1.0.13.RELEASE'
id 'org.springframework.boot' version '2.5.15'
id 'com.github.ben-manes.versions' version '0.36.0'
id 'org.sonarqube' version '4.3.0.3225'
id 'uk.gov.hmcts.java' version '0.12.43'
id 'com.github.spacialcircumstances.gradle-cucumber-reporting' version '0.1.23'
id 'io.spring.dependency-management' version '1.1.6'
id 'org.springframework.boot' version '2.7.18'
id 'com.github.ben-manes.versions' version '0.51.0'
id 'org.sonarqube' version '4.4.1.3373'
id 'uk.gov.hmcts.java' version '0.12.63'
id 'com.github.spacialcircumstances.gradle-cucumber-reporting' version '0.1.25'
}


Expand Down Expand Up @@ -217,12 +217,12 @@ dependencyCheck {

dependencyManagement {
imports {
mavenBom "org.springframework.cloud:spring-cloud-dependencies:2020.0.5"
mavenBom "org.springframework.cloud:spring-cloud-dependencies:2020.0.6"
}
dependencies {
dependency group: 'org.bouncycastle', name: 'bcpkix-jdk15to18', version: '1.77'
dependency group: 'org.bouncycastle', name: 'bcpkix-jdk15to18', version: '1.78.1'
// CVE-2018-10237 - Unbounded memory allocation
dependencySet(group: 'com.google.guava', version: '32.1.2-jre') {
dependencySet(group: 'com.google.guava', version: '32.1.3-jre') {
entry 'guava'
}
}
Expand All @@ -243,17 +243,17 @@ repositories {
}

def versions = [
junit : '5.7.0',
junitPlatform : '1.7.0',
reformLogging : '6.0.1',
appInsightsVersion : '2.4.1',
lombok : '1.18.28',
junitVintageVersion: '5.7.0',
junit : '5.11.1',
junitPlatform : '1.11.1',
reformLogging : '6.1.6',
appInsightsVersion : '2.6.4',
lombok : '1.18.34',
junitVintageVersion: '5.11.1',
springBoot : springBoot.class.package.implementationVersion,
springfoxSwagger : '3.0.0',
testcontainers : '1.18.3',
netty : '4.1.107.Final',
tomcatVersion : '9.0.82'
testcontainers : '1.20.2',
netty : '4.1.113.Final',
tomcatVersion : '9.0.95'
]

ext.libraries = [
Expand Down Expand Up @@ -329,45 +329,45 @@ dependencies {
implementation group: 'io.netty', name: 'netty-transport-native-kqueue', version: versions.netty
implementation group: 'io.netty', name: 'netty-transport-native-unix-common', version: versions.netty

implementation group: 'org.glassfish', name: 'jakarta.el', version: '4.0.1' // CVE-2021-28170
implementation group: 'org.glassfish', name: 'jakarta.el', version: '4.0.2' // CVE-2021-28170
// 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.5.8'
implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.5.8'

implementation group: 'io.hawt', name: 'hawtio-springboot', version: '2.12.0'
implementation group: 'io.hawt', name: 'hawtio-springboot', version: '2.17.7'

implementation group: 'io.springfox', name: 'springfox-swagger2', version: versions.springfoxSwagger

implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: versions.reformLogging
implementation group: 'com.microsoft.azure', name: 'applicationinsights-logging-logback', version: versions.appInsightsVersion
implementation group: 'com.microsoft.azure', name: 'applicationinsights-spring-boot-starter', version: versions.appInsightsVersion

implementation group: 'com.vladmihalcea', name: 'hibernate-types-52', version: '2.10.0'
implementation group: 'com.vladmihalcea', name: 'hibernate-types-52', version: '2.21.1'

implementation group: 'org.projectlombok', name: 'lombok', version: versions.lombok
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: versions.lombok

implementation group: 'org.hibernate', name: 'hibernate-core', version: '5.4.25.Final' // For CVE-2020-25638
implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13' // For CVE-2020-13956
implementation group: 'org.hibernate', name: 'hibernate-core', version: '5.6.15.Final' // For CVE-2020-25638
implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14' // For CVE-2020-13956

implementation group: 'org.apache.activemq', name: 'activemq-client', version: '5.16.7' // For CVE-2021-26117
implementation group: 'org.apache.activemq', name: 'activemq-broker', version: '5.16.7' // For CVE-2021-26117
implementation group: 'net.minidev', name: 'json-smart', version: '2.4.9'
implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.37.2'
implementation group: 'commons-io', name: 'commons-io', version: '2.14.0'
implementation group: 'org.apache.activemq', name: 'activemq-client', version: '5.18.5' // For CVE-2021-26117
implementation group: 'org.apache.activemq', name: 'activemq-broker', version: '5.18.5' // For CVE-2021-26117
implementation group: 'net.minidev', name: 'json-smart', version: '2.5.1'
implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.41.2'
implementation group: 'commons-io', name: 'commons-io', version: '2.17.0'
implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.5'

implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: versions.tomcatVersion
implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: versions.tomcatVersion
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.16.0'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.18.0'

runtimeOnly group: 'org.postgresql', name: 'postgresql', version: '42.5.5'
runtimeOnly group: 'com.zaxxer', name: 'HikariCP', version: '4.0.2'
runtimeOnly group: 'org.postgresql', name: 'postgresql', version: '42.7.4'
runtimeOnly group: 'com.zaxxer', name: 'HikariCP', version: '4.0.3'

aatImplementation group: 'com.github.hmcts', name: 'ccd-test-definitions', version: '7.22.2', {
aatImplementation group: 'com.github.hmcts', name: 'ccd-test-definitions', version: '7.23.0', {
exclude group: 'com.sun.xml.bind', module: 'jaxb-osgi'
}
aatImplementation group: 'com.github.hmcts', name: 'befta-fw', version: '9.0.2', {
aatImplementation group: 'com.github.hmcts', name: 'befta-fw', version: '9.1.0', {
exclude group: 'com.sun.xml.bind', module: 'jaxb-osgi'
}
aatImplementation group: 'org.apache.poi', name: 'poi-ooxml-schemas', version: '4.1.2' //For CVE-2019-12415
Expand All @@ -389,7 +389,7 @@ dependencies {
integrationTestImplementation group: 'org.testcontainers', name: 'postgresql', version: versions.testcontainers

smokeTestImplementation sourceSets.main.runtimeClasspath
testImplementation 'com.github.hmcts:fortify-client:1.4.3:all'
testImplementation 'com.github.hmcts:fortify-client:1.4.4:all'
}

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-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-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
6 changes: 3 additions & 3 deletions topic-reader-util/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ application {
}

dependencies {
implementation "com.azure:azure-messaging-servicebus:7.0.1"
implementation "org.slf4j:slf4j-api:1.7.5"
implementation "org.slf4j:slf4j-simple:1.7.5"
implementation "com.azure:azure-messaging-servicebus:7.17.4"
implementation "org.slf4j:slf4j-api:1.7.36"
implementation "org.slf4j:slf4j-simple:1.7.36"
}
2 changes: 1 addition & 1 deletion topic-reader-util/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.7.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit cd052fc

Please sign in to comment.