Skip to content

Commit

Permalink
Merge pull request #779 from hmcts/DTSRD-1456-CVE-2023-4586
Browse files Browse the repository at this point in the history
DTSRD-1456
  • Loading branch information
andy-m-b authored Oct 12, 2023
2 parents fd915c4 + 4342b70 commit 5739f2f
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 16 deletions.
38 changes: 24 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,30 @@ dependencyManagement {
entry 'spring-cloud-starter-openfeign'
entry 'spring-cloud-openfeign-core'
}


// Resolves CVE-2023-4586
dependencySet(group: 'io.netty', version: '4.1.100.Final') {
entry 'netty-buffer'
entry 'netty-codec'
entry 'netty-codec-dns'
entry 'netty-codec-http'
entry 'netty-codec-http2'
entry 'netty-codec-socks'
entry 'netty-common'
entry 'netty-handler'
entry 'netty-handler-proxy'
entry 'netty-resolver'
entry 'netty-resolver-dns'
entry 'netty-resolver-dns-classes-macos'
entry 'netty-resolver-dns-native-macos'
entry 'netty-transport'
entry 'netty-transport-classes-epoll'
entry 'netty-transport-classes-kqueue'
entry 'netty-transport-native-epoll'
entry 'netty-transport-native-kqueue'
entry 'netty-transport-native-unix-common'
}
}
}

Expand Down Expand Up @@ -568,20 +592,6 @@ bootJar {
attributes('Implementation-Version': project.version.toString())
}
}
configurations.all {
resolutionStrategy.eachDependency { details ->
// added netty-tcnative-boringssl-static because its required for
// group: 'com.azure', name: 'azure-core', version: '1.13.0' in spring boot upgrade
if (details.requested.group == 'io.netty'
&& details.requested.name == 'netty-tcnative-boringssl-static' ){
details.useVersion "2.0.35.Final"
}
if (details.requested.group == 'io.netty'
&& details.requested.name != 'netty-tcnative-boringssl-static' ) {
details.useVersion "4.1.94.Final"
}
}
}

tasks.withType(Test) {
useJUnitPlatform()
Expand Down
4 changes: 2 additions & 2 deletions charts/rd-caseworker-ref-api/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ appVersion: "1.0"
description: A Helm chart for rd-caseworker-ref-api
name: rd-caseworker-ref-api
home: https://github.com/hmcts/rd-caseworker-ref-api
version: 1.0.2
version: 1.0.3
maintainers:
- name: Reference Data Team
dependencies:
- name: java
version: 4.2.0
version: 5.0.0
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
- name: servicebus
version: 1.0.4
Expand Down

0 comments on commit 5739f2f

Please sign in to comment.