upgrade training to Corda 3.0.1 - tests not migrated

build.gradle

@@ -1,18 +1,28 @@
 buildscript {
-    ext.corda_release_version = '1.0.0'
-    ext.corda_gradle_plugins_version = '1.0.0'
-    ext.kotlin_version = '1.1.4'
+    ext.corda_release_version = 'R3.CORDA-3.0.1-DEV-PREVIEW' // "CORDA-3.0.1-DEV-PREVIEW" (Open Source)
+    ext.corda_release_distribution = 'com.r3.corda' // "net.corda" for Corda (Open Source)
+    ext.corda_gradle_plugins_version = '3.0.3'
+    ext.kotlin_version = '1.1.60'
     ext.junit_version = '4.12'
-    ext.quasar_version = '0.7.6'
+    ext.quasar_version = '0.7.9'
+    ext.jolokia_version = '1.3.7'
 
     repositories {
         mavenLocal()
         mavenCentral()
         jcenter()
+        maven {
+            credentials {
+                username "$artifactoryUser"
+                password "$artifactoryPassword"
+            }
+            url 'https://ci-artifactory.corda.r3cev.com/artifactory/r3-corda-releases'
+        }
     }
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "net.corda.plugins:cordapp:$corda_gradle_plugins_version"
         classpath "net.corda.plugins:publish-utils:$corda_gradle_plugins_version"
         classpath "net.corda.plugins:cordformation:$corda_gradle_plugins_version"
         classpath "net.corda.plugins:quasar-utils:$corda_gradle_plugins_version"
@@ -25,10 +35,18 @@ repositories {
     mavenCentral()
     maven { url 'https://dl.bintray.com/kotlin/exposed' }
     maven { url 'https://jitpack.io' }
+    maven {
+        credentials {
+            username "$artifactoryUser"
+            password "$artifactoryPassword"
+        }
+        url 'https://ci-artifactory.corda.r3cev.com/artifactory/r3-corda-releases'
+    }
 }
 
 apply plugin: 'kotlin'
 apply plugin: 'idea'
+apply plugin: 'net.corda.plugins.cordapp'
 apply plugin: 'net.corda.plugins.publish-utils'
 apply plugin: 'net.corda.plugins.cordformation'
 apply plugin: 'net.corda.plugins.quasar-utils'
@@ -53,17 +71,17 @@ dependencies {
     testCompile "junit:junit:$junit_version"
 
     // Corda integration dependencies
-    cordaCompile "net.corda:corda-core:$corda_release_version"
-    cordaCompile "net.corda:corda-finance:$corda_release_version"
-    cordaCompile "net.corda:corda-jackson:$corda_release_version"
-    cordaCompile "net.corda:corda-rpc:$corda_release_version"
-    cordaCompile "net.corda:corda-node-api:$corda_release_version"
-    cordaCompile "net.corda:corda-webserver-impl:$corda_release_version"
-    cordaRuntime "net.corda:corda:$corda_release_version"
-    cordaRuntime "net.corda:corda-webserver:$corda_release_version"
+    cordaCompile "$corda_release_distribution:corda-core:$corda_release_version"
+    cordaCompile "$corda_release_distribution:corda-finance:$corda_release_version"
+    cordaCompile "$corda_release_distribution:corda-jackson:$corda_release_version"
+    cordaCompile "$corda_release_distribution:corda-rpc:$corda_release_version"
+    cordaCompile "$corda_release_distribution:corda-node-api:$corda_release_version"
+    cordaCompile "$corda_release_distribution:corda-webserver-impl:$corda_release_version"
+    cordaRuntime "$corda_release_distribution:corda:$corda_release_version"
+    cordaRuntime "$corda_release_distribution:corda-webserver:$corda_release_version"
 
-    testCompile "net.corda:corda-test-utils:$corda_release_version"
-    testCompile "net.corda:corda-node-driver:$corda_release_version"
+    testCompile "$corda_release_distribution:corda-test-utils:$corda_release_version"
+    testCompile "$corda_release_distribution:corda-node-driver:$corda_release_version"
 
 
     // GraphStream: For visualisation (required by TemplateClientRPC app)
@@ -74,7 +92,7 @@ dependencies {
 
     // CorDapp dependencies
     // Specify your cordapp's dependencies below, including dependent cordapps
-    cordapp "net.corda:corda-finance:$corda_release_version"
+    cordapp "$corda_release_distribution:corda-finance:$corda_release_version"
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
@@ -89,40 +107,37 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     delete "./build/nodes"
     directory "./build/nodes"
-    networkMap "O=Network Map Service,L=London,C=GB"
     node {
         name "O=Network Map Service,L=London,C=GB"
-        advertisedServices = ["corda.notary.validating"]
+        notary = [validating: true]
         p2pPort 10002
         rpcPort 10003
-        cordapps = ["net.corda:corda-finance:$corda_release_version"]
+        cordapps = ["$corda_release_distribution:corda-finance:$corda_release_version"]
     }
     node {
         name "O=ParticipantA,L=London,C=GB"
-        advertisedServices = []
         p2pPort 10005
         rpcPort 10006
         webPort 10007
-        cordapps = ["net.corda:corda-finance:$corda_release_version"]
-        rpcUsers = [[ user: "user1", "password": "test", "permissions": []]]
+        cordapps = ["$corda_release_distribution:corda-finance:$corda_release_version"]
+        rpcUsers = [[ username: "user1", "password": "test", "permissions": ["ALL"]]]
     }
     node {
         name "O=ParticipantB,L=New York,C=US"
-        advertisedServices = []
         p2pPort 10008
         rpcPort 10009
         webPort 10010
-        cordapps = ["net.corda:corda-finance:$corda_release_version"]
-        rpcUsers = [[ user: "user1", "password": "test", "permissions": []]]
+        cordapps = ["$corda_release_distribution:corda-finance:$corda_release_version"]
+        rpcUsers = [[ username: "user1", "password": "test", "permissions": ["ALL"]]]
     }
     node {
         name "O=ParticipantC,L=New York,C=US"
-        advertisedServices = []
         p2pPort 10011
         rpcPort 10012
         webPort 10013
-        cordapps = ["net.corda:corda-finance:$corda_release_version"]
-        rpcUsers = [[ user: "user1", "password": "test", "permissions": []]]
+        webPort 10013
+        cordapps = ["$corda_release_distribution:corda-finance:$corda_release_version"]
+        rpcUsers = [[ username: "user1", "password": "test", "permissions": ["ALL"]]]
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Mar 24 11:56:05 GMT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip