From 13073c300f4db305722946e35bba9828863d041c Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Thu, 23 Jul 2020 16:59:42 +0100 Subject: [PATCH] NOTICK: OS 4.3 to OS 4.4 merge (#6506) * CORDA-3917 Update to Jackson 2.9.8 (#6493) * Update to Jackson 2.9.8 to address multiple security issues, and update warning note about updates to clarify that it refers to 2.10+. When the note was added 2.9.7 as the highest available version in the 2.9.x series. * Add PR code checks Jenkinsfile * CORDA-3916 Update to BouncyCastle 1.61 (#6492) Update to BouncyCastle 1.61. Updating one version at a time to mitigate risk of a complex breaking change being introduced. * Added missing collection of JUnit tests and logs Co-authored-by: Waldemar Zurowski --- .ci/dev/compatibility/JenkinsfileJDK11Compile | 4 ++++ build.gradle | 4 ++-- constants.properties | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.ci/dev/compatibility/JenkinsfileJDK11Compile b/.ci/dev/compatibility/JenkinsfileJDK11Compile index f6e9c43195..d84a91db54 100644 --- a/.ci/dev/compatibility/JenkinsfileJDK11Compile +++ b/.ci/dev/compatibility/JenkinsfileJDK11Compile @@ -32,6 +32,10 @@ pipeline { } post { + always { + archiveArtifacts allowEmptyArchive: true, artifacts: '**/logs/**/*.log' + junit testResults: '**/build/test-results/**/*.xml', keepLongStdio: true + } cleanup { deleteDir() /* clean up our workspace */ } diff --git a/build.gradle b/build.gradle index 85fc16a9da..241c85b5a6 100644 --- a/build.gradle +++ b/build.gradle @@ -62,8 +62,8 @@ buildscript { ext.asm_version = '7.1' ext.artemis_version = '2.6.2' - // TODO Upgrade Jackson only when corda is using kotlin 1.3.10 - ext.jackson_version = '2.9.7' + // TODO Upgrade to Jackson 2.10+ only when corda is using kotlin 1.3.10 + ext.jackson_version = '2.9.8' ext.jetty_version = '9.4.19.v20190610' ext.jersey_version = '2.25' ext.servlet_version = '4.0.1' diff --git a/constants.properties b/constants.properties index 27a3493ced..1ca16d18ee 100644 --- a/constants.properties +++ b/constants.properties @@ -20,7 +20,7 @@ quasarClassifier=jdk8 quasarVersion11=0.8.0_r3 jdkClassifier11=jdk11 proguardVersion=6.1.1 -bouncycastleVersion=1.60 +bouncycastleVersion=1.61 classgraphVersion=4.8.58 disruptorVersion=3.4.2 typesafeConfigVersion=1.3.4