Merge pull request #7188 from corda/wz/merge-os-46-47-2022-05-25

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

.ci/dev/publish-branch/Jenkinsfile.nightly

@@ -33,18 +33,6 @@ def nexusIqStageChoices = [nexusDefaultIqStage].plus(
                         'operate'
                 ].minus([nexusDefaultIqStage]))
 
-/**
- * define an empty teamsWebHookURL and if it is a Release Branch
- * then set it for the Corda 4 Jenkins Connector
- */
-boolean isReleaseBranch = (env.BRANCH_NAME =~ /^release\/os\/.*/)
-def teamsWebHookURL = ""
-if (isReleaseBranch){
-    withCredentials([string(credentialsId: 'ms-teams-webhook', variable: 'webhook_url')]) {
-        teamsWebHookURL = "$webhook_url"
-    }
-}
-
 pipeline {
     agent { label 'standard' }
 
@@ -54,18 +42,6 @@ pipeline {
         overrideIndexTriggers(false)
         timeout(time: 3, unit: 'HOURS')
         buildDiscarder(logRotator(daysToKeepStr: '14', artifactDaysToKeepStr: '14'))
-        office365ConnectorWebhooks([[
-                                            name                 : "Corda 4 Jenkins Connector",
-                                            notifyBackToNormal   : true,
-                                            startNotification    : false,
-                                            notifyFailure        : true,
-                                            notifySuccess        : true,
-                                            notifyNotBuilt       : false,
-                                            notifyAborted        : false,
-                                            notifyRepeatedFailure: true,
-                                            notifyUnstable       : true,
-                                            url                  : "${teamsWebHookURL}"
-                                    ]])
     }
 
     parameters {

.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=9
 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