ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-18 18:56:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-6903 - address security issues reported by Snyk (#7244)

Browse Source 
ENT-6903: Update versions of BC, Shiro, Netty okhttp
Also updated platform version to 12.
This commit is contained in:
Chris Cochrane 2022-09-30 17:49:21 +01:00 committed by GitHub
parent 70c9bbc30a
commit 0ab4ac94c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@ -106,7 +106,6 @@ buildscript {
ext.hikari_version = constants.getProperty("hikariVersion") ext.hikari_version = constants.getProperty("hikariVersion")
ext.liquibase_version = constants.getProperty("liquibaseVersion") ext.liquibase_version = constants.getProperty("liquibaseVersion")
ext.artifactory_contextUrl = 'https://software.r3.com/artifactory' ext.artifactory_contextUrl = 'https://software.r3.com/artifactory'
ext.snake_yaml_version = constants.getProperty('snakeYamlVersion')
ext.docker_compose_rule_version = constants.getProperty("dockerComposeRuleVersion") ext.docker_compose_rule_version = constants.getProperty("dockerComposeRuleVersion")
ext.selenium_version = constants.getProperty("seleniumVersion") ext.selenium_version = constants.getProperty("seleniumVersion")
ext.ghostdriver_version = constants.getProperty("ghostdriverVersion") ext.ghostdriver_version = constants.getProperty("ghostdriverVersion")

12
constants.properties
View File

@ -12,7 +12,7 @@ java8MinUpdateVersion=171
# When incrementing platformVersion make sure to update # # When incrementing platformVersion make sure to update #
# net.corda.core.internal.CordaUtilsKt.PLATFORM_VERSION as well. # # net.corda.core.internal.CordaUtilsKt.PLATFORM_VERSION as well. #
# ***************************************************************# # ***************************************************************#
platformVersion=11 platformVersion=12
guavaVersion=28.0-jre guavaVersion=28.0-jre
# Quasar version to use with Java 8: # Quasar version to use with Java 8:
quasarVersion=0.7.15_r3 quasarVersion=0.7.15_r3
@ -21,13 +21,13 @@ quasarVersion11=0.8.1_r3
jdkClassifier11=jdk11 jdkClassifier11=jdk11
dockerJavaVersion=3.2.5 dockerJavaVersion=3.2.5
proguardVersion=6.1.1 proguardVersion=6.1.1
bouncycastleVersion=1.68 // bouncy castle version must not be changed on a patch release. Needs a full release test cycle to flush out any issues.
bouncycastleVersion=1.69
classgraphVersion=4.8.135 classgraphVersion=4.8.135
disruptorVersion=3.4.2 disruptorVersion=3.4.2
typesafeConfigVersion=1.3.4 typesafeConfigVersion=1.3.4
jsr305Version=3.0.2 jsr305Version=3.0.2
artifactoryPluginVersion=4.16.1 artifactoryPluginVersion=4.16.1
snakeYamlVersion=1.19
caffeineVersion=2.9.3 caffeineVersion=2.9.3
metricsVersion=4.1.0 metricsVersion=4.1.0
metricsNewRelicVersion=1.1.1 metricsNewRelicVersion=1.1.1
@ -56,8 +56,8 @@ servletVersion=4.0.1
assertjVersion=3.12.2 assertjVersion=3.12.2
slf4JVersion=1.7.30 slf4JVersion=1.7.30
log4JVersion=2.17.1 log4JVersion=2.17.1
okhttpVersion=3.14.2 okhttpVersion=3.14.9
nettyVersion=4.1.77.Final nettyVersion=4.1.82.Final
fileuploadVersion=1.4 fileuploadVersion=1.4
kryoVersion=4.0.2 kryoVersion=4.0.2
kryoSerializerVersion=0.43 kryoSerializerVersion=0.43
@ -83,7 +83,7 @@ eddsaVersion=0.3.0
dependencyCheckerVersion=5.2.0 dependencyCheckerVersion=5.2.0
commonsCollectionsVersion=4.3 commonsCollectionsVersion=4.3
beanutilsVersion=1.9.4 beanutilsVersion=1.9.4
shiroVersion=1.8.0 shiroVersion=1.9.1
hikariVersion=3.3.1 hikariVersion=3.3.1
liquibaseVersion=3.6.3 liquibaseVersion=3.6.3
dockerComposeRuleVersion=1.5.0 dockerComposeRuleVersion=1.5.0

2
core/src/main/kotlin/net/corda/core/internal/CordaUtils.kt
View File

@ -30,7 +30,7 @@ import java.util.jar.JarInputStream
// When incrementing platformVersion make sure to update PLATFORM_VERSION in constants.properties as well. // When incrementing platformVersion make sure to update PLATFORM_VERSION in constants.properties as well.
const val PLATFORM_VERSION = 11 const val PLATFORM_VERSION = 12
fun ServicesForResolution.ensureMinimumPlatformVersion(requiredMinPlatformVersion: Int, feature: String) { fun ServicesForResolution.ensureMinimumPlatformVersion(requiredMinPlatformVersion: Int, feature: String) {
checkMinimumPlatformVersion(networkParameters.minimumPlatformVersion, requiredMinPlatformVersion, feature) checkMinimumPlatformVersion(networkParameters.minimumPlatformVersion, requiredMinPlatformVersion, feature)