Skip to content

Commit

Permalink
Merge pull request #689 from hmcts/RDCC-6470_Upgrade_Libs
Browse files Browse the repository at this point in the history
RDCC-6470 Upgrade Libs
  • Loading branch information
vilasshelke-hmcts authored Mar 16, 2023
2 parents 125cbb3 + f4fc881 commit b7b80f2
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
17 changes: 8 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {

plugins {
id 'application'
id 'uk.gov.hmcts.java' version '0.12.12'
id 'uk.gov.hmcts.java' version '0.12.39'
id 'jacoco'
id 'pmd'
id 'com.github.ben-manes.versions' version '0.43.0'
Expand All @@ -32,14 +32,14 @@ apply plugin: 'idea'
def versions = [
lombok : '1.18.22',
gradlePitest : '1.5.1',
pitest : '1.7.0',
pitest : '1.7.4',
reformHealthStarter: '0.0.5',
reformLogging : '6.0.1',
serenity : '2.0.76',
sonarPitest : '0.5',
springBoot : '2.7.7',
pact_version : '4.1.7',
launchDarklySdk : "5.10.2",
launchDarklySdk : '5.10.7',
restAssured : '4.3.3',
jackson : '2.14.2',
log4j : '2.17.1',
Expand Down Expand Up @@ -159,7 +159,7 @@ configurations {


pmd {
toolVersion = '6.12.0'
toolVersion = '6.53.0'
ignoreFailures = true
sourceSets = [sourceSets.main, sourceSets.test, sourceSets.integrationTest, sourceSets.functionalTest, sourceSets.smokeTest]
reportsDir = file("$project.buildDir/reports/pmd")
Expand Down Expand Up @@ -465,16 +465,15 @@ dependencies {
testImplementation group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.1'


contractTestImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
contractTestRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.6.2")
contractTestImplementation('org.junit.jupiter:junit-jupiter-api:5.7.2')
contractTestImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
contractTestRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2")

testImplementation group: 'org.pitest', name: 'pitest', version: versions.pitest
testImplementation 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.7.0'
testImplementation 'org.codehaus.sonar-plugins:sonar-pitest-plugin:0.5'


testImplementation 'io.github.openfeign:feign-jackson:10.7.0'
testImplementation 'io.github.openfeign:feign-jackson:12.1'
testImplementation group: 'com.github.mifmif', name: 'generex', version: '1.0.2'

testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock:3.1.0'
Expand Down Expand Up @@ -520,7 +519,7 @@ dependencyManagement {

dependencies {
// CVE-2021-42340
dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.69') {
dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.71') {
entry 'tomcat-embed-core'
entry 'tomcat-embed-el'
entry 'tomcat-embed-websocket'
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.5
1.3.7
4 changes: 2 additions & 2 deletions infrastructure/terraform.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.32.0"
version = "~> 3.40.0"
}

azuread = {
source = "hashicorp/azuread"
version = "2.30.0"
version = "2.33.0"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ void test_getUserInfo_unAuthorizedException() {
new HashMap<>(), null, new RequestTemplate());
when(idamClient.getUserInfo(anyString()))
.thenThrow(new FeignException
.Unauthorized("User is not authorized", request,null));
.Unauthorized("User is not authorized", request,null, null));

when(cacheManager.getCache(anyString())).thenReturn(caffeineCacheMock);
doReturn(cache).when(caffeineCacheMock).getNativeCache();
Expand Down

0 comments on commit b7b80f2

Please sign in to comment.