NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2022-05-25)

Conflicts:
*
client/rpc/src/integration-test/kotlin/net/corda/client/rpcreconnect/CordaRPCClientReconnectionTest.kt
*
client/rpc/src/main/kotlin/net/corda/client/rpc/internal/ReconnectingCordaRPCOps.kt
* constants.properties
* gradle/wrapper/gradle-wrapper.properties
* tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShell.kt

.ci/dev/regression/Jenkinsfile

@@ -121,6 +121,73 @@ pipeline {
                 )
             }
         }
+        stage('Generate Wiki Report') {
+            when {
+                expression { isReleaseTag && !isInternalRelease && !isReleaseCandidate && !isReleasePatch }
+                beforeAgent true
+            }
+            agent {
+                docker {
+                    image 'nexusiq-sonatype-cli:latest'
+                    reuseNode true
+                    registryUrl 'https://engineering-docker.software.r3.com/'
+                    registryCredentialsId 'artifactory-credentials'
+                }
+            }
+            options {
+                retry(3)
+            }
+            environment {
+                NEXUS_APP_ID="${nexusAppId}"
+                NEXUS_APP_STAGE="${params.nexusIqStage}"
+                NEXUSIQ_CREDENTIALS = credentials('jenkins-nexusiq-credentials')
+            }
+            steps {
+                sh '''
+                    rm -f wiki-report.md
+                    env NEXUSIQ_USERNAME="${NEXUSIQ_CREDENTIALS_USR}" \
+                        NEXUSIQ_PASSWORD="${NEXUSIQ_CREDENTIALS_PSW}" \
+                            /opt/app/wrapper wiki-report \
+                                --app "${NEXUS_APP_ID}" \
+                                --stage "${NEXUS_APP_STAGE}" >wiki-report.md
+                '''.stripIndent()
+                archiveArtifacts 'wiki-report.md'
+            }
+        }
+        stage('Generate Licence Report') {
+            when {
+                expression { isReleaseTag && !isInternalRelease && !isReleaseCandidate && !isReleasePatch }
+                beforeAgent true
+            }
+            agent {
+                docker {
+                    image 'nexusiq-licence-report:latest'
+                    reuseNode true
+                    registryUrl 'https://engineering-docker.software.r3.com/'
+                    registryCredentialsId 'artifactory-credentials'
+                }
+            }
+            options {
+                retry(3)
+            }
+            environment {
+                NEXUS_APP_ID="${nexusAppId}"
+                NEXUS_APP_STAGE="${params.nexusIqStage}"
+                NEXUSIQ_CREDENTIALS = credentials('jenkins-nexusiq-credentials')
+            }
+            steps {
+                sh '''\
+                    rm -rf report
+                    env NEXUSIQ_USERNAME="${NEXUSIQ_CREDENTIALS_USR}" \
+                        NEXUSIQ_PASSWORD="${NEXUSIQ_CREDENTIALS_PSW}" \
+                            /opt/app/wrapper --write --outdir report \
+                                --force \
+                                --app "${NEXUS_APP_ID}" \
+                                --stage "${NEXUS_APP_STAGE}"
+                '''.stripIndent()
+                archiveArtifacts 'report/*.md'
+            }
+        }
 
         stage('All Tests') {
             when {

build.gradle

@@ -97,7 +97,7 @@ buildscript {
     ext.hamkrest_version = '1.7.0.0'
     ext.jopt_simple_version = '5.0.2'
     ext.jansi_version = '1.18'
-    ext.hibernate_version = '5.4.3.Final'
+    ext.hibernate_version = '5.4.32.Final'
     ext.h2_version = '1.4.199' // Update docs if renamed or removed.
     ext.rxjava_version = '1.3.8'
     ext.dokka_version = '0.9.17'

constants.properties

@@ -14,7 +14,7 @@ java8MinUpdateVersion=171
 platformVersion=8
 guavaVersion=28.0-jre
 # Quasar version to use with Java 8:
-quasarVersion=0.7.13_r3
+quasarVersion=0.7.15_r3
 # Quasar version to use with Java 11:
 quasarVersion11=0.8.1_r3
 jdkClassifier11=jdk11