Upgrade to beta4 (corda#6)

* upgrade to beta 4 Iguana

.github/workflows/check-pr-title.yaml

@@ -3,12 +3,3 @@ on:
   pull_request:
     types: [opened, edited, reopened]
 
-jobs:
-  check-pr-title:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: morrisoncole/[email protected]
-        with:
-          title-regex: '^([A-Z]{2,}-\d+)(.*)'
-          on-failed-regex-comment: "PR title failed to match regex -> `%regex%`"
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"

java-samples/corda5-obligation-cordapp/.gitignore

@@ -81,8 +81,6 @@ bin/
 *.cpb
 *.cpk
 workspace/**
-#CordaPID.dat
-#*.pem
-#*.pfx
-#CPIFileStatus*.json
-#GroupPolicy.json
+
+# ingore temporary data files
+*.dat

java-samples/corda5-obligation-cordapp/build.gradle

@@ -6,7 +6,7 @@ plugins {
     id 'org.jetbrains.kotlin.plugin.jpa'
     id 'java'
     id 'maven-publish'
-    id 'csde'
+    id 'net.corda.plugins.csde'
 }
 
 allprojects {
@@ -15,6 +15,25 @@ allprojects {
 
     def javaVersion = VERSION_11
 
+    // Configure the CSDE
+    csde {
+        cordaClusterURL = "https://localhost:8888"
+        networkConfigFile = "config/static-network-config.json"
+        r3RootCertFile = "config/r3-ca-key.pem"
+        corDappCpiName = "MyCorDapp"
+        notaryCpiName = "NotaryServer"
+        cordaRpcUser = "admin"
+        cordaRpcPasswd ="admin"
+        workflowsModuleName = workflowsModule
+        csdeWorkspaceDir = "workspace"
+        notaryVersion = cordaNotaryPluginsVersion
+        combinedWorkerVersion = combinedWorkerJarVersion
+        postgresJdbcVersion = "42.4.3"
+        cordaDbContainerName = "CSDEpostgresql"
+        cordaBinDir = "${System.getProperty("user.home")}/.corda/corda5"
+        cordaCliBinDir = "${System.getProperty("user.home")}/.corda/cli"
+    }
+
     // Declare the set of Java compiler options we need to build a CorDapp.
     tasks.withType(JavaCompile) {
         // -parameters - Needed for reflection and serialization to work correctly.
@@ -25,7 +44,24 @@ allprojects {
 
     repositories {
         // All dependencies are held in Maven Central
+        mavenLocal()
         mavenCentral()
+
+        // R3 Internal repositories for dev
+        // Repository provides Corda 5 binaries that implement Corda-API.
+        // These will be made publicly available.
+        // Final location to be decided.
+        // Repository subject to change
+        maven {
+            url = "$artifactoryContextUrl/corda-os-maven"
+            authentication {
+                basic(BasicAuthentication)
+            }
+            credentials {
+                username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME')
+                password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD')
+            }
+        }
     }
 
     tasks.withType(Test).configureEach {
@@ -45,8 +81,3 @@ publishing {
    }
 }
 
-clean.doFirst {
-    delete "${rootDir}/workspace/"
-    delete "${rootDir}/logs/"
-}
-