From a5c0d6b262f5fc8a02d37de3a8da0db2c4ef933b Mon Sep 17 00:00:00 2001
From: Tony Lawson <tony.lawson@r3.com>
Date: Fri, 1 Sep 2023 13:54:09 +0100
Subject: [PATCH] CORE-16283: Resolve the notary cpb for workflow tests using
 the csde-gradle-plugin (#111)

* CORE-16283: Resolve the notary cpb for workflow tests using the csde-gradle-plugin

* CORE-16283: Add missing csde config update

* CORE-16283: depend on full filepath for notary

* CORE-16818: Remove duplicated tasks being invoked (#115)
---
 build.gradle           | 4 ++--
 gradle.properties      | 8 ++++++++
 workflows/build.gradle | 3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index ced3bef..1088827 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,8 +30,8 @@ allprojects {
         combinedWorkerVersion = combinedWorkerJarVersion
         postgresJdbcVersion = "42.4.3"
         cordaDbContainerName = "CSDEpostgresql"
-        cordaBinDir = "${System.getProperty("user.home")}/.corda/corda5"
-        cordaCliBinDir = "${System.getProperty("user.home")}/.corda/cli"
+        cordaBinDir = "${System.getProperty("user.home")}/$cordaBinariesDirectory"
+        cordaCliBinDir = "${System.getProperty("user.home")}/$cordaCliBinariesDirectory"
         cpiUploadTimeout = cpiUploadDefault
         cordaProcessorTimeout = processorTimeout
         vnodeRegistrationTimeout = vnodeRegistrationTimeoutDefault
diff --git a/gradle.properties b/gradle.properties
index e54608e..44418a4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,6 +30,14 @@ workflowsModule=workflows
 # This will be the name of the generated cpk and cpb files
 contractsModule=contracts
 
+# Specify the location of where Corda 5 binaries can be downloaded
+# Relative path from user.home
+cordaBinariesDirectory = .corda/corda5
+
+# Specify the location of where Corda 5 CLI binaries can be downloaded
+# Relative path from user.home
+cordaCliBinariesDirectory = .corda/cli
+
 # Metadata for the CorDapp.
 cordappLicense="Apache License, Version 2.0"
 cordappVendorName="R3"
diff --git a/workflows/build.gradle b/workflows/build.gradle
index f5d6326..ad218fd 100644
--- a/workflows/build.gradle
+++ b/workflows/build.gradle
@@ -64,10 +64,11 @@ dependencies {
     testImplementation "net.corda:corda-driver:$cordaDriverVersion"
     testRuntimeOnly "net.corda:corda-driver-engine:$cordaDriverVersion"
     testRuntimeOnly files(configurations.archives.artifacts.files)
-    testRuntimeOnly "com.r3.corda.notary.plugin.nonvalidating:notary-plugin-non-validating-server:$cordaNotaryPluginsVersion:package@cpb"
+    testRuntimeOnly files("${System.getProperty("user.home")}/$cordaBinariesDirectory/notaryServer/notary-plugin-non-validating-server-$cordaNotaryPluginsVersion-package.cpb")
 }
 
 tasks.withType(Test).configureEach {
+    dependsOn(':getNotaryServerCPB')
     doFirst {
         jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED',
                 '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED',