Skip to content

Commit

Permalink
Merge pull request #1614 from hmcts/combine-prs-branch
Browse files Browse the repository at this point in the history
Renovate Combined Pull Request
  • Loading branch information
mikebrownccd authored Nov 15, 2023
2 parents 5e36a20 + e2dc88c commit 0b4df1d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Keep hub.Dockerfile aligned to this file as far as possible
ARG JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom"
# renovate: datasource=github-releases depName=microsoft/ApplicationInsights-Java
ARG APP_INSIGHTS_AGENT_VERSION=3.4.12
ARG APP_INSIGHTS_AGENT_VERSION=3.4.17

# Application image

Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ buildscript {

plugins {
id 'application'
id 'uk.gov.hmcts.java' version '0.12.45'
id 'uk.gov.hmcts.java' version '0.12.47'
id 'pmd'
id 'jacoco'
id 'io.spring.dependency-management' version '1.1.3'
id 'org.springframework.boot' version '2.7.15'
id 'org.springframework.boot' version '2.7.17'
id 'info.solidsoft.pitest' version '1.7.4'
id 'com.github.ben-manes.versions' version '0.45.0'
id 'org.sonarqube' version '4.0.0.2929'
Expand All @@ -35,12 +35,12 @@ ext['snakeyaml.version'] = '2.0'

def versions = [
junit : '5.9.0',
lombok : '1.18.28',
lombok : '1.18.30',
pitest : '1.7.4',
reformLogging : '6.0.1',
reformS2sClient: '4.0.2',
serenity : '2.2.12',
springBoot : '2.7.15',
springBoot : '2.7.17',
spring : '5.3.29',
springSecurity : '5.7.10',
springHystrix : '2.1.1.RELEASE',
Expand Down Expand Up @@ -323,7 +323,7 @@ dependencies {
implementation group: 'org.springframework.security', name:'spring-security-oauth2-core', version: versions.springSecurity
implementation group: 'org.springframework.security', name:'spring-security-oauth2-jose', version: versions.springSecurity
implementation group: 'org.springframework.security', name:'spring-security-oauth2-resource-server', version: versions.springSecurity
implementation group: 'org.springframework.retry', name: 'spring-retry', version: '2.0.2'
implementation group: 'org.springframework.retry', name: 'spring-retry', version: '2.0.4'
implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-netflix-hystrix', version: '2.2.10.RELEASE'
implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-bootstrap', version: '3.1.7'
implementation group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '1.5.5'
Expand Down Expand Up @@ -403,7 +403,7 @@ dependencies {
implementation group: 'com.fasterxml.jackson', name: 'jackson-bom', version: versions.jacksondata, ext: 'pom'

implementation group: 'org.apache.poi', name: 'poi', version: '5.2.4'
implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '5.2.2'
implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '5.2.4'
implementation group: 'org.apache.poi', name: 'poi-scratchpad', version: '5.2.2'

//Dependent on drools Jar. Can be removed CVE-2021-26291
Expand Down
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-7.6.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
networkTimeout=10000
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.5.5
1.6.2

0 comments on commit 0b4df1d

Please sign in to comment.