From 405fd8f249cc746338e4a20fe82b2cbd00ba53c2 Mon Sep 17 00:00:00 2001
From: Christian Sailer <christian.sailer@r3.com>
Date: Fri, 3 Nov 2017 16:22:23 +0000
Subject: [PATCH] Fix build.gradle files for the IRS demo

---
 samples/irs-demo/build.gradle         | 33 ---------------------------
 samples/irs-demo/cordapp/build.gradle |  6 ++---
 2 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/samples/irs-demo/build.gradle b/samples/irs-demo/build.gradle
index ecc0fa97f5..5b5b51ecf9 100644
--- a/samples/irs-demo/build.gradle
+++ b/samples/irs-demo/build.gradle
@@ -21,10 +21,6 @@ apply plugin: 'kotlin'
 apply plugin: 'idea'
 apply plugin: 'org.springframework.boot'
 apply plugin: 'net.corda.plugins.quasar-utils'
-apply plugin: 'net.corda.plugins.publish-utils'
-apply plugin: 'net.corda.plugins.cordapp'
-apply plugin: 'net.corda.plugins.cordformation'
-apply plugin: 'maven-publish'
 apply plugin: 'application'
 
 mainClassName = 'net.corda.irs.IRSDemo'
@@ -59,35 +55,6 @@ dependencies {
     testCompile "org.assertj:assertj-core:${assertj_version}"
 }
 
-task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
-    directory "./build/nodes"
-    node {
-        name "O=Notary Service,L=Zurich,C=CH"
-        notary = [validating: true]
-        p2pPort 10002
-        rpcPort 10003
-        webPort 10004
-        cordapps = ["$project.group:finance:$corda_release_version"]
-        useTestClock true
-    }
-    node {
-        name "O=Bank A,L=London,C=GB"
-        p2pPort 10005
-        rpcPort 10006
-        webPort 10007
-        cordapps = ["$project.group:finance:$corda_release_version"]
-        useTestClock true
-    }
-    node {
-        name "O=Bank B,L=New York,C=US"
-        p2pPort 10008
-        rpcPort 10009
-        webPort 10010
-        cordapps = ["$project.group:finance:$corda_release_version"]
-        useTestClock true
-    }
-}
-
 bootRepackage {
     enabled = false
 }
diff --git a/samples/irs-demo/cordapp/build.gradle b/samples/irs-demo/cordapp/build.gradle
index 9edccf8968..74dfa92b45 100644
--- a/samples/irs-demo/cordapp/build.gradle
+++ b/samples/irs-demo/cordapp/build.gradle
@@ -61,7 +61,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         notary = [validating : true]
         p2pPort 10002
         rpcPort 10003
-        cordapps = ["net.corda:finance:$corda_release_version"]
+        cordapps = ["${project.group}:finance:$corda_release_version"]
         rpcUsers = ext.rpcUsers
         useTestClock true
     }
@@ -69,7 +69,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         name "O=Bank A,L=London,C=GB"
         p2pPort 10005
         rpcPort 10006
-        cordapps = ["net.corda:finance:$corda_release_version"]
+        cordapps = ["${project.group}:finance:$corda_release_version"]
         rpcUsers = ext.rpcUsers
         useTestClock true
     }
@@ -77,7 +77,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         name "O=Bank B,L=New York,C=US"
         p2pPort 10008
         rpcPort 10009
-        cordapps = ["net.corda:finance:$corda_release_version"]
+        cordapps = ["${project.group}:finance:$corda_release_version"]
         rpcUsers = ext.rpcUsers
         useTestClock true
     }