From b5517f632bfc517c8436f3aacc99297c5b17750a Mon Sep 17 00:00:00 2001 From: Chris Barratt Date: Fri, 25 Nov 2022 15:50:16 +0000 Subject: [PATCH] Update java template example for HC00 --- buildSrc/build.gradle | 3 ++ settings.gradle | 33 +------------------ .../developers/csdetemplate/MyFirstFlow.java | 6 ++-- .../csdetemplate/MyFirstFlowResponder.java | 2 +- 4 files changed, 8 insertions(+), 36 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 750b4c5..49f7a1f 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -6,6 +6,9 @@ plugins { repositories { mavenCentral() + maven { + url = "$artifactoryContextUrl/" + } } dependencies { diff --git a/settings.gradle b/settings.gradle index 8fb0cb1..d18ef5a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,40 +1,9 @@ pluginManagement { // Declare the repositories where plugins are stored. repositories { - mavenLocal() gradlePluginPortal() - mavenCentral { - content { - includeGroupByRegex 'net\\.corda(\\..*)?' - } - } - // R3 internal repositories maven { - url "${artifactoryContextUrl}/corda-dev" - content { - includeGroupByRegex 'net\\.corda\\.plugins(\\..*)?' - } - } - maven { - url = "$artifactoryContextUrl/corda-os-maven-unstable" - credentials { - username = settings.ext.find('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME') - password = settings.ext.find('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD') - } - } - maven { - url = "$artifactoryContextUrl/corda-os-maven-unstable-local" - credentials { - username = settings.ext.find('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME') - password = settings.ext.find('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD') - } - } - maven { - url = "$artifactoryContextUrl/corda-dev" - credentials { - username = settings.ext.find('cordaArtifactoryUsername') ?: System.getenv('CORDA_ARTIFACTORY_USERNAME') - password = settings.ext.find('cordaArtifactoryPassword') ?: System.getenv('CORDA_ARTIFACTORY_PASSWORD') - } + url = "$artifactoryContextUrl/" } } diff --git a/src/main/java/com/r3/developers/csdetemplate/MyFirstFlow.java b/src/main/java/com/r3/developers/csdetemplate/MyFirstFlow.java index 50d183a..0fcc95e 100644 --- a/src/main/java/com/r3/developers/csdetemplate/MyFirstFlow.java +++ b/src/main/java/com/r3/developers/csdetemplate/MyFirstFlow.java @@ -26,17 +26,17 @@ public class MyFirstFlow implements RPCStartableFlow { // JsonMarshallingService provides a Service for manipulating json @CordaInject - JsonMarshallingService jsonMarshallingService; + public JsonMarshallingService jsonMarshallingService; // FlowMessaging provides a service for establishing flow sessions between Virtual Nodes and // sending and receiving payloads between them @CordaInject - FlowMessaging flowMessaging; + public FlowMessaging flowMessaging; // MemberLookup provides a service for looking up information about members of the Virtual Network which // this CorDapp is operating in. @CordaInject - MemberLookup memberLookup; + public MemberLookup memberLookup; public MyFirstFlow() {} diff --git a/src/main/java/com/r3/developers/csdetemplate/MyFirstFlowResponder.java b/src/main/java/com/r3/developers/csdetemplate/MyFirstFlowResponder.java index 4e49f3b..de27380 100644 --- a/src/main/java/com/r3/developers/csdetemplate/MyFirstFlowResponder.java +++ b/src/main/java/com/r3/developers/csdetemplate/MyFirstFlowResponder.java @@ -23,7 +23,7 @@ public class MyFirstFlowResponder implements ResponderFlow { // MemberLookup provides a service for looking up information about members of the Virtual Network which // this CorDapp is operating in. @CordaInject - MemberLookup memberLookup; + public MemberLookup memberLookup; public MyFirstFlowResponder() {}