Merge branch 'release/5.2' into merge-release/5.1-release/5.2-2023-12…

…-01-2

.ci/JenkinsfileMergeAutomation

@@ -1,5 +1,5 @@
 #! groovy
-@Library('corda-shared-build-pipeline-steps@5.1') _
+@Library('corda-shared-build-pipeline-steps@5.2') _
 
 /**
  * Forward merge any changes in current branch to the branch with following version.
@@ -14,19 +14,18 @@
  * the branch name of origin branch, it should match the current branch
  * and it acts as a fail-safe inside {@code forwardMerger} pipeline
  */
-String originBranch = 'release/5.1'
+String originBranch = 'release/5.2'
 
 /**
  * the branch name of target branch, it should be the branch with the next version
  * after the one in current branch.
  */
-String targetBranch = 'release/5.2'
+String targetBranch = 'release/5.3'
 
 /**
  * Forward merge any changes between {@code originBranch} and {@code targetBranch}
  */
 forwardMerger(
     targetBranch: targetBranch,
     originBranch: originBranch,
-    slackChannel: '#c5-forward-merge-bot-notifications'
-)
+    slackChannel: '#c5-forward-merge-bot-notifications')

.ci/JenkinsfileSnykDelta

@@ -1,4 +1,4 @@
-@Library('corda-shared-build-pipeline-steps@5.1') _
+@Library('corda-shared-build-pipeline-steps@5.2') _
 
 snykDelta(
   snykOrgId: 'corda5-snyk-org-id',

.ci/nightly/JenkinsfileNightly

@@ -1,11 +1,10 @@
-@Library('corda-shared-build-pipeline-steps@5.1') _
+@Library('corda-shared-build-pipeline-steps@5.2') _
 
 cordaPipelineKubernetesAgent(
     runIntegrationTests: false,
     dailyBuildCron: 'H 02 * * *',
     publishOSGiImage: true,
     gradleAdditionalArgs: '-Dscan.tag.Nightly-Build',
     generateSbom: true,
-    javaVersion: '17',
-    workerBaseImageTag: '17.0.4.1-17.36.17'
+    javaVersion: '17'
     )

.ci/nightly/JenkinsfileSnykScan

@@ -1,4 +1,4 @@
-@Library('corda-shared-build-pipeline-steps@5.1') _
+@Library('corda-shared-build-pipeline-steps@5.2') _
 
 cordaSnykScanPipeline (
     snykTokenId: 'r3-snyk-corda5',

.ci/nightly/JenkinsfileWindowsCompatibility

@@ -1,4 +1,4 @@
-@Library('corda-shared-build-pipeline-steps@5.1') _
+@Library('corda-shared-build-pipeline-steps@5.2') _
 
 windowsCompatibility(
     runIntegrationTests: false,

.github/workflows/remove-stale-branches.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: fpicalausa/[email protected]
         with:
-          dry-run: true
+          dry-run: false
           days-before-branch-stale: 30
           days-before-branch-delete: 14
           stale-branch-message: "@{author} The branch [{branchName}]({branchUrl}) hasn't been updated in the last 30 days and is marked as stale. It will be removed in 14 days.\r\nIf you want to keep this branch around, delete this comment or add new commits to this branch."

.github/workflows/remove-stale-prs.yml

@@ -0,0 +1,20 @@
+name: 'Close stale issues and PR'
+on:
+  schedule:
+    - cron: '0 0 * * 1-5'
+
+jobs:
+  remove-stale-prs:
+    name: Remove stale PRs
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+        with:
+          debug-only: false
+          exempt-pr-labels: 'DO_NOT_CLOSE'
+          stale-pr-message: 'This PR is stale because it has been open 7 days with no activity. Remove the `Stale` label or add a comment - otherwise this will be closed in 7 days.'
+          close-pr-message: 'This PR was closed because it has been stale for 7 days with no activity.'
+          days-before-issue-stale: -1
+          days-before-issue-close: -1
+          days-before-pr-stale: 7
+          days-before-pr-close: 7

Jenkinsfile

@@ -1,4 +1,4 @@
-@Library('corda-shared-build-pipeline-steps@5.1') _
+@Library('corda-shared-build-pipeline-steps@5.2') _
 
 cordaPipelineKubernetesAgent(
     runIntegrationTests: false,

api/src/main/kotlin/net/corda/cli/api/AbstractCordaCliVersionProvider.kt

@@ -0,0 +1,35 @@
+package net.corda.cli.api
+
+import picocli.CommandLine.IVersionProvider
+import java.util.jar.Manifest
+
+/**
+ * An abstract class that will read version information out of the plugin manifest.
+ *
+ * Builds version information using these attributes:
+ * - Plugin-Name
+ * - Plugin-Version
+ * - Plugin-Provider
+ * - Plugin-Git-Commit
+ *
+ * To apply, inherit from this class:
+ *
+ *   class VersionProvider : AbstractCordaCliVersionProvider()
+ *
+ * Then add to your command annotation:
+ *
+ *   versionProvider = VersionProvider::class
+ */
+abstract class AbstractCordaCliVersionProvider : IVersionProvider {
+    override fun getVersion(): Array<String> = this.javaClass
+        .getResourceAsStream("/META-INF/MANIFEST.MF")
+        ?.use {
+            Manifest(it).mainAttributes.run {
+                arrayOf(
+                    "${getValue("Plugin-Name")} ${getValue("Plugin-Version")}",
+                    "Provider: ${getValue("Plugin-Provider")}",
+                    "Commit ID: ${getValue("Plugin-Git-Commit")}"
+                )
+            }
+        } ?: emptyArray()
+}

app/build.gradle

@@ -94,9 +94,15 @@ def cordaCLi = tasks.named('jar', Jar) {
     }
     from(mergeLog4j2Plugins)
 
+    var cliHostCommitId = com.gradle.Utils.execAndGetStdOut "git", "rev-parse", "--verify", "HEAD"
+
     manifest {
         attributes["Main-Class"] = appMainClass
         attributes["Multi-Release"] = true
+        attributes["Plugin-Name"] = "Corda CLI"
+        attributes["Plugin-Version"] = "${project.version}"
+        attributes["Plugin-Provider"] = "R3"
+        attributes["Plugin-Git-Commit"] = "$cliHostCommitId"
     }
 
     archiveBaseName = 'corda-cli'

app/src/main/kotlin/net/corda/cli/application/Boot.kt

@@ -1,6 +1,7 @@
 package net.corda.cli.application
 
 import net.corda.cli.api.CordaCliPlugin
+import net.corda.cli.api.AbstractCordaCliVersionProvider
 import net.corda.cli.application.logger.LoggerStream
 import org.pf4j.CompoundPluginDescriptorFinder
 import org.pf4j.DefaultPluginManager
@@ -14,13 +15,19 @@ fun main(vararg args: String) {
     Boot.run(*args)
 }
 
+class VersionProvider : AbstractCordaCliVersionProvider()
+
 @CommandLine.Command(
-    name = "corda-cli"
+    name = "corda-cli",
+    versionProvider = VersionProvider::class
 )
 class App {
     @CommandLine.Option(names = ["-h", "--help", "-?", "-help"], usageHelp = true, description = ["Display help and exit."])
     @Suppress("unused")
     var help = false
+
+    @CommandLine.Option(names = ["-V", "--version"], versionHelp = true, description = ["Display version and exit."])
+    var showVersion = false
 }
 
 /**

buildSrc/src/main/groovy/DeployableContainerBuilder.groovy

@@ -115,7 +115,7 @@ abstract class DeployableContainerBuilder extends DefaultTask {
 
     @Input
     final Property<String> baseImageTag =
-            getObjects().property(String).convention('17.0.4.1-17.36.17')
+            getObjects().property(String).convention('17.0.8.1-17.44.53')
 
     @Input
     final Property<String> subDir =

gradle.properties

@@ -1,7 +1,7 @@
 kotlin.stdlib.default.dependency=false
 
 # The version of cli-host we will publish
-cliHostVersion=5.1.0
+cliHostVersion=5.2.0
 
 # PF4J
 pf4jVersion=3.10.0

plugins/build.gradle

@@ -14,12 +14,16 @@ subprojects { subProject ->
 
         archiveBaseName = "plugin-${subProject.pluginId}"
 
+        var commitId = com.gradle.Utils.execAndGetStdOut "git", "rev-parse", "--verify", "HEAD"
+
         manifest {
             attributes['Plugin-Class'] = subProject.pluginClass
+            attributes["Plugin-Name"] = subProject.pluginId
             attributes['Plugin-Id'] = subProject.pluginId
             attributes['Plugin-Version'] = archiveVersion
             attributes['Plugin-Provider'] = subProject.pluginProvider
             attributes['Plugin-Description'] = subProject.pluginDescription
+            attributes["Plugin-Git-Commit"] = "$commitId"
         }
 
         from sourceSets.main.output

plugins/example/src/main/kotlin/net/corda/cli/plugins/examples/ExamplePlugin.kt

@@ -3,6 +3,7 @@ package net.corda.cli.plugins.examples
 import org.pf4j.Extension
 import org.pf4j.Plugin
 import net.corda.cli.api.CordaCliPlugin
+import net.corda.cli.api.AbstractCordaCliVersionProvider
 import picocli.CommandLine
 
 /**
@@ -16,12 +17,15 @@ class ExamplePlugin : Plugin() {
     override fun stop() {
     }
 
+    class VersionProvider : AbstractCordaCliVersionProvider()
+
     @Extension
     @CommandLine.Command(
         name = "example-plugin",
         subcommands = [SubCommandOne::class],
         description = ["Example plugin using class based subcommands"],
-        mixinStandardHelpOptions = true
+        mixinStandardHelpOptions = true,
+        versionProvider = VersionProvider::class
     )
     class ExamplePluginEntry : CordaCliPlugin
 }

plugins/example/src/main/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Main-Class: net.corda.cli.application.BootKt
+Multi-Release: true
+Plugin-Name: Corda CLI
+Plugin-Version: 5.1.0-TEST
+Plugin-Provider: R3
+Plugin-Git-Commit: TEST
+

plugins/example/src/test/kotlin/net/corda/cli/plugins/examples/ExamplePluginTest.kt

@@ -1,6 +1,8 @@
 package net.corda.cli.plugins.examples
 
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import picocli.CommandLine
 import java.io.ByteArrayOutputStream
@@ -61,6 +63,18 @@ class ExamplePluginTest {
         ) { outText }
     }
 
+    @Test
+    fun testVersionOption() {
+
+        val app = ExamplePlugin.ExamplePluginEntry()
+
+        val outText = tapSystemOut {
+            CommandLine(app).execute("--version")
+        }
+
+        assertEquals("Corda CLI 5.1.0-TEST\nProvider: R3\nCommit ID: TEST\n", outText)
+    }
+
     @Test
     fun testSubCommand() {