diff --git a/build.gradle b/build.gradle index b7e96776d0..a5c33d0072 100644 --- a/build.gradle +++ b/build.gradle @@ -158,6 +158,20 @@ buildscript { }() ext.corda_docs_link = "https://docs.corda.net/docs/corda-os/$baseVersion" repositories { + maven { + url "${artifactory_contextUrl}/corda-dev" + authentication { + basic(BasicAuthentication) + } + credentials { + username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME') + password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD') + } + content { + includeGroupByRegex 'net\\.corda(\\..*)?' + includeGroupByRegex 'com\\.r3(\\..*)?' + } + } mavenLocal() // Use system environment to activate caching with Artifactory, // because it is actually easier to pass that during parallel build. @@ -414,6 +428,20 @@ allprojects { version "$corda_release_version" repositories { + maven { + url "${artifactory_contextUrl}/corda-dev" + authentication { + basic(BasicAuthentication) + } + credentials { + username = findProperty('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME') + password = findProperty('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD') + } + content { + includeGroupByRegex 'net\\.corda(\\..*)?' + includeGroupByRegex 'com\\.r3(\\..*)?' + } + } mavenLocal() // Prevents cache giving use the wrong artemis mavenCentral { diff --git a/constants.properties b/constants.properties index 566d1214c7..f94a30f356 100644 --- a/constants.properties +++ b/constants.properties @@ -12,7 +12,7 @@ quasarVersion=0.7.15_r3 metricsNewRelicVersion=1.1.1 cordaVersion=4.9.11 openSourceSamplesBranch=https\://github.com/corda/samples/blob/release-V4 -gradlePluginsVersion=5.0.12 +gradlePluginsVersion=5.0.18-RC02 proguardVersion=6.1.1 java8MinUpdateVersion=171 quasarVersion11=0.8.1_r3 diff --git a/samples/attachment-demo/build.gradle b/samples/attachment-demo/build.gradle index 02fa732184..7f56b0779c 100644 --- a/samples/attachment-demo/build.gradle +++ b/samples/attachment-demo/build.gradle @@ -103,7 +103,15 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask, ] p2pPort 10002 cordapps = [] - rpcUsers = ext.rpcUsers + rpcUsers = [['username': "demo", 'password': "demo", 'permissions': ["StartFlow.net.corda.attachmentdemo.AttachmentDemoFlow", + "InvokeRpc.partiesFromName", + "InvokeRpc.notaryPartyFromX500Name", + "InvokeRpc.attachmentExists", + "InvokeRpc.openAttachment", + "InvokeRpc.uploadAttachment", + "InvokeRpc.internalVerifiedTransactionsFeed", + "InvokeRpc.startTrackedFlowDynamic", + "InvokeRpc.nodeInfo"]]] rpcSettings { address "localhost:10003" adminAddress "localhost:10004" @@ -114,7 +122,15 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask, name "O=Bank A,L=London,C=GB" p2pPort 10005 cordapps = [] - rpcUsers = ext.rpcUsers + rpcUsers = [['username': "demo", 'password': "demo", 'permissions': ["StartFlow.net.corda.attachmentdemo.AttachmentDemoFlow", + "InvokeRpc.partiesFromName", + "InvokeRpc.notaryPartyFromX500Name", + "InvokeRpc.attachmentExists", + "InvokeRpc.openAttachment", + "InvokeRpc.uploadAttachment", + "InvokeRpc.internalVerifiedTransactionsFeed", + "InvokeRpc.startTrackedFlowDynamic", + "InvokeRpc.nodeInfo"]]] rpcSettings { address "localhost:10006" adminAddress "localhost:10007" @@ -130,7 +146,15 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask, } webPort 10010 cordapps = [] - rpcUsers = ext.rpcUsers + rpcUsers = [['username': "demo", 'password': "demo", 'permissions': ["StartFlow.net.corda.attachmentdemo.AttachmentDemoFlow", + "InvokeRpc.partiesFromName", + "InvokeRpc.notaryPartyFromX500Name", + "InvokeRpc.attachmentExists", + "InvokeRpc.openAttachment", + "InvokeRpc.uploadAttachment", + "InvokeRpc.internalVerifiedTransactionsFeed", + "InvokeRpc.startTrackedFlowDynamic", + "InvokeRpc.nodeInfo"]]] extraConfig = ['h2Settings.address': 'localhost:10014'] } } diff --git a/samples/network-verifier/build.gradle b/samples/network-verifier/build.gradle index 1cd1c9f4b8..36dce157ae 100644 --- a/samples/network-verifier/build.gradle +++ b/samples/network-verifier/build.gradle @@ -57,7 +57,15 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask]) name "O=Bank A,L=London,C=GB" p2pPort 10005 cordapps = [] - rpcUsers = ext.rpcUsers + rpcUsers = [['username': "demo", 'password': "demo", 'permissions': ["StartFlow.net.corda.attachmentdemo.AttachmentDemoFlow", + "InvokeRpc.partiesFromName", + "InvokeRpc.notaryPartyFromX500Name", + "InvokeRpc.attachmentExists", + "InvokeRpc.openAttachment", + "InvokeRpc.uploadAttachment", + "InvokeRpc.internalVerifiedTransactionsFeed", + "InvokeRpc.startTrackedFlowDynamic", + "InvokeRpc.nodeInfo"]]] rpcSettings { port 10007 adminPort 10008 @@ -68,7 +76,15 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask]) name "O=Bank B,L=New York,C=US" p2pPort 10009 cordapps = [] - rpcUsers = ext.rpcUsers + rpcUsers = [['username': "demo", 'password': "demo", 'permissions': ["StartFlow.net.corda.attachmentdemo.AttachmentDemoFlow", + "InvokeRpc.partiesFromName", + "InvokeRpc.notaryPartyFromX500Name", + "InvokeRpc.attachmentExists", + "InvokeRpc.openAttachment", + "InvokeRpc.uploadAttachment", + "InvokeRpc.internalVerifiedTransactionsFeed", + "InvokeRpc.startTrackedFlowDynamic", + "InvokeRpc.nodeInfo"]]] rpcSettings { port 10011 adminPort 10012 diff --git a/samples/trader-demo/build.gradle b/samples/trader-demo/build.gradle index 0b5272f7a7..9a8212147e 100644 --- a/samples/trader-demo/build.gradle +++ b/samples/trader-demo/build.gradle @@ -105,7 +105,15 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask]) node { name "O=Bank A,L=London,C=GB" p2pPort 10005 - rpcUsers = ext.rpcUsers + rpcUsers = [['username': "demo", 'password': "demo", 'permissions': ["StartFlow.net.corda.attachmentdemo.AttachmentDemoFlow", + "InvokeRpc.partiesFromName", + "InvokeRpc.notaryPartyFromX500Name", + "InvokeRpc.attachmentExists", + "InvokeRpc.openAttachment", + "InvokeRpc.uploadAttachment", + "InvokeRpc.internalVerifiedTransactionsFeed", + "InvokeRpc.startTrackedFlowDynamic", + "InvokeRpc.nodeInfo"]]] rpcSettings { address "localhost:10006" adminAddress "localhost:10007" @@ -115,7 +123,15 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask]) node { name "O=Bank B,L=New York,C=US" p2pPort 10008 - rpcUsers = ext.rpcUsers + rpcUsers = [['username': "demo", 'password': "demo", 'permissions': ["StartFlow.net.corda.attachmentdemo.AttachmentDemoFlow", + "InvokeRpc.partiesFromName", + "InvokeRpc.notaryPartyFromX500Name", + "InvokeRpc.attachmentExists", + "InvokeRpc.openAttachment", + "InvokeRpc.uploadAttachment", + "InvokeRpc.internalVerifiedTransactionsFeed", + "InvokeRpc.startTrackedFlowDynamic", + "InvokeRpc.nodeInfo"]]] rpcSettings { address "localhost:10009" adminAddress "localhost:10010" @@ -125,7 +141,15 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask]) node { name "O=BankOfCorda,L=New York,C=US" p2pPort 10011 - rpcUsers = ext.rpcUsers + rpcUsers = [['username': "demo", 'password': "demo", 'permissions': ["StartFlow.net.corda.attachmentdemo.AttachmentDemoFlow", + "InvokeRpc.partiesFromName", + "InvokeRpc.notaryPartyFromX500Name", + "InvokeRpc.attachmentExists", + "InvokeRpc.openAttachment", + "InvokeRpc.uploadAttachment", + "InvokeRpc.internalVerifiedTransactionsFeed", + "InvokeRpc.startTrackedFlowDynamic", + "InvokeRpc.nodeInfo"]]] rpcSettings { address "localhost:10012" adminAddress "localhost:10013" @@ -137,7 +161,15 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask]) node { name "O=NonLogging Bank,L=London,C=GB" p2pPort 10025 - rpcUsers = ext.rpcUsers + rpcUsers = [['username': "demo", 'password': "demo", 'permissions': ["StartFlow.net.corda.attachmentdemo.AttachmentDemoFlow", + "InvokeRpc.partiesFromName", + "InvokeRpc.notaryPartyFromX500Name", + "InvokeRpc.attachmentExists", + "InvokeRpc.openAttachment", + "InvokeRpc.uploadAttachment", + "InvokeRpc.internalVerifiedTransactionsFeed", + "InvokeRpc.startTrackedFlowDynamic", + "InvokeRpc.nodeInfo"]]] rpcSettings { address "localhost:10026" adminAddress "localhost:10027"