From c026a13ad1f4e7ec812154c8c212477a7813882d Mon Sep 17 00:00:00 2001 From: Emil Gabrovski Date: Mon, 27 Mar 2023 11:03:56 +0300 Subject: [PATCH 1/4] CORE-12019 Add one more vNode, Evelyn - with the next letter and with a unique length --- config/static-network-config.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/static-network-config.json b/config/static-network-config.json index 9adde9b..42bfbe2 100644 --- a/config/static-network-config.json +++ b/config/static-network-config.json @@ -15,6 +15,10 @@ "x500Name" : "CN=Dave, OU=Test Dept, O=R3, L=London, C=GB", "cpi" : "cpi name" }, + { + "x500Name" : "CN=Evelyn, OU=Test Dept, O=R3, L=London, C=GB", + "cpi" : "cpi name" + }, { "x500Name" : "CN=NotaryRep1, OU=Test Dept, O=R3, L=London, C=GB", "cpi" : "CSDE Notary Server CPI", From 25baaeb663c953a2af0f474234ce1d09bdf57a5f Mon Sep 17 00:00:00 2001 From: Emil Gabrovski Date: Mon, 27 Mar 2023 11:05:04 +0300 Subject: [PATCH 2/4] CORE-12019 Remove unused dependency --- buildSrc/src/main/groovy/csde.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/buildSrc/src/main/groovy/csde.gradle b/buildSrc/src/main/groovy/csde.gradle index a94ffa9..b07d114 100644 --- a/buildSrc/src/main/groovy/csde.gradle +++ b/buildSrc/src/main/groovy/csde.gradle @@ -56,8 +56,6 @@ dependencies { extension = 'cpb' } } - - implementation "org.codehaus.groovy:groovy-json:3.0.9" } // task groupings @@ -85,7 +83,7 @@ def workflowBuildDir = rootDir.toString() + "/workflows/build" // todo: Need to read things from cordapp plugin - the cordapp names will be changed by the user -def appCpiName = 'cpi name' +def appCpiName = 'cpi name' // !!! this must match with the cpi name in /config/static-network-config.json def notaryCpiName = 'CSDE Notary Server CPI' From 80b62c71b7eace180e722a22414ad9940501494d Mon Sep 17 00:00:00 2001 From: Emil Gabrovski Date: Tue, 28 Mar 2023 12:40:15 +0300 Subject: [PATCH 3/4] CORE-12019 Fix PR comments --- config/static-network-config.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/static-network-config.json b/config/static-network-config.json index 42bfbe2..9adde9b 100644 --- a/config/static-network-config.json +++ b/config/static-network-config.json @@ -15,10 +15,6 @@ "x500Name" : "CN=Dave, OU=Test Dept, O=R3, L=London, C=GB", "cpi" : "cpi name" }, - { - "x500Name" : "CN=Evelyn, OU=Test Dept, O=R3, L=London, C=GB", - "cpi" : "cpi name" - }, { "x500Name" : "CN=NotaryRep1, OU=Test Dept, O=R3, L=London, C=GB", "cpi" : "CSDE Notary Server CPI", From 318a8184d8fc01dedec2235f086c070b93176dd4 Mon Sep 17 00:00:00 2001 From: Sean Brereton <46895769+seanbrereton@users.noreply.github.com> Date: Tue, 28 Mar 2023 11:42:23 +0100 Subject: [PATCH 4/4] INFRA-2041: Remove nexusScan pipeline due to nexus licence expiring (#23) Co-authored-by: Matt Bradbury <68864218+mattbradburyr3@users.noreply.github.com> --- .ci/nightly/JenkinsfileNexusScan | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .ci/nightly/JenkinsfileNexusScan diff --git a/.ci/nightly/JenkinsfileNexusScan b/.ci/nightly/JenkinsfileNexusScan deleted file mode 100644 index e2d589a..0000000 --- a/.ci/nightly/JenkinsfileNexusScan +++ /dev/null @@ -1,5 +0,0 @@ -@Library('corda-shared-build-pipeline-steps@5.0') _ - -cordaNexusScanPipeline( - nexusAppId: 'com.corda.CSDE-Java.5.0' -)