From 0a21fda87c379b6764c032f3af2dba614be24bb1 Mon Sep 17 00:00:00 2001
From: Waldemar Zurowski <waldemar.zurowski@r3.com>
Date: Wed, 15 Dec 2021 11:40:54 +0100
Subject: [PATCH] NOTICK: Changes for GA release of Corda OS 4.8.5

---
 .ci/dev/regression/Jenkinsfile                                 | 3 +++
 build.gradle                                                   | 2 +-
 .../src/main/kotlin/net/corda/common/logging/Constants.kt      | 2 +-
 constants.properties                                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.ci/dev/regression/Jenkinsfile b/.ci/dev/regression/Jenkinsfile
index 4b4af18020..ee6dcc9657 100644
--- a/.ci/dev/regression/Jenkinsfile
+++ b/.ci/dev/regression/Jenkinsfile
@@ -115,6 +115,9 @@ pipeline {
         }
 
         stage('All Tests') {
+            when {
+                expression { return false }
+            }
             parallel {
                 stage('Another agent') {
                     agent {
diff --git a/build.gradle b/build.gradle
index 351d3c72b4..511951451d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,7 +68,7 @@ buildscript {
     ext.servlet_version = '4.0.1'
     ext.assertj_version = '3.12.2'
     ext.slf4j_version = '1.7.30'
-    ext.log4j_version = '2.15.0'
+    ext.log4j_version = '2.16.0'
     ext.bouncycastle_version = constants.getProperty("bouncycastleVersion")
     ext.guava_version = constants.getProperty("guavaVersion")
     ext.caffeine_version = constants.getProperty("caffeineVersion")
diff --git a/common/logging/src/main/kotlin/net/corda/common/logging/Constants.kt b/common/logging/src/main/kotlin/net/corda/common/logging/Constants.kt
index 7d2a38a1c6..e14ac91de3 100644
--- a/common/logging/src/main/kotlin/net/corda/common/logging/Constants.kt
+++ b/common/logging/src/main/kotlin/net/corda/common/logging/Constants.kt
@@ -9,4 +9,4 @@ package net.corda.common.logging
  * (originally added to source control for ease of use)
  */
 
-internal const val CURRENT_MAJOR_RELEASE = "4.8.4"
+internal const val CURRENT_MAJOR_RELEASE = "4.8.5"
diff --git a/constants.properties b/constants.properties
index 3c41666dd1..37dcdce0f7 100644
--- a/constants.properties
+++ b/constants.properties
@@ -2,7 +2,7 @@
 # because some versions here need to be matched by app authors in
 # their own projects. So don't get fancy with syntax!
 
-cordaVersion=4.8.4
+cordaVersion=4.8.5
 versionSuffix=
 gradlePluginsVersion=5.0.12
 kotlinVersion=1.2.71